gentoo auto-resync : 03:02:2023 - 21:11:18

610 files changed, 4335 insertions, 6071 deletions

diff --git a/Manifest b/Manifest
index 0428b0b6c80c..e47d74ad7dbd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29460 BLAKE2B 699ef73a080e6383d04f2123c9eaaf9e469b5f8a9589d387466d046acc29aa5064138dad301f57a346e045f1bdbf04d0b2eb0d238c9e0fb04324ae4522514b54 SHA512 f5fe434b28c0ed098ce26be5ba67ada3c591f51b0aa82a4320f84f5954b1d2c0bac419edfc9a72aebc43813ac824a6a303a5529d7d180ec3127a8cadc55078bb
-TIMESTAMP 2023-02-03T14:39:41Z
+MANIFEST Manifest.files.gz 29480 BLAKE2B 72ff7f90af4495d5f5636a85b33ff823b5e24fde8a56977ddc7f4784883c138cf5bcfe53c9b167ca67df5b9103e5b9758ce7f9b5f283011668870c404dd21c80 SHA512 f1de39c935f3c38b7000705175bb35dd81328fea4100247674ed9144d13acd9f5b4781be40cfcca6a8a6c0bba082d9988376c62a4cdf1fcc064367a09c8e64a4
+TIMESTAMP 2023-02-03T20:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdcQxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDYWRAAoaY2Ax/K1dItoY1PqgBGopAFSrVlgyZvzFr4jSG5IKOfAsJQee7a/Bst
-jkjIOMjqpZqPG1s+Gt/t9jbZ5k7k9DxomJDHXB8JUTz0G8iuIoHtFKWQhz9tThEY
-TeGa62AVmClSzII1rsjkbWdYfQBJxtRO8J6yxh4nhoQm27bTvBqiY1LL1ywiMySu
-ObwYEhw8KnMGo2sr1lTCy5lZewPbWnrnETawjgtLbi7czXECo8yH7Tk1PoCZ5nOs
-JmYJsyWSw0WizoaV0kajeCtxu7GxGSadZrVH0K0YXoCrh455N2K0OG9SyIRoUEjP
-shnpLjhB0gIjEdUq6t3AFaEfqQuQDQOWFyth0HXe18vCsmwTB/uJJTr95a6O48q+
-6Wzrhw8xhF/1smlI2dID8+lPdzjXBVvcnM0ct5OZlSdNDKJ2a5/0F1+TaMVDOGGH
-jg5AREfMurdgzJpMwGK8Zy56T5DypBtU5gE8c2mk/Ktdi1v0m4d0XuWqGwDsmaMI
-MgLW4562ON6TBj5EFX0thSOc/mogZLHVpfyQsagZEiGzh99Asd0rtND9Sw9d7OmU
-WvA7MtwlUgMZEaF9NmL2EMKSxKuyq2jdKA1tMIi/9JTAcf7wCJaX3hX1nDPlUR4B
-HbBE5fWZFR8616r2tcI75zj+3Za+5hGPjz4TUrKr5DZvSDbl/JQ=
-=jC+a
+klDr1Q//Za5x9TyZHVrIKnDiTre0DseHmFnFQvO+Cm2hA7Z/LEqKr0rRAzC7x5GK
+rB+82TnY6ciEu4AH/LQX1vK19UbrqY2Dgxay7OBwuKuloSQqW9Tw3d3vt9SK2hTB
+ObvT2MDO/3T2B9QH9Z84F8QZLgKNuOan+SUlciyctYl6IHRkRKsiQsEx+1R6mDVe
+EaH5E7LKtxbwL8AKnQTULNzhlJMe/JySwiKgJInYD0ldEXPexFVFyfb57hKpADeh
+0Rx9LWXFalQjhr7Dyeu5O4Ogmi1usY1c0a2uva/1cXuuXStbdWOB3CKho05INrzf
+VDcmXF/ELgl1jqwNQ3qDsjbEK1di7Tnn3DWaXEuQkl4b7dggLvzHIkP3tYjcp29W
+yKMvYFV5jerG4rcDkiz5rOegcdpxsc3DA7WU5rDm1HJcvMZQFZ+tVb87HnN2W+De
+9h7JhP+v7dNQiR1BXY5uHy/jCTB0pmMNUx0sg35OcNe8Z1HENHi56axLU4MsC1Df
++BFa5nfbaXJ5YiE2EfpeixnJ/AkLx0Nkb9cSi91oCP0hRXVmirgJ1ZbOB2Lc47Vv
+TiOmS9O0cMMIYBZvCQ9vG97MTDJ4kiwZOSk/QhPz1ZGvai3F/DMo838ttqy8xuIt
+fBZzY/5sC5FQt0SUtWJSjLpBlXbiNOTSI2MPcpyfHdnKDRmI2x0=
+=wdQr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6fae54fdb783..97649eb68938 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 828b135844c5..3c7572c15bd5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index dc1391e55279..32012d06954b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,19 +1,7 @@
-DIST aws-cli-1.27.50.gh.tar.gz 2347235 BLAKE2B cacfe2c8d4fce7de6452a02fa8bcbcde58dbf010328a161e5eecc7305b225264ae68d3e20c6107cfa3b817e2030ffb20dc09a938f8bff59036fab5969e3e6da0 SHA512 af95ad60f2537c12c1353ab0cee045b55834b92b51d0b2fb1bf48991d34f4aa3b61ab20ca438ecba5d8019009065f7993bab64b7e7e0edf89765351c3f4fa168
 DIST aws-cli-1.27.54.gh.tar.gz 2349811 BLAKE2B 08cb317ea4621273644c39c1152e1a3f8bd9f52ed8c30d7c37dfea9e986ca1597fda1dfbdea8c4043fa783f061609d6f24895997e9f9a3f27d5677c0f9e6c3de SHA512 af4783eef3c1c666b8b3c6d20f1c0177db6d4ce01645b092770cba535dad95609b4bece366355ce6d6a505ac7ab5a2e390d64fb84d6c00e402f9f8ab88db91d9
-DIST aws-cli-1.27.57.gh.tar.gz 2359650 BLAKE2B 637674f1726828b43a8135b9f7ff9d1f4a05716680aa909829148e4acf7104290c49f90b453294e16cc74d0d200bdfa4049b470a5194df5e3098308d0c088d3b SHA512 be1ac08e57012751f59e63996395b39bf5a9f42381e9a08baffacc2ac9d104c3560c250b2b210608bf6b460fdc31cc1f794a90949a52ebdbb3c22f03e5fb00c2
-DIST aws-cli-1.27.58.gh.tar.gz 2359921 BLAKE2B da3ead9140407faff60384fa7aafbc27a8a86d088e4516599e573b9e968f00d3e292a8ea6a0eb0a80449f1fef3bb62204dad2a788f10ba87a959218d909da77b SHA512 2bc4dfe5058c847510f4f43006191153b23e5efecc51bb010f9b06ba127504ee40c953bcb6e47d921760f1bc6eb87747971a9a3514f781dd4bd76f30ecd7de81
 DIST aws-cli-1.27.59.gh.tar.gz 2360458 BLAKE2B e60117e41cf95d442db333cf49c146e4ed02247007b8f46228799c5dee8c486aec34b236c9a0a6d152d690ff86c34fd797a6f35227a6e443805cdfe1b1b30f00 SHA512 87b9aebe812415223285c09ab5a36de2b9c0da49775d1162a5b5d7489ad61c16ca5361b721bc9e4ec4ccc09306be24513f42d7263b315d6856be20fdf0779686
-DIST aws-cli-1.27.60.gh.tar.gz 2361068 BLAKE2B ee5b5b1129bcdfe261d0b7ddbfa905b4c97a799ba7c494cad74bcb3c74dcff39131b908d602a60c023c26cf4c733a52b385c4ad8266c53e5d60d8036c5abd2e6 SHA512 aa14729040d4dcfdbb75936eb29d651c03ea28a3c18f5ad4b9e685899e07f03703f2058d508a16c753df1b1e66af3ff84ec9e31476fc2f969786235ce15ae425
-DIST aws-cli-1.27.61.gh.tar.gz 2362178 BLAKE2B 512fd70f5688289b79807e679aded5085af89a14e5724dc70a771fed846060a4ef1265b3ef9d598c24d228649412204cf48d02a2ff840575a8e9a3fc3a2fe12a SHA512 c8b0640fd2aba05617e3ed60d5cfc6749102e16477eaae2e94d5be7750d5bfea14c8020a4dc7bac5c2b2bae2f46f302930b03b6d47a1cf778ae08be761f7274f
-DIST aws-cli-1.27.62.gh.tar.gz 2362968 BLAKE2B 8d2bbbea1f4ff27bc441308c08ecbb2e02f102a75520dd6af9de19c258059510c6ad48beb6c7ad0ef576bb96687156c1165e66d1fd5457e4947ce1551d3bea73 SHA512 f27ce64e582cb88dc58009ef994b996c931a7827e8d9d4d450a7118a3fef1758a44ee706832b543d39481fbf4a82eb4cdb9944aa294d25e063476190bc20a66a
 DIST aws-cli-1.27.63.gh.tar.gz 2363224 BLAKE2B 4fe7971271d4359f9d29cdf4c028bd8d06a1a8188e6aef108c33d6b137bb2aee84f3655f3666381fdbf8166dd5ea071c564faac32fb0c06a461249385dbc503d SHA512 01c578f13c0f316c41bdf3bbc5e8532f01d0bfa108207899b8c56b990acdbf5b80d0ffbf1be944088f34e623494b1a1f6d52823d654c192b07133291e4bd7deb
-EBUILD awscli-1.27.50.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.54.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.57.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.58.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.54.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.59.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.60.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.61.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.62.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.63.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.50.ebuild b/app-admin/awscli/awscli-1.27.50.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.27.50.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 arm arm64 ppc ppc64 ~riscv sparc 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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.54.ebuild b/app-admin/awscli/awscli-1.27.54.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.54.ebuild
+++ b/app-admin/awscli/awscli-1.27.54.ebuild
@@ -22,7 +22,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"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.27.57.ebuild b/app-admin/awscli/awscli-1.27.57.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.57.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.58.ebuild b/app-admin/awscli/awscli-1.27.58.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.58.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.60.ebuild b/app-admin/awscli/awscli-1.27.60.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.60.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.61.ebuild b/app-admin/awscli/awscli-1.27.61.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.61.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.62.ebuild b/app-admin/awscli/awscli-1.27.62.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.62.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 59d0096392ad..44a58e2331af 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index 3cbc12bea21f..55f32963ed40 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,7 +1,8 @@
+AUX README.gentoo 707 BLAKE2B 1a33b734540d0321aa91e4ad6b05f9f10b13fa2fdfe3ac28c2c54432bb5d0c773ae07e39c3c6e6e3da21b39f7b63d2df82ed1dd1d306133c2c0b9d407cfdffdc SHA512 42aa73f1a189521f67addfff3da3eb5ad6df81d5525284338812862dcd6f57b9be6af7625cec1a828318ac453de8d361480daf864a6cf32b713e316847bec722
 DIST virtio-win-0.1.221.iso 531486720 BLAKE2B aa4914cf3a8298c7949b365a1f3e224c28eecc1a73897aec9c2a54d79976e6bcac5827b2c258e82f1faa86b2787e042e575003f6975ec11d875cf8ee2a4e184f SHA512 ee2608a4bb873911541cf884d1840845173e64b309fad23d744aaaa058d7c3ef8bf89fadf316d8d93363585402690923ffd6252660b4f609a439c561decfece0
 DIST virtio-win-0.1.225.iso 532060160 BLAKE2B ed0fbf486f0c576bed25f02ea09cfd957a00a42d85063feb1dd2977e2cd816601fe2b013e00abbccf07eb765da3b64b88b5675c95175fdc971a20d784c28d503 SHA512 c0a940ca747983d88876f805f7266a8aae61b83857983738d06e9d555569d2b42a9cddb77d535b4f9dbc4b1099583f8b6844f13e4bd98ea1f0f6aec22c6c9be7
 DIST virtio-win-0.1.229.iso 534818816 BLAKE2B 29442b70e5809fc935940497b4bc021f6fe890beba97605b048e0c5236764d08bc164974be25bf8331136ebbdf664ea440efe1f219129a30a171134bfe369942 SHA512 e9ccb513b07cb28ab490f5d4e299d0d52ade956f82e1a708e91c1ee3af9b142fa144af0fe5287d3bbb369f586857791952de45d1241058073f5a59c1f2f913ca
-EBUILD virtio-win-0.1.221.1.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad
-EBUILD virtio-win-0.1.225.2.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad
-EBUILD virtio-win-0.1.229.1.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad
+EBUILD virtio-win-0.1.221.1.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01
+EBUILD virtio-win-0.1.225.2.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01
+EBUILD virtio-win-0.1.229.1.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01
 MISC metadata.xml 411 BLAKE2B a720d6789e46cf48d3d2a668b1edbc8bb6d6b837eebd19b1adfcc557dbb1313fccdd8fa174af0cc4e742c0d7f29d5f9ebef3de3e779819ab82a1ce8fc5635e27 SHA512 3729f816fad822a562ff5a8a1345c2ca20f990d35af5565008ef98370872ee0f313d0e89f0de27d08793a212737d6dd6662ce4c22b3c2a2bc43f7c8a69db46a4
diff --git a/app-emulation/virtio-win/files/README.gentoo b/app-emulation/virtio-win/files/README.gentoo
new file mode 100644
index 000000000000..9c50feb9a1e8
--- /dev/null
+++ b/app-emulation/virtio-win/files/README.gentoo
@@ -0,0 +1,15 @@
+VirtIO drivers have been installed as a CD-ROM image to
+
+  /usr/share/drivers/windows/virtio-win.iso
+
+To install the drivers on a Windows guest machine, either during or after the
+installation of Windows, pass the iso file to the guest machine and mount it as
+a CD-ROM image. Then, in the Windows guest, open the Device Manager and start
+the driver update wizard. Locate the appropriate device and click to update its
+driver. In the pop-up window, click to browse in the guest machine to locate
+the iso image, and select the driver(s) from it to install.
+
+For an example, see: https://wiki.gentoo.org/wiki/QEMU/Windows_guest
+
+For information on using the Device Manager, refer to the Windows
+documentation.
diff --git a/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild
index d86ab2c1a639..057b187a0c4b 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit readme.gentoo-r1
+
 MY_PV=$(ver_cut 1-3)
 MY_DW=$(ver_rs 3 -)
 
@@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL"
 SLOT="0"
 KEYWORDS="~amd64"
 S="${WORKDIR}"
+INSTALL_PATH=/usr/share/drivers/windows
 
 src_install() {
-	insinto /usr/share/drivers/windows
+	insinto "${INSTALL_PATH}"
 	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+	dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild b/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild
index d86ab2c1a639..057b187a0c4b 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit readme.gentoo-r1
+
 MY_PV=$(ver_cut 1-3)
 MY_DW=$(ver_rs 3 -)
 
@@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL"
 SLOT="0"
 KEYWORDS="~amd64"
 S="${WORKDIR}"
+INSTALL_PATH=/usr/share/drivers/windows
 
 src_install() {
-	insinto /usr/share/drivers/windows
+	insinto "${INSTALL_PATH}"
 	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+	dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild
index d86ab2c1a639..057b187a0c4b 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit readme.gentoo-r1
+
 MY_PV=$(ver_cut 1-3)
 MY_DW=$(ver_rs 3 -)
 
@@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL"
 SLOT="0"
 KEYWORDS="~amd64"
 S="${WORKDIR}"
+INSTALL_PATH=/usr/share/drivers/windows
 
 src_install() {
-	insinto /usr/share/drivers/windows
+	insinto "${INSTALL_PATH}"
 	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+	dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 7d00bcca547e..f4942f8e700d 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -4,6 +4,8 @@ AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2
 AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106
 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
-EBUILD wine-proton-7.0.5.ebuild 10396 BLAKE2B 658f810da3557b82cc801140916b07d5bd8397c8263042eb0e05b7b1d3f2808e36a87d62bcb5ee3efb3ef4231d65dee9370819d1d47915c11b697cdb1f309cae SHA512 bc2b2282a4df07325b8898b63ad2c356c9a6b4f1e637e95bacaacb715e77144775bdfd52e7164d432681b95a7f1f16818f64ac23401d3c67c4b75eb8d451c24e
-EBUILD wine-proton-7.0.9999.ebuild 10397 BLAKE2B b19e8b4c01f3ab3ccd6ba3d8354be696062d5a5c868b50e60ca73a3c578705c15653e7ab2a826b62ad722f3f82c9978f5e7c7f5762b8a18ef4096ae3ee942d6c SHA512 3bf965ae956acbe38ca16bd25acdac80cd38c3fa7d76e4431aaf0300c823bb0658421c9c4bac90c20bbcf11d93420baa9bce0be1e2b8764ca7d62b0786a76e32
+DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
+EBUILD wine-proton-7.0.5.ebuild 10401 BLAKE2B 1c11f3665732f5217a52cfb3798f05eb9e2fa3f2c86a7ef8491a908accd0b3ef70375d7fffc24db452850e152f39e84b0d69d278333fa5a68da6b896b76f539a SHA512 90875a85b1704329d4119ce0e9ad1c6d2cac5b1d13ae8e5041bcb554b1937445ed4e26066dd49030b147b0470a275eb531193c28954415364bfa58719945751f
+EBUILD wine-proton-7.0.6.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727
+EBUILD wine-proton-7.0.9999.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index 07870f389abe..1b2840143d98 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools flag-o-matic multilib multilib-build \
-	python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.3.1
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
new file mode 100644
index 000000000000..ac7d38464311
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -0,0 +1,321 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools flag-o-matic multilib multilib-build python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
+	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal
+	osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb
+	v4l +vkd3d +xcomposite xinerama"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	dev-libs/gmp:=[${MULTILIB_USEDEP}]
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-musl.patch
+	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-7.0.4-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# similarly to staging, append to `wine --version` for identification
+	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		# upstream (Valve) doesn't really support misc configurations (e.g.
+		# adds vulkan code not always guarded by --with-vulkan), so force
+		# some major options that are typically needed by games either way
+		--with-freetype
+		--with-mingw # needed by many, notably Blizzard titles
+		--with-opengl
+		--with-vulkan
+		--with-x
+
+		# ...and disable most options unimportant for games and unused by
+		# Proton rather than expose as volatile USEs with little support
+		--without-capi
+		--without-cups
+		--without-gphoto
+		--without-gssapi
+		--without-krb5
+		--without-ldap
+		--without-netapi
+		--without-opencl
+		--without-pcap
+		--without-sane
+		ac_cv_lib_soname_odbc=
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with alsa)
+		$(use_with fontconfig)
+		$(use_with gstreamer)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pulseaudio pulse)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
+		if (( bits == 64 )); then
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
+		: "${CROSSCFLAGS:=$(
+			filter-flags '-fstack-clash-protection' #758914
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-mfunction-return=thunk*' #878849
+			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+		: "${CROSSLDFLAGS:=$(
+			filter-flags '-fuse-ld=*'
+			CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+		export CROSS{CC,{C,LD}FLAGS}
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+	use debug ||
+		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
+}
+
+pkg_postinst() {
+	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index d57544d5f001..ac7d38464311 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools flag-o-matic multilib multilib-build \
-	python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index b410e2409f43..c8ede1085f7e 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
index 1f07fc25a476..b2c269c3b460 100644
--- a/app-metrics/github-exporter/Manifest
+++ b/app-metrics/github-exporter/Manifest
@@ -2,5 +2,8 @@ AUX github-exporter.confd 507 BLAKE2B 46ace5b98c0ec60c7a93c50524258e44537e1a4ed1
 AUX github-exporter.initd 1512 BLAKE2B ab1f34d3084655da8b7f5345e7001f968d0f7361d8c0eb45070e8a7c1bb6216b65ccfec754897c2472b91fa457a50b363d51939ccc772ae64e153abe97b10cba SHA512 d0ebac39a04d94a10f6d38cbad660b7c8f4bf570bbda334d7e7eb6c2d635f6ac4425f462e2ed9b68bd4f8ac56842deaa6ab15b6c883cf4fd17078115feaaa9be
 DIST github-exporter-1.0.2-deps.tar.xz 6692672 BLAKE2B 7b0d32b116d7661c89271c674c01680e7cf5b4af83e7eebf4d069a34696fffdf21c57f376acce02922d8c02a8238d967115d561cca4dec1437efb561b5bb3661 SHA512 4c3c24ab3cdc8723f47226f90bdaeff2b5d92d38184bfdc230351db74a172c3dcb9fb4bd3c240a70a15e71eb0ad782c579f3fa3bb0aff105999aa3f4a6110c1e
 DIST github-exporter-1.0.2.tar.gz 20534 BLAKE2B 344e01adfca6afade30598305ba388878ddfb3a7e277dc95b87bb5a409bc269b4bfce7ba178ac155f3cd06f72fcf69cf8c38c898eaf391e85ce122618c707fcd SHA512 98326a8c33a7b1e3e7d4106bdd58d07ec34a9f56bce5e4caefe07ba31ac50e2c98bf849aa60cf9d5445afd02d3d9c899a3cb59eddf45635130853d740b3d6347
+DIST github-exporter-1.0.3-deps.tar.xz 7786648 BLAKE2B 1dd1876f144e95602131f6f0ec11f4189a88a56821f4ee812b906a1d6d8494651465e416c409a998b19b48081ec8c53d5f11a51f8292002cb9fc50fc13fc4e81 SHA512 247b80369efe54e838868b0c94075031a4430d03f1c8ffefb686d94a6de70f5f288f79459a14f9c1331d2f1a3f9e865e5f7cbd658dc6f01bc7c6e893b5305af2
+DIST github-exporter-1.0.3.tar.gz 22089 BLAKE2B 69ac6a71fa8872c08cb24b6fa3e0aa79a8d49fdc626606f5ae1265cb654f73a320d53c1f934f3b2a116c713412f0cb278e27ed892da19b54ff09405abba5bfc4 SHA512 9b3ab36dc8c76e844afdb7f36099dca86f358072fb0ccc134e4ba6754b2a84122b700bb92607014eb2e21e1e3f3889f842e82cd612e66d223e31aef60d123220
 EBUILD github-exporter-1.0.2.ebuild 846 BLAKE2B 6ae50bbaacae7066b2d32485d442fed91f8c2e974af7346be579b58e2dd6796db1feefe6a4c93bb072e1685589c4dc65d22bddbbae1de8e3db555c707ea2d061 SHA512 0f68bb844d0e991d0d024f3a979cdc92448a5923c939c0e034545da8aed8540cc643f05bd82aaf743279db5823178af93bfd955f2cc006f2e2530dd0b7893e26
+EBUILD github-exporter-1.0.3.ebuild 930 BLAKE2B 7f91f9502d134f983b9cc54ad9304fa1b66a7a46d6a83ee6c8b2fa98c3b2a6dc4eadf93b8b5637a246abb73581e12009b1269ab847fb01aef4543d406cc85e0e SHA512 af755726d38a7f1ac684a3a9a78ca0e390bdb7fb352d87ed8abaa6c4242f98a3724bb30be57a0f948532dabda0b91a67d9e1a5fa3b5b7028f2402a6aefa0993b
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-metrics/github-exporter/github-exporter-1.0.3.ebuild b/app-metrics/github-exporter/github-exporter-1.0.3.ebuild
new file mode 100644
index 000000000000..52f961aa7341
--- /dev/null
+++ b/app-metrics/github-exporter/github-exporter-1.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+DESCRIPTION="Github statistics exporter for prometheus"
+HOMEPAGE="https://github.com/infinityworks/github-exporter"
+SRC_URI="https://github.com/infinityworks/github-exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-group/github-exporter
+	acct-user/github-exporter"
+
+	src_prepare() {
+		default
+		sed -i -e 's/-race//' Makefile || die 'sed failed'
+	}
+
+src_compile() {
+	ego build
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.md
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Before you can use ${PN}, you must configure it in"
+		elog "${EROOT}/etc/conf.d/${PN}"
+	fi
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 209a87116633..913f1ff23c0a 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index e5265866ffa4..aa7fae23802d 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,6 +1,8 @@
 AUX implementations.txt 863 BLAKE2B 1393ce40ffb145e6d90cf53d100c7ddc57fff31667cd2cafdef4e398e11b01aecbfcbe2ac46ad98d149ce48f6775e85d1d09c3c8c4a4af4565583ca59b86287d SHA512 de2e9d9213f720d186d2dec7d52c489b243890fb809cf9e00e16036447a6a459bb6e1037fc7fe56cc25ef45892bcbb3c9bb9e56d45e67137d8cc9474e124cead
 DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
 DIST gpyutils-0.8.3.gh.tar.gz 20277 BLAKE2B b91f51ec4315238fdc7e69d3c7f551ecde72f57b960578846d50721d345487650e4e08c7faed54eb22e9423909ac541b092a23b6ac82e9f71a2aaa79a4eb2639 SHA512 0b3f9ef166f9d7e55b8335381bfa04dcccc37d5966f381f57ff555f2a2f5accda46a7fc2a713289d5ba94c0fa107436d593af9eb1d2d3a6f3957b94a1589cfe9
+DIST gpyutils-0.8.4.gh.tar.gz 20477 BLAKE2B 661ec8c9ae595daa112de2171331a5791fa4a10b50f9ebf76589c4c6ff4d6b8e618657dd9f3dd6cf573871ab6e0a9d017d87e03066fa60ba8b9d4e4617f68306 SHA512 f87a087464ca8e1118232227d2e6ad66aa021caabf0307c153b442fc4467bd124eb918c16104bdd1b42866acde16fdde4b99312a8c047ecf379ed10a74d27541
 EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B e314655e2eb935449cb2472e174fca91222da62bb5538c73977718d20ac9b7ac7f695e9a02dffa94357ba7a7d91d023ecd180bb76a5e1693ffc10ca73197c8fa SHA512 7ed975c1955ac8c5c09347844237a4073bdce2a845941ba93244f0826dcd789cfd42f03c562c0128fa2a61fc82ea933c8ee9e5d11b44b8536e4566e55aa65244
-EBUILD gpyutils-0.8.3.ebuild 575 BLAKE2B 87a9728647575f4f0ff64d0c6e47ddde23e5cdc49686530a7507931df2daaf03d1ab9ab8a5130d97dcde9a617ceb44ea2076716cfa22a22300e7f62a251f42fa SHA512 375215b7ce481d1fb4e300f2ad4b602cf224379f68a7b4a1075ad670addb061d20be8a4cc7f80875626c0dfe01422c0fa8db8daf5b524b80e933fe5bb1b37708
+EBUILD gpyutils-0.8.3-r1.ebuild 615 BLAKE2B 8b6287dcc8376a51a0f63516538dd3eadc7484171a6c1f25af75f77af5a70ad394443f2c15d5910f7806be2d1b2b0b7dd775a2891a02f0be07525d7f85f1e053 SHA512 4b78a48dde6380c8de07687e8b95de867c69184794b93ce8a62074403972764df935bd4942b5fb05f1f05f414154c15ea1638143fe3841a2082c6d1a48c49c3c
+EBUILD gpyutils-0.8.4.ebuild 615 BLAKE2B 8b6287dcc8376a51a0f63516538dd3eadc7484171a6c1f25af75f77af5a70ad394443f2c15d5910f7806be2d1b2b0b7dd775a2891a02f0be07525d7f85f1e053 SHA512 4b78a48dde6380c8de07687e8b95de867c69184794b93ce8a62074403972764df935bd4942b5fb05f1f05f414154c15ea1638143fe3841a2082c6d1a48c49c3c
 MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/gpyutils-0.8.3.ebuild b/app-portage/gpyutils/gpyutils-0.8.3-r1.ebuild
index d37ab54a558b..b458fe6df37d 100644
--- a/app-portage/gpyutils/gpyutils-0.8.3.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.3-r1.ebuild
@@ -25,6 +25,7 @@ IUSE=""
 
 RDEPEND="
 	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-0.8.4.ebuild b/app-portage/gpyutils/gpyutils-0.8.4.ebuild
new file mode 100644
index 000000000000..b458fe6df37d
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.8.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="
+	https://github.com/projg2/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
+SRC_URI="
+	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 02f17e057bdc..dd793a3e0b6a 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/e3-core/Manifest b/dev-ada/e3-core/Manifest
index a0546cd5db19..b3877db7fb5d 100644
--- a/dev-ada/e3-core/Manifest
+++ b/dev-ada/e3-core/Manifest
@@ -1,7 +1,5 @@
 AUX e3-core-22.1.0-distro.patch 1143 BLAKE2B ebe7fd0b37ed6dbbe506f4bb86aa8b3bbf59b5e1475b65db07b2a8b28ab86f30998f381c976e9b1eb0f5222171a3c6a592bf7d6a3364a0a0a6c1eb307c0261ef SHA512 16ba2640ecb260702272da1d87b92ce779459da47ef4c1cdc6ad4f5fe98740501df88bc2ef849c55f0eb482a99ab376876af1f5a38a02fe0aeef085c190ecba0
 AUX e3-core-22.1.0-test.patch 1057 BLAKE2B 4a8d5ea01e2cd51c297f58db18a25844197bdbaa725260de3eeace06dc3afa74332f10df685947b8bb21e4554920c72eb2c5d08d334d2f77989241510ee00098 SHA512 0771e4d08c611c3b39a695830a30b279470a97e0ccc4c2d6ef0ed184bcbc784240231a93942b89919b4718ed8ede1d3e7b9ff9acf66b547b369fa702cc05f384
-DIST e3-core-22.1.0.tar.gz 442938 BLAKE2B b207a09d8b97f707e8b3a6255b9ef7161e40f716a8bcd853923df2310f2413689ddadf9db98e90f103f8a93813eec20bf462e47541d6f409df5966b0b1d9fca7 SHA512 e887fea2140bb42ebc9d8596b87dc077f8da6a0ed4178081aedaaf3f462b76a431c53e6e56bcb7efee2ed3854c50d7b989819b469b394977d6d25f644368f12d
 DIST e3-core-22.2.0.tar.gz 383417 BLAKE2B ef595dc785b0073a53ddb06ab1ab7b1a0e9eea0131d2a15318f6355a581f83d14f61f6b0f23d4e3df4afe31e0c03a6b1b4ca8b5aefdb3f982ccaa3454f127f0d SHA512 a2bc2a183b3fed9ad2f0119406dc26857254e4a68014f618a75c062518b990e5f1f3af72e9dc321dea3f9248bd97bded87a20b5389a3e03f2d3b76bb83f56216
-EBUILD e3-core-22.1.0-r1.ebuild 1421 BLAKE2B 8b4d51f3187c5d5d705ee559d9775fcd738d0bf2f8a47423de383e46c1bda990ca4969b00042ab441e3006bb82bd06684a58c4461632108ed4559cdf49bd14cd SHA512 42fc096712086e21382941860eba8246c9d7a796647a137cc7c13bb143e603781c8a6f2acc9fdcbceef6d68561b5669207aa759f8162368ba34ebe5ab222b9bb
-EBUILD e3-core-22.2.0.ebuild 1426 BLAKE2B 5be6c9eb8a2e1e2e617117a9233761fa9c2997940983d8f34c2e14860a9ff57846600561e6049fb63bfb696f20d7e9d62bb0f5d69ed175a26d97adb5d8d76160 SHA512 9579f294270a3df595343cd593f84ec9f13b0ac30bc14357848493a7ae52aff0116440a13c40217e617c009736a652960f3ec68a0db3f99ad20183bca1009097
+EBUILD e3-core-22.2.0.ebuild 1424 BLAKE2B 19cb1f1c0dbfa00e06c25e7c0be8c49c41b01c2b79f3ec63fe51f1b094989a36564bd3bb28a29cbf285f8b4fdfba5efe7c8a1a2408a4a8c6472d3124846fd338 SHA512 fae4f93f5444f2cc6ea641443c7f661e908ec65de3aad7e5a1824267e803a6f01557c3f15eba2877803efee4af0557ad7b7ca0278d19b2debe9d1376e6bcf421
 MISC metadata.xml 1257 BLAKE2B c5170ed783bde8d288632069c3e5496d50dfd77a0f7fb62e00964660bd7b3c482509bdf8983af16d1aa7be6bd9ee20708711fc688f002d5bace078c93c4ed212 SHA512 d7fd1018cb701d777e3246fe91b018ea25ebd5bc641e6897d683dee0fcfdd1841d13f9701212d15e81cde531f8e26d10cc156c9ed47125dfbcbc6bd5bacf18af
diff --git a/dev-ada/e3-core/e3-core-22.1.0-r1.ebuild b/dev-ada/e3-core/e3-core-22.1.0-r1.ebuild
deleted file mode 100644
index de08bb95f3d7..000000000000
--- a/dev-ada/e3-core/e3-core-22.1.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Ease the development of portable automated build systems"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	!app-editors/e3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/httpretty[${PYTHON_USEDEP}]
-		dev-vcs/subversion
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-distro.patch
-	"${FILESDIR}"/${P}-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_compile() {
-	local PLATFORM=x86_64-linux
-	rm src/e3/os/data/rlimit* || die
-	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} tools/rlimit/rlimit.c ${LDFLAGS}
-	distutils-r1_src_compile
-}
diff --git a/dev-ada/e3-core/e3-core-22.2.0.ebuild b/dev-ada/e3-core/e3-core-22.2.0.ebuild
index 4fe586a45700..1d932fed8927 100644
--- a/dev-ada/e3-core/e3-core-22.2.0.ebuild
+++ b/dev-ada/e3-core/e3-core-22.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-ada/e3-testsuite/Manifest b/dev-ada/e3-testsuite/Manifest
index cbcaadb08001..a91e18d66298 100644
--- a/dev-ada/e3-testsuite/Manifest
+++ b/dev-ada/e3-testsuite/Manifest
@@ -1,5 +1,3 @@
-DIST e3-testsuite-24.0.tar.gz 103595 BLAKE2B c41360aeb9243810fb3fe26c567430365c09823430927cb1e5e04e4fc0e3b28727a7fe3e286b1fe135ce32e2cc85821994804695a23f6fddcfc4f4bb8f57661b SHA512 1460b3611b863d0311960702fd684612f32cd876fa1864feae39b16251677ee25f4f29c1f749d2eeb93d0306dc3c130e424e11c6d5561f01482a065f239de170
 DIST e3-testsuite-25.0.tar.gz 138004 BLAKE2B 5a1b5bd7e51bae030867034ab48b4dbf38813a52c9d72f76dfac6018faf37ec69e3967a94f371fcc395df01e82a80426ecad274cfb5999c893c2559289421a0b SHA512 3aef1fae5204991f7f8c2c0456b46c9c1535c59c55c4840184f986ff2444de518a2f165f052dfd0412f25824ab26bea6a6317b20f194f459d30a17580cdea8c6
-EBUILD e3-testsuite-24.0.ebuild 659 BLAKE2B a2650cf161868c0107eb2ddb3debe6bcf252fee96e88bc6886c7498af051f2340f13bf05bf7d10c33bec2aaa4be4cb225aafb7adaa41ed5de1148c0908474ef3 SHA512 7a51101db9c27c175be255fa0e1e6d4c4fb4f5897ae9dc29efc5d056983a3bc4aa437b92f8162b63e3f506c0cd98569cb1ae4dca2c1cf692450371641b0abcd9
-EBUILD e3-testsuite-25.0.ebuild 659 BLAKE2B a2650cf161868c0107eb2ddb3debe6bcf252fee96e88bc6886c7498af051f2340f13bf05bf7d10c33bec2aaa4be4cb225aafb7adaa41ed5de1148c0908474ef3 SHA512 7a51101db9c27c175be255fa0e1e6d4c4fb4f5897ae9dc29efc5d056983a3bc4aa437b92f8162b63e3f506c0cd98569cb1ae4dca2c1cf692450371641b0abcd9
+EBUILD e3-testsuite-25.0.ebuild 657 BLAKE2B ab453295dacd61f5d2f4d3dca50e2f68fcbf34400fdc13254eaf16399fa89f9b2c9440e438e1ba815c1a79eada8bc6e64a85c3f1abd123e68f4ec2f24f532235 SHA512 c0ccb54f489a9325b353deca30c39be1be27b06d3ad06bd4e16516a11ca8e3ace38b92059b808021076f036934443889c5769ce58fa720f69d0979b7b8bf616e
 MISC metadata.xml 664 BLAKE2B f7ac98a78cd187aa5e84b564d59982bfeb21d992a309803fcd747242e9373d7aa5cfa648a06ae5442c843f136a76929c34e5c28ea03c6bdd1d94e6c1a10ee226 SHA512 62123c662e3dc67a8d55d5ea6e88207c63df0dc4a0dd314c2e9f708360485997613913a54617c24adf9b26caf4202c04c069fa8bfe8ee3ba906e245da311a40b
diff --git a/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
deleted file mode 100644
index 159e6e07c792..000000000000
--- a/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Generic testsuite framework in Python"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
index 159e6e07c792..b692bb33f385 100644
--- a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
+++ b/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 8197f0d28149..84edb7a1771c 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,7 +1,3 @@
-DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
-DIST gnatcoll-bindings-22.0.0.tar.gz 243040 BLAKE2B f6577e6d31362b59ac2bdb8c70772e6783d88f192f63e335082140d143d17be15bb62143174217b2e823e6183e5148725c1d12e4b00c3cc0abfacf3a279d30df SHA512 b8f4184f0992057ea33350e30e007859c5ef3e028d7604c47ae160f3c2ffcc828187ed9c9c3de7c6d2b7b16274714822460dc09d687386035d2773df45e90bf2
 DIST gnatcoll-bindings-23.0.0.tar.gz 251006 BLAKE2B 8cc5ada5c76d146d80c1b83bfbcfea28b9951339eb5dcdca40a4b40fdeb2ed2ad1971deea60b6fdc7cc2565745958d13fcc1acbd012465dea4cb2535e947af34 SHA512 3f92d3c95ffbcf96df53a1db39c9b829ae3d0a9ee3695d3d7726168bd6744ca4d4dfe4b224b50b50603c6295e1c0c6dd3d9940cf9e20c147a3bed8e6cc39c1ce
-EBUILD gnatcoll-bindings-2021.ebuild 2249 BLAKE2B 237a057951be1e50021c3116077bf8c305f12acb75161e45d580b110f07a2d16ca6fc477d8889ae7ea8730244fa4b94d2f56c1d498c79b6bcd6fedf0f4c8a6e9 SHA512 5ff453ae35ccd240481da9b5f36f8d7cf39835681aade25aa9e32371d83de76346b8d5af4000913b7f6ffd823bd15b3062d9b05d9956b0bef7cca4c1287987ee
-EBUILD gnatcoll-bindings-22.0.0-r1.ebuild 2477 BLAKE2B b68831cb650505e1f4cce39ce6570f98479d692f7fc1d93174090df87f21a932c99a1a534b539bb5968e05ba63a3b09fb16431fa427facb8d7e805b184739c60 SHA512 aebe754f2b8fe6a07c2d6c4b6031e0109d8e01149089dc8c3e785f0f0372c3c9e23bac0f4c08d1329cf1cab274f498b1bf7ba9bf49e70d224c1c38170c793549
-EBUILD gnatcoll-bindings-23.0.0.ebuild 2477 BLAKE2B b68831cb650505e1f4cce39ce6570f98479d692f7fc1d93174090df87f21a932c99a1a534b539bb5968e05ba63a3b09fb16431fa427facb8d7e805b184739c60 SHA512 aebe754f2b8fe6a07c2d6c4b6031e0109d8e01149089dc8c3e785f0f0372c3c9e23bac0f4c08d1329cf1cab274f498b1bf7ba9bf49e70d224c1c38170c793549
+EBUILD gnatcoll-bindings-23.0.0.ebuild 2475 BLAKE2B 493290385f6ca4e32aea5f66d50a5cb0a5234418a82016d8e9e5c533e37d80580fab3f8e60b8635dc95574a76d7dd4c0ef79d83ca097d4058f7313ecaebe3661 SHA512 88937778a4d09187e913ada43f9d3b72eb698d486094c7090b79ae2ebe98ae8a0f98d0ae74011981672726ff46e01a60520dd826c8f3a0414c65646b4fe52af2
 MISC metadata.xml 1172 BLAKE2B 23758b9a71c24a6e635488947a6491713dd69750c62715b1fe0eb12db380d1ecc80ebb4941a00a9ae01ce2009316849e802560bc52402fed64b671547951cf89 SHA512 1ea356da231ee9b42df8733e0ca6c3cbb5e3a2f0eb143bc894a8961e82b69f2e05b0f5d8dba309dc6b0556c4340bb51175fe9aa5a272aae006eed4a2cf449098
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
deleted file mode 100644
index d053766be68b..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing python-single-r1
-
-MYP=${P}-${PV}0518-19B15-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=d93655ced17f15c5f376b6861825df3f9c183980
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	rm -rf python || die
-	mv python3 python || die
-	default
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			--build-var=LIBRARY_TYPE \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
deleted file mode 100644
index ec2ef2912511..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-inherit ada multiprocessing python-single-r1
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	|| ( gmp iconv lzma openmp python readline syslog )
-	${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )
-	lzma? ( app-arch/xz-utils )
-	openmp? ( dev-lang/gnat-gpl:=[openmp] )
-	"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	rm -r python || die
-	mv python3 python || die
-	default
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_VERSION=${PV} \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild
index ec2ef2912511..c265ed8ecc08 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	|| ( gmp iconv lzma openmp python readline syslog )
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 3b17d972236b..e48f7d4fc25b 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,11 +1,4 @@
-AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
-AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
-AUX gtkada-2021-uninstall.patch 398 BLAKE2B 2f5becba847173f5e780ca712d3fa3a8180fade82d36d6cbe3e94acb3e3d64e5754ee41b221878dbcfbb5db056e976a16837ce22aeb8c35027c0df6622a64bae SHA512 53a325b4b51e9d5dafc583e6001064b3d5cca9b5e1d4ccccc5280726c10a25f1a2563d1fe62c9d9c48ee058e4d4cc7bc8b722c5a89f4d276ddfac2bfa4726461
 AUX gtkada-23.0.0-gentoo.patch 2408 BLAKE2B 658863cebee256a7dc59f66cb852a5ab322291393e4a7a97b194d4724e0ae8dc01e048c7cd5ee375ea812d4b144216d2ab0487e278b32935aa772aa45e43d3df SHA512 8e84c77b45b97db1b60b830afb151bcdb76bac32585a5ba2131beb9f9252fba3b41b7b2fb03eb6c7e7714c5307faa189cee6c16529470780e66117f4d95682e8
-DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
-DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
 DIST gtkada-23.0.0.tar.gz 6045493 BLAKE2B 05efb40453aa6f3ebd3beaf3dd7915bc2cca8cfec211bc6ae2f0a7a15f16029b1142028422367dbd4f68e72e02b71c030eec39802b0f9202e411d611a1fe521b SHA512 ea5dffe4fe1b99cfbd952bace510aff9e0f79fe2fa075c299d12e68dfb43b6334df0d707631de30e6e2c3a80759d342b178e8ed29a82e90445e450cfd332767f
-EBUILD gtkada-2021-r1.ebuild 1417 BLAKE2B 107c8fec3c75286a4b226b57b42480805a10d6b350d2fb0ed16d61f9ea20ed2e4440963d754e5b07aa4463489576d1b5f5addd1a508f4812b629df21dd6f4ebc SHA512 be586bb4100203bfa9bc7719d47f0dc23614e053f58bca3ca766ae30b6f6544f432bc76fd1d2121b589daf2ea567464ebbaaaa66a070d6332c54058982517d5e
-EBUILD gtkada-22.0.0-r1.ebuild 1214 BLAKE2B 8b293c1185334ae22e61219fc01805a8f133336ccb89a33a050f3bb9e7d91eda81512121b87a599d50e7963a102acac467a8d01b077c3bb1325c1f4538d8af3d SHA512 917f8dd25f03d9fc5814875c6b497d32a96f2ec4ffcc53d01bdb30c3a96a7c692fd49de1925ff280f9d69320c89337f4e99b2739a080b8e68c007387267d1bd5
-EBUILD gtkada-23.0.0-r1.ebuild 1077 BLAKE2B 1c57f8f2d53e6b76454326e7ddcbc36f170650678184189105535632ad7250c925cc02bf7466a3302ae4d068e326f0436477f4eefbf951d2301565e91d74e1fe SHA512 d78987888ae61c78ea036b56f4b67e11aa1e7a48cf687d6f2b7d3374d75694b3c07812aef9aaa3bc842d8b5c4a1bcf8e4d8c0934bfb9ec0c920b58d4ae467b76
+EBUILD gtkada-23.0.0-r1.ebuild 1075 BLAKE2B 6d450bc33018b960b5385a40359301f8613825b9ca96bd091f9e012da2a6ba0ec18496ffc2d1a05f868316ff6a46d71281a58e4085bc375e5287dd821572da68 SHA512 14c609b15840de38b9006dfe1ad481f549a805a22c7964a429fbe9104538db25635455429306314ef4c2bb7afebdfb7a0cfa070873913594dc254a58c93093b2
 MISC metadata.xml 688 BLAKE2B d3ea42354ba10dd872affbaeb5a14833cc2254bed85f10e15871c8131a46d3f996948b2fffb9d9aa795c914e4e9dc5d3f34e86666a2526c566d4b03fa14bf121 SHA512 ce18831b728277d125cf4cd86522a238ec17f4cab007958212c95f3ee97fedbdb827749549e0ea4eff93dc74022d61515d116f3fe606db34496e9045b8c23778
diff --git a/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
deleted file mode 100644
index 0dbbbe720d05..000000000000
--- a/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
- 	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
- 	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -121,9 +121,6 @@
- install: install-clean
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${DESTDIR}${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
diff --git a/dev-ada/gtkada/files/gtkada-2019-gentoo.patch b/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
deleted file mode 100644
index 79f58a41b2d1..000000000000
--- a/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2019-09-21 18:47:40.749628914 +0200
-+++ b/Makefile.in	2019-09-21 18:48:08.547200073 +0200
-@@ -30,7 +30,7 @@
- 
- GPRBUILD_FULL = ${GPRBUILD} -j${PROCESSORS} -m -p ${GPRBUILD_SWITCHES}
- GPRINSTALL_FULL = ${GPRINSTALL} -p -f --project-subdir=$(PRJDIR) \
--	--build-var=GTKADA_BUILD,LIBRARY_TYPE --install-name=gtkada \
-+	--build-var=LIBRARY_TYPE --install-name=gtkada \
- 	--prefix=${DESTDIR}$(prefix) -XGTK_PREFIX=${prefix}
- 
- GETTEXT_INTL=@GETTEXT_INTL@
diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
deleted file mode 100644
index c782aac633b7..000000000000
--- a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in	2021-12-27 09:42:14.575136019 +0100
-+++ b/Makefile.in	2021-12-27 09:42:31.159870381 +0100
-@@ -113,10 +113,6 @@
- endif
- 
- install-clean:
--ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
--	-$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
--		--project-subdir=lib/gnat gtkada
--endif
- 
- install: install-clean
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2021-r1.ebuild b/dev-ada/gtkada/gtkada-2021-r1.ebuild
deleted file mode 100644
index fba47ffdfa82..000000000000
--- a/dev-ada/gtkada/gtkada-2021-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada autotools multiprocessing
-
-MYP=${P}-${PV}0518-1A011-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=8f1daefcb56e3ee7feaad67bac66deb0f7c37a82
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${PN}-2019-gentoo.patch
-	"${FILESDIR}"/${P}-uninstall.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	mv "${D}"/usr/share/doc/${PN}/${PN}_* "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild
deleted file mode 100644
index cb04aaa50040..000000000000
--- a/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-inherit ada autotools multiprocessing
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${PN}-2019-gentoo.patch
-	"${FILESDIR}"/${PN}-2021-uninstall.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		$(use_enable static-pic) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
index 3a6423ea98e4..db3837e5aaaf 100644
--- a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="${ADA_DEPS}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 5cdae4e6cb6c..aecaf889be2a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 399266d51bb6..3dde3e9a9549 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -23,5 +23,6 @@ EBUILD mariadb-10.4.27.ebuild 42079 BLAKE2B 4dd73392405ef22c0d366e3be03d5329fbeb
 EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82
 EBUILD mariadb-10.5.18.ebuild 42038 BLAKE2B 00aa21e6ef21413fb9bbb22cefd4431910ecc9970867b6a931f3f357319e4fec6e20d78c527498b3194029ec6541030dfd7966f529db73e3217b4e0535e7523a SHA512 b3ef6c099808a17b568ccc9a1e9fbed357508d9c25f303271f8f049cd03c4eb098823bbb1b2504fd00ed49f69dc822254c03db3476504bfdbbc72c7515a19c4c
 EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d
+EBUILD mariadb-10.6.11-r1.ebuild 42499 BLAKE2B 6e4e0787a4b5585e75e2d8407a95b512a26fbfb49764dd1f8e652790dc9cf88ff54b3bc8973d486704142811ebb04e639c094138323df9f54369258da7d253d9 SHA512 9ff135404e417f02e773d9e65601d273fed90db018e18e9eaefb5a17e64cb4c0639605ed91390748ae3ff47e9ebdcc9e18c7adcf8193b97e6c67be023e2747f3
 EBUILD mariadb-10.6.11.ebuild 42567 BLAKE2B 51ccc2336df1a87c36132f8da66a6b7861630ba3f2f99995fcfb883ea24dbdcde48cb449c2386f3685e920d88e2355ff84db6c66fe6f961a12bf95da7ef59395 SHA512 b5e35f356dabf39b7c7571c07c329f8bf6ac2903437b0319dbdd2deb94b02045a51e22f0206c32a9d2efed6403dbcf3f408adc6acd06e35291d3e21cf16dcc17
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/mariadb-10.6.11-r1.ebuild b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
new file mode 100644
index 000000000000..5671e55d5756
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
@@ -0,0 +1,1318 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+HOMEPAGE="https://mariadb.org/"
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+	https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz"
+
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+	test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~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
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=dev-libs/libpcre2-10.34:=
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	virtual/libcrypt:=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kerberos? ( virtual/krb5 )
+	kernel_linux? (
+		dev-libs/libaio:0=
+		sys-libs/liburing:=
+		sys-process/procps:0=
+	)
+	server? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		backup? ( app-arch/libarchive:0= )
+		columnstore? (
+			app-arch/snappy
+			dev-libs/boost:=
+			dev-libs/libxml2:2=
+		)
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? (
+			dev-libs/boost:=
+			dev-libs/judy:0=
+		)
+		pam? ( sys-libs/pam:0= )
+		s3? ( net-misc/curl )
+		systemd? ( sys-apps/systemd:= )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+"
+BDEPEND="app-alternatives/yacc"
+DEPEND="${COMMON_DEPEND}
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.7
+	!dev-db/mariadb:10.8
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	selinux? ( sec-policy/selinux-mysql )
+	server? (
+		columnstore? ( dev-db/mariadb-connector-c )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
+	eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_S3=$(usex s3 YES NO)
+			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8mb4
+				-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+		touch "${S}"/mysql-test/unstable-tests || die
+	fi
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
+	disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "spider.*;0;Fails with network sandbox" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Conflicting files
+	conflicting_files=()
+
+	# We prefer my_print_defaults from dev-db/mysql-connector-c
+	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	conflicting_files+=( "${ED}/usr/bin/mytop" )
+	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
+
+	local conflicting_file
+	for conflicting_file in "${conflicting_files[@]}" ; do
+		if [[ -e "${conflicting_file}" ]] ; then
+			rm -v "${conflicting_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove dangling symlink
+	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local option="--${2}"
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+
+		local values=()
+		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+		for parameter in "${parameters[@]}"
+		do
+			# my_print_defaults guarantees output of options, one per line,
+			# in the form that they would be specified on the command line.
+			# So checking for --option=* should be safe.
+			case ${parameter} in
+				${option}=*)
+					values+=( "${parameter#*=}" )
+					;;
+			esac
+		done
+
+		if [[ ${#values[@]} -gt 0 ]] ; then
+			# Option could have been set multiple times
+			# in which case only the last occurrence
+			# contains the current value
+			echo "${values[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		# Only create directory when MYSQL_LOG_BIN is an absolute path
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Only test when MYSQL_LOG_BIN is an absolute path
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		# Only create directory when MYSQL_RELAY_LOG is an absolute path
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Only test when MYSQL_RELAY_LOG is an absolute path
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+		# Absolute path for binary log files specified
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+		# Absolute path for relay log files specified
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 927786880565..179f60296469 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 17ccfa6b6733..8b87b6b7e8ae 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,10 +1,3 @@
-AUX flatbuffers-2.0.6-locales-detection-fixup.patch 1183 BLAKE2B ab4612ff9cfd3a9c96b71d349a801bd359c62588946053dcc3dbfb32345d352d60d08778b998f32cea33aa3a20e74a29602afb4721d21b2a3dffaade8d473658 SHA512 d9b5ad550a363ab73025179c416cbb0d613e4be8a6307e3bf4fe40c64fd6757168c49b12a073351bc5d041c6bf0ccc4d297db87575215de0b3abdb1a21213975
-DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
-DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
 DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
-DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
-EBUILD flatbuffers-2.0.6-r1.ebuild 920 BLAKE2B e8c13808ce448b216769c24434f84a9d4a0ff22e0c2399b7e42ae5b8a76ce96225c937b15e733821ff2d93a56759ce7a33b8ec24409e5df73ce4c21ddded859c SHA512 6bd3bbbe3f2cf3ac988193ce8aef16627dd78fcc19e1faf0aff1aeea5c2fd0cb17d4cdd97043f5ab1aacac401829fd44337be33b71f2ded846a089cd604c3af2
-EBUILD flatbuffers-22.12.06.ebuild 742 BLAKE2B b0de01e3b69a08eb7cc1c55e1a3186bd9164608526a944a1afc3240ac12270bebf641590cdb340b35793dbb44915723516e68c0fdf78b5eb7a2471674e8bfb0b SHA512 62514b164c3c685d465cab33c3a5fa88179b32bc7e4ba9a9fa88e7ee2e9c99a139e5974e7ffefcf29d2f2d24ffe4fe0e9fbbf0a421ab6d556fddad70f5b04f6f
 EBUILD flatbuffers-23.1.21.ebuild 743 BLAKE2B cf71240aa2e2064ba0d0e52acb85b0ee0c8ae8428c3ddd1cc7e69e001e21534d7e55b50c9edc60fb198e621d12dd0dcb9988d97c6e6bace76a4ed71f5f531012 SHA512 d73d3599e4d74c0edf837efeca83ff186173acb3696a77ff2cf34175a75ef5eb85917d766e07b59cf6d4a36c3a427fa1a84a031cdbb330e3518b76dae62f61b5
-EBUILD flatbuffers-23.1.4.ebuild 750 BLAKE2B 013f70a5bea33c9f21ada909bf0f1c4d3b5d0f2672fff38326113c7185a974f4f91d2aebb15708c55c1e90e885a4ae5acd080a7b30063758743ffdc980125e71 SHA512 fb9a0d0b1e1a6785da0ad92ec123f0d7c1757523e4f570dec814cca818144ffd8f1573555215d011dd513ddafd0bb23a054e04072cfef362b98f1698a7733a8b
 MISC metadata.xml 331 BLAKE2B 6808287f0f9c9f882f52d65ed13a634ddb184341a565d561c120ec451e5414e9ff48c3d7aebe0c240671e514af83cb5e8ee7bdb8b47f57fb323dc5bc5fe37b5c SHA512 bc40060a61a79ffc86bf6d1bc6a058bd05f35c765a530e5153ffe6213ef486235aa6caf4eb43c36a66b995ea35e43f4c3bbf6a3b4591b73bd7f8b6511b962d23
diff --git a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
deleted file mode 100644
index 6ab1b085876c..000000000000
--- a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Wed, 22 Jun 2022 13:09:43 -0500
-Subject: [PATCH] Fix base.h to only include locale support for glibc users
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- include/flatbuffers/base.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
-index 458ac3f..46d6d80 100644
---- a/include/flatbuffers/base.h
-+++ b/include/flatbuffers/base.h
-@@ -262,7 +262,7 @@ namespace flatbuffers {
- #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
-   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
-   #if ((defined(_MSC_VER) && _MSC_VER >= 1800)            || \
--       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
-+       (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
-     #define FLATBUFFERS_LOCALE_INDEPENDENT 1
-   #else
-     #define FLATBUFFERS_LOCALE_INDEPENDENT 0
--- 
-2.35.1
-
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
deleted file mode 100644
index 4fd61a266b9f..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6-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
-
-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 ~riscv x86"
-IUSE="static-libs test"
-
-# out-of-source build broken, bug #842060
-RESTRICT="test !test? ( test )"
-
-DOCS=( readme.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild b/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild
deleted file mode 100644
index d20c1234354b..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-22.12.06.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="
-	https://google.github.io/flatbuffers/
-	https://github.com/google/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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)
-		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild b/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild
deleted file mode 100644
index fe724780b7de..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-23.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="
-	https://google.github.io/flatbuffers/
-	https://github.com/google/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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)
-		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index c82a6422d4d5..1e567a8f3be7 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,3 @@
-DIST libretls-3.5.2.tar.gz 425404 BLAKE2B b975326c0bd9c2f4adb511f3a6ad4fc8cd9afccd24a3def0c82bf68473b73b93cd83b8b6b3ffb29fc5ba378a9d4fd902dda933f552a02fec374cd56e1690956e SHA512 62eed971cbacb4a50e5ebdad1ea1d57dd3b4f7520634393faf1fc141ef63b6e7d50acbe49747c956fca6b9f2dec8a79ab724df6e08a77858a1624b5a6e3cbe57
 DIST libretls-3.7.0.tar.gz 427980 BLAKE2B 291e4da4038b1baf88694c9e38e31b8d656d8ecb2ab397e7ce6efe4cfd55d69ccf03cfbe84fd7858d7d64c2ebb00dd43102dfd2ff9e6a3f3df95924930d2e099 SHA512 18987d09ee804883e2c3cfae1209494b7020d976cc7137ba39540c18e0dc23d25034a46c6c64955201b425ca981e03cbe629f9ff979fd4a72d3dcfbd51efdf84
-EBUILD libretls-3.5.2-r1.ebuild 601 BLAKE2B 4adbdb7e4ee3fb2a2302a9d7c9ca97a4aa1181c0a3c1f1f019ad16988ff093b8634b9ee749495a6e864d2de1743863ef1254ef9a70122af6b72724d519759de8 SHA512 a490e3f7e0c92dbea530c9be6fc92cfe80f88e7267918962228ab4e55ccddd4656ad703d41fd885f684e1aabca3854fbd42dbb7f269d67f265a35ce221815210
 EBUILD libretls-3.7.0.ebuild 601 BLAKE2B 9405a5364607f2b79e6d28f3036fcf601d021143ad640463c34ba03fea75b091f86e9380d9137602d4688cea8078ef49f344a68d49aaaeceec3c21fb38641d2b SHA512 74fe06121d12c71c6011b950f2cc44952a5c11e438e8c4e86e07970ef83371fb260deea2527741ced649ccaacef831286089596f74511f350795caac9fe9c863
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-libs/libretls/libretls-3.5.2-r1.ebuild b/dev-libs/libretls/libretls-3.5.2-r1.ebuild
deleted file mode 100644
index 01c1e8509dda..000000000000
--- a/dev-libs/libretls/libretls-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
-HOMEPAGE="https://git.causal.agency/libretls/about/"
-SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	dev-libs/openssl:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6fa889a7cc18..ffa6e6530b02 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index c217465f3bfa..12360492b839 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,3 @@
-DIST bitarray-2.6.0.tar.gz 102780 BLAKE2B aaabaa2e59f54970087224a569e793705d8753901b0fc93e9a40a0ae2466940768e8f547fe25b32c0194893bf5baa77851bcf1608d3f18d9b1d5c11f70579dec SHA512 c4deeee54af884dc9200ffe80a7788db64478383f1210ab7e3aa2adf94809d2e38ae817bf11611f49373b12ebfe23cbe5287786da08475cf9761fd8345c554d7
-DIST bitarray-2.6.1.tar.gz 103605 BLAKE2B 3946f66330378010251465fc839dcf73f345f0993c3ddb99f53bb7aadc8616bacdb2dea3b48bedb3cf22145f4bf13b7f5a49d9e96f8371c0d0fcdbf967e18732 SHA512 3ed53e6d98c12b5dc2b6bd9d444846a5ca36d94402462e009da431cd39b06571df9d2de3c4c4c3f3ab883c42b6254edb5e1bb41b4374e33b7df46e0cc1720e3f
 DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c2fcb9d8ac7af0d207e56f8229c1e6a7e6ac7c0639d88b55f6d27f697cd6e4ece5cd0768d2624ac94eedabb0c60 SHA512 21a10fcc174b3e705551a6cfcf6e1b4ccb899c9d9a69e273e3c49528bcc5d889eac0dc3dbffc1f55fa561a091f8d11f3246035499cb9168192a03c6af034bd82
-EBUILD bitarray-2.6.0.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
-EBUILD bitarray-2.6.1.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
 EBUILD bitarray-2.6.2.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.6.0.ebuild b/dev-python/bitarray/bitarray-2.6.0.ebuild
deleted file mode 100644
index 1c38b679c12e..000000000000
--- a/dev-python/bitarray/bitarray-2.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.6.1.ebuild b/dev-python/bitarray/bitarray-2.6.1.ebuild
deleted file mode 100644
index 3f58f0209420..000000000000
--- a/dev-python/bitarray/bitarray-2.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b7fb6959b642..e7f8833047cf 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,20 +1,8 @@
-DIST boto3-1.26.50.gh.tar.gz 589841 BLAKE2B 98808cc2811f6371152b75424abe7da24230beb9caa4fcb62c273c232998fa1bbd4195d47e173c181f6b77cd95c6d90e21dc6126d65a0ce5453244cc03a5a12f SHA512 d4a8fd68c7fa099009e491f697ce3089a7f9d54433d25aa76d2733facde82f62f3955efc8ea5156dabce9502a2912847d45f7e1ab5dc71c1db26ca5d2b4ae220
 DIST boto3-1.26.54.gh.tar.gz 592401 BLAKE2B 7fd5bb10cda2b27fc43a7efa65c4651d95c8ddb7c94b424847f21010f9d748398a9efc47118ed7d2d90369664dddd4903fb8c4e7bc3ba3f70643a565b426023f SHA512 86d315eba84d783d327d19b41a593f193d9b356a205f29a1589e43e43519aa6eedefc26e7b23234dade6ab0bbb309d8039b011d0ba766757be8eb7a57c22f49b
-DIST boto3-1.26.57.gh.tar.gz 593947 BLAKE2B 5a30f237d992bb766b3afaced8b9e01c792c857a02aee5ba589f0f03c4c8eace3b32920d1dd62554fbb85d14b7f96789590d4acbc764dd3c56208fa5bf2dea1d SHA512 112719584ad122373e5aa24ebb6ea5c87772cdab71f59274b2f2172d92c72ed6894645253e15e12a808a83e14b12d27fde8a9fe086ccc33b987166de3fe0984b
-DIST boto3-1.26.58.gh.tar.gz 594149 BLAKE2B 5bf0ec6a321826a6f7cc346e6051e6b4d99451d0222ccf9445a9f24f561dd1797333a05d44addf1bea9b2b7e18b952c5acfa9f51a5d275fc7b34c5e8c5ab4342 SHA512 16a68f232cfdfbd4c8c6368d520c5826150039f069819aaf608a2e8b03845739a8014c54ba1fb57eeba8ebe4c6ad8e3b135d2a6a4dccd9d41de98fa0b730142d
 DIST boto3-1.26.59.gh.tar.gz 594565 BLAKE2B 90c5fe950da7fabc46a4c34e0a77997cfc643273f6b3c1afed6caad3415486b25a6610c8fb9d3f3450b4f3b73e45cfec5d6b1f02666dbd2608944e2db81a955b SHA512 e4dff5978e41a9f4c29ef131d7b8c1f0ec625d9fc77a8cff9ce3c6d5a00d68e75b62da34b418252ddfeedf6302332edd8a30d88401ea393d0de3add64ab5cc40
-DIST boto3-1.26.60.gh.tar.gz 595047 BLAKE2B ae920d1fd17e4ceb81c512f5d2af63e4b6c09d8a5382bc50656a8ade1bd490a28bc299d7beb9b3f2b271d1001dbad7f3f1a52177d0d6a09943aea5b351a805dc SHA512 372b3e1a5265448a1f7ed11e1d66f2d33f7b35a5b66203220470eefa93eb04cbcddf2f45809ee5d1d2d369bd75ae40dbd48580b6a30a5f43d97e6b04c6211cfa
-DIST boto3-1.26.61.gh.tar.gz 596525 BLAKE2B 4d6e4548bc7f2ee57145341a107c6ebafd4fc47b13f10ddc142e974c8444365eb5242510994d9f8bb1d020b988ae08c25322d8a6e96184053ace65583c4f0375 SHA512 22f92510a959714a2128730cd618d602542a4c0f305a3560ff8b2acfb79a8bbab07d417bb10830c04d80406cfb31fa8c3765de3506ad7839efd403410c887836
-DIST boto3-1.26.62.gh.tar.gz 597271 BLAKE2B ec5585060479da854567b8bf50271b083bd3bf4eec382db3391408a5b7b9c09d7ad67689b87643a1f411609624008a691935bbacaecf321bc39f9783a92349d2 SHA512 5209f6f9ae308df56d5dc8b15b6f4a6b083fd92ed365b715e9d22861d5ab9058ebf343e94e702830933d1eaee60f1566fed4e87b76585e52b1bab8ea92b3ccb2
 DIST boto3-1.26.63.gh.tar.gz 597618 BLAKE2B f48de0f51694efa0a4fa6afa25ad7475fb7e304cf9291d6dcd275d4dd64ee3f29665afd1fb64f5883513c4224e03240a8e225e41765409822d33e95078e1a9ac SHA512 5f781ce615202fa84e321982699877376b2cb3692cf52f2b157eea6800d160ccf6da38b3c545d62cbce029b59f492d5ef67a31d06dc33b6f6bffd1e1b40c5d85
-EBUILD boto3-1.26.50.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
-EBUILD boto3-1.26.54.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.57.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.58.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.54.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.59.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.60.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.61.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.62.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.63.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.50.ebuild b/dev-python/boto3/boto3-1.26.50.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.50.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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.26.54.ebuild b/dev-python/boto3/boto3-1.26.54.ebuild
index 9523f65d5fb9..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.54.ebuild
+++ b/dev-python/boto3/boto3-1.26.54.ebuild
@@ -25,7 +25,7 @@ else
 		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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.26.57.ebuild b/dev-python/boto3/boto3-1.26.57.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.57.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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.26.58.ebuild b/dev-python/boto3/boto3-1.26.58.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.58.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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.26.60.ebuild b/dev-python/boto3/boto3-1.26.60.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.60.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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.26.61.ebuild b/dev-python/boto3/boto3-1.26.61.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.61.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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.26.62.ebuild b/dev-python/boto3/boto3-1.26.62.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.62.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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 5b8fcce3f3ad..a0e53b66a7d4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,20 +1,8 @@
-DIST botocore-1.29.50.gh.tar.gz 11116392 BLAKE2B a9d12740ea927b6331b8593b9d7ae2af51feb4df740f8e9e260372d601791aebd699f569d6a3d6041f9c8ecb852a2493f872148aca5120a01c5773148e42a960 SHA512 3661a3b3a5bba8be0d14d24ec85d50fea0d2001721871be84c13396a8f7244797e24b6b1de46e8b9d903c76312f939b122c206ec4f8dcac0b76e8d77b59198cf
 DIST botocore-1.29.54.gh.tar.gz 11127081 BLAKE2B 7c2d11d968ca6a4d3b23b12c44cb8f050ac1848f75280c44bbb2f3567860204ed8615bd1596e02b8d0222f4d54c22a8559114365ec6a69e4a01a166a821d8c8a SHA512 4ba58c9b881ff95149ba1a5805453885208cdb68f197cc9a6c13cc9ca075e988ae33e4809f2970d9c48fa426e26c06d83686b8bbf4ff69d4a7cfe26ef3f903bf
-DIST botocore-1.29.57.gh.tar.gz 11132049 BLAKE2B 748a8b709cb6bff1a1bb38757ad68c31aa680589ed59e7c3f73b6563a5b9572ace96102ffda56643d33f0dee98f30f8443a431c7869ccfe54a311964ce781b5b SHA512 adbd760b8238b259bcc1eb3ba42cdb702b60eb6fece73a5bda5129a974826655157e702cef6a1114c2e3bd036b1cf22ebbead6e78bf88129fe68b02de1f38dae
-DIST botocore-1.29.58.gh.tar.gz 11135559 BLAKE2B 937b00f1a3c4e3ec818846549bc0cef391c86d3fee9bdd53285111e51c2c52145e7e904020511ed32f2247dd4f150f036f40feeac1a6f899781aff057f9a6d85 SHA512 5cfe5fb174cc14018cd2b7b7af15110665d7ca22f5ae827ba939ce12e71a45e9b5cab8d7ec656fa94c450d46c430a5541cd5bfe92d82da868424db4f8fa4fb2e
 DIST botocore-1.29.59.gh.tar.gz 11131182 BLAKE2B fa85e1f8dc3c366f7a7fb3e9b06dd298b1ad62be882891df3414289aa9e88bff72753690a1438e6040aefb7cafa1718a70c940e8cd2b4e743df44013b5748ef6 SHA512 9a4811b44c67652cacc899d1d84d4db1305cb60e73dd47d7f543b85ec37f921cab00a51d67b48ab6a215be8f7543e30c54585e0fb337085e1b75774b053c4bf3
-DIST botocore-1.29.60.gh.tar.gz 11129718 BLAKE2B 690d80fa12e9df141402019dc45ef2b0807669132ede8af6b57a45a172da78fda3de017a6392920885125763f221a1dbc6a406cb5cf85e66fb50916cc58ba15f SHA512 b8fb6567db599e09bc000ed0b178ff2799c45edeaf21b122a2028b83a50ef7aa27f874b8dec034f6dc61738c4fd3a218db92b26e104cfa2b3ed6f818d034108e
-DIST botocore-1.29.61.gh.tar.gz 11137565 BLAKE2B 29cce274a1ded4bad0a841664e8b81d1d347ab0b2088c18f8c549463d6480edc795f6ec88571e5d0f0e453dcb5dff554027094072398022f38646ff81d73fd31 SHA512 3349fcf2859fe6d7f9e4cd901e80c8c2b856afb9b03e7967ab73a6888e6990767624cc462a338a17832687d279007c858047f69ceafbaf825a0b5fb468574c83
-DIST botocore-1.29.62.gh.tar.gz 11139851 BLAKE2B 528dd2338ec4b1d9ab8f50d277f9dcec005fe5ce24045b06dfac4a856755a284076a92034c761d54dc5daeaa1a86cdcac3add3efb72d702e909b30a076976ec1 SHA512 a4691bbb9c02027d39b1471107e70843d135050e0e495e32bd223e45b587cd1bb91052a38885b99b063420e1ee73e121365adfe82c241f33fdfbfc722d098c7d
 DIST botocore-1.29.63.gh.tar.gz 11139461 BLAKE2B b05f6d52f55df9e456e80e9b701e2498c5fcdd2c65720719095e2c44b87acf854712a6cbc19e20a53b58b8075c8f20952605f60ed58cb1f99a6a771c61dac4d1 SHA512 7005db01c04d0eb2d94760ff1b7b89d28d956b310736dc5601b9e0bfd4b7ffeac6042a596f4f731b600e669a3fc74a7eededbe2bc0ef70d7d3a68f1d14149f9c
-EBUILD botocore-1.29.50.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
-EBUILD botocore-1.29.54.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.57.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.58.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.54.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.59.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.60.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.61.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.62.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.63.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.50.ebuild b/dev-python/botocore/botocore-1.29.50.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.50.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.54.ebuild b/dev-python/botocore/botocore-1.29.54.ebuild
index 0f4daaa48e81..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.54.ebuild
+++ b/dev-python/botocore/botocore-1.29.54.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.29.57.ebuild b/dev-python/botocore/botocore-1.29.57.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.57.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.58.ebuild b/dev-python/botocore/botocore-1.29.58.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.58.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.60.ebuild b/dev-python/botocore/botocore-1.29.60.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.60.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.61.ebuild b/dev-python/botocore/botocore-1.29.61.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.61.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.62.ebuild b/dev-python/botocore/botocore-1.29.62.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.62.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index b236e6016edb..06e84961994f 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,7 +1,3 @@
-DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
 DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
-DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
-EBUILD flatbuffers-22.12.06.ebuild 818 BLAKE2B da0dc359bf5f8be7b12a47bd6453d13ce1ea7027745fc2410a0c50c416a67402ab31332c3abe9b0eed861dc85c6e451ce1c775d618df4f6c3c96793a9275e3dc SHA512 c3967b36faadb4d8575b363dd03aefebb9e4e8ecb04a011ff4aa3ad9def1ed0584fcd1446d955d40bb86162088aa987479656565754ea543b947255063cacf0e
 EBUILD flatbuffers-23.1.21.ebuild 818 BLAKE2B da0dc359bf5f8be7b12a47bd6453d13ce1ea7027745fc2410a0c50c416a67402ab31332c3abe9b0eed861dc85c6e451ce1c775d618df4f6c3c96793a9275e3dc SHA512 c3967b36faadb4d8575b363dd03aefebb9e4e8ecb04a011ff4aa3ad9def1ed0584fcd1446d955d40bb86162088aa987479656565754ea543b947255063cacf0e
-EBUILD flatbuffers-23.1.4.ebuild 822 BLAKE2B fc19a7109008ca97d0e868da5ff79435dcf861f7fc0f4619aab5062ee019ecf4cc72b97efa90745e628e58b036798a98c591197e75ed29a1ef119d944e394654 SHA512 2df91ddabc6a44d1668cd1611e7ecfa28c75cc9b97958b669f78bc75afa46dca714a3e92af66faff59d31c44d7605797487ecb8b8a2610d19d35bd3fa5b40272
 MISC metadata.xml 503 BLAKE2B 632c797040e856e87b7875cb7820b97670f994bac90a3554bca2bfad492420972309fe48b190065b203d7b5be8030bf63fc9658d39c7e24f20fc5f3d8868a7b9 SHA512 76bca368c33e84e49c2ee8e742bb5012bec27fb033915c8c3bdb2957e9d8394e8f2c7fdcabf98770297f6e3489e6909f92755f681aab00218bf3705661b42c81
diff --git a/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild b/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild
deleted file mode 100644
index ca1ff83b869e..000000000000
--- a/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	# zeroes means without benchmarks
-	"${EPYTHON}" py_test.py 0 0 0 false || die
-	"${EPYTHON}" py_flexbuffers_test.py -v || die
-}
diff --git a/dev-python/flatbuffers/flatbuffers-23.1.4.ebuild b/dev-python/flatbuffers/flatbuffers-23.1.4.ebuild
deleted file mode 100644
index a7b6485ad67b..000000000000
--- a/dev-python/flatbuffers/flatbuffers-23.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	# zeroes means without benchmarks
-	"${EPYTHON}" py_test.py 0 0 0 false || die
-	"${EPYTHON}" py_flexbuffers_test.py -v || die
-}
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 803094e3a1a2..22851ef4b7c9 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,5 @@
 DIST networkx-2.8.8.tar.gz 1960828 BLAKE2B 074e902c2c31e0641fe651d2168c77e62af04b322485bf002f557a42c7a7c63d1391c32f9de95b9d5faf13f7eb9ece93171bb1fdba8548d59df5075ac72263e2 SHA512 c698ed2dcc4221662af585940cf5d6ce1ad97b6b8f6d84348ff1d6b233eb69a36f5fba362bc4bb3a08ec8716434690b52b1d66dc4122edb0f420eaa10023d9d4
 DIST networkx-3.0.tar.gz 1987075 BLAKE2B fd5de216f4934a1d5c730264b3860a91dcaf7a12462b615b1aa22df11bfd7d530a369442eebe185572e94bedf6fae3ef4a452804c84fdf3f1e79527ffab2d5c9 SHA512 73e1a9faca6ecd04f6d8da4cd5a887af31738fbeca3d06adc57a4a61fad1d81ab30e89f9c4d25274b0890519b0a517f09402eea3bf3f26b18c3e3052b837ee37
-EBUILD networkx-2.8.8.ebuild 1883 BLAKE2B da52b9e76ba54c456700dcacfa05d40bfe5b7a4f7cbb3162252d8d7db98e2fbad91f61b539a7695ec5c8c06d23485248cb4449802800e4024e7b403b25490bc5 SHA512 936464e7398007686b072e20879085ea763b595ffc904ec9dc981a9b486fddbe1e85917e03ad6395dd88021e962f4a552bde10b65a735de07c524567919f1e76
-EBUILD networkx-3.0.ebuild 1887 BLAKE2B 26bf6c8a14d31147c6466b523050af73d77e48b926bd0e991df90f525731bfc8110bb56e126746a6da30ef02b80bc942f8b03e95bf05d8230015e807c5af7fae SHA512 549914eac68eb3fbb91b576c41a291aa18a0d3f3378e313bbd917314b3bd0c98670fab4d9bbd33efbb7c9b94d5364cf9fd18e6a1615b0ef264a91c19f4e164fa
+EBUILD networkx-2.8.8.ebuild 1889 BLAKE2B 3bc9dfa30c3f4468b851fac086b08a6305e3b1fdae9c910d8035013ed35989deeb3f9ea76a440027dc1de8a519677dbf32c9a6eb46ba58230479122f637d241d SHA512 42b479fb1ac17c926e54c104caa1500db8ab2171ccc6dcef32a89882640b90a0d0730e0d925ef95f5b030e0afe99f83cdc4b1ec629351e96a0953d3b6a6520ae
+EBUILD networkx-3.0.ebuild 1893 BLAKE2B d80b0afb74fb268cb864bb34153720075f45fe80fbc824c416cdd8290f2049c8af0bf1a54453623cadfeaef3df366038f0f907fe97d8282f5d90313b51ff66ef SHA512 64931392ecc08fd40f4a9059c2d693143e50915698a43b0361fb1eeec90b8b58fb0103c850017ee1edb9bd4b720544b76924d4f5628785ed2d7455ddfd90c0aa
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-2.8.8.ebuild b/dev-python/networkx/networkx-2.8.8.ebuild
index e1e7018d1154..239cf0dc087c 100644
--- a/dev-python/networkx/networkx-2.8.8.ebuild
+++ b/dev-python/networkx/networkx-2.8.8.ebuild
@@ -60,6 +60,6 @@ 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 "shapefile format reading and writing" "sci-libs/gdal[python]"
 	optfeature "GraphML XML format" "dev-python/lxml"
 }
diff --git a/dev-python/networkx/networkx-3.0.ebuild b/dev-python/networkx/networkx-3.0.ebuild
index 49009b45f627..e7b433832070 100644
--- a/dev-python/networkx/networkx-3.0.ebuild
+++ b/dev-python/networkx/networkx-3.0.ebuild
@@ -60,6 +60,6 @@ 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 "shapefile format reading and writing" "sci-libs/gdal[python]"
 	optfeature "GraphML XML format" "dev-python/lxml"
 }
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 3df5ec4ae4d0..edf24264bdc6 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,7 +1,3 @@
-DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf4c6bcbdcbb81eec66353f755673e9a240e7713c0a2ecff00a02e07b0069e4b3f1edda41f345698a979b79dd54b354a SHA512 dc2acfb271cd62b6de08bbaa48dbc76ec8d3a3f3142778ffa2cb9a2a1cad62dbdb3c7470a50e9a2825837b65a48c6aefb8736411f32c398aa9ca779841b53ac5
-DIST pydantic-1.10.3.gh.tar.gz 898768 BLAKE2B e8cec71f0d3f66e2c71e421505f624f7e92827f8fe4ef3a7c637b4f2cbc543d43e63739f8fed1a84246458d6675f19de9f83c7fc2a1d8f6e9fb18807ad5ace6f SHA512 7c9db4a010f14ab41b0e7782e59e51caded5de31798e4dd83e01037e3365e34537b30c79c12a6451fdee875e1bfe1a3d981cae58aa373917f71489231df2e6a6
 DIST pydantic-1.10.4.gh.tar.gz 898916 BLAKE2B 506a53de6a59f858a7c8fd56cf18f8079d48eb4f6d3ba36d149141a7e2d471819a466bfc1c34c879f5ec90c0de385b2b89d58beb75660da7de282278092e901f SHA512 0566f89518c6f0171c9b49b5fb57e568286ed421d64655dde90a1565d0672bfef6237ed99e4120564ca2562c7e29e08d86db4fcec47e605aaa98d60845688e72
-EBUILD pydantic-1.10.2.ebuild 2051 BLAKE2B 8ea3a809732bd01777e5dadc10b2be94f92b5c6c0be4edb2d1b1607dfa7fd2e9e9939f6a8778edf845eb857b90fdd746fea9aa518662e0f1b4d0d040a403c224 SHA512 358a9d90bf6fc3ade2a3fef4540d401b394df8802ce3938bddfba459f0b6f56b460237416e407b661cbf6d9aa7f006493576c55727d83f8d98973391f69c0839
-EBUILD pydantic-1.10.3.ebuild 2131 BLAKE2B 08bcf030d350581b75cd6453723201d9e3f38819ae232445466ecd8aa5d22f037a1ec05295c26050c3992d2136d5f77a689937ca7ee65c216babc5755e200789 SHA512 30e4c15dd5f1dd3ca2e03a0869a4ddebfd4c3cc529f3bf2bb8c47d5baf8f3ccd6c01c17f44e6e6fca4920ab68fec0e439413e72020f8a69c2e74da2504a62d06
 EBUILD pydantic-1.10.4.ebuild 2123 BLAKE2B 7f8649bb7db04feaa3f97f112bc11e53dca826470a8da1a73d04dfc151d241ba050f205263512eb485e046600c27fba6cec679e1dcbadff63209d9f3b27d7320 SHA512 86d04628a2bccac06dcf7458ce3ff5a5f8250c5a68b09654f340de4b06650955ae35af5d1947437d2356e1eca084c24774b5f812302b7932d6dd5bf978a2e4e5
-MISC metadata.xml 571 BLAKE2B 11d9b5831b90a37433b357349ad2fd9b0e908e054f849fee2cc16071c57b8d2d465c70275247f81d605a689ab16edaa160be3d802eaa00f3ecea4b884a5d18a1 SHA512 3f34f3708ad8fa0014f5f8ca4988225e03bb707a5ab91e295946fc480dc56eff04cff1746605e3ce1b33f9c5f94f390a74aeeb49f0d8fc5e8801bb85714117e6
+MISC metadata.xml 561 BLAKE2B 9cb2851ece8c8bd005a45008efe6d14d990f82832700f641418c15921f368de9bf2b20f9713362f5308a871a10c60a54ddce4e095a4a60209c89bde964c71ef7 SHA512 2f26f32c0d937153966ffbc3b9bb67252043dabfd9ca96b2ba854b111300a0c8bc89a664e439cda3bcc39597c3a29d28b3aa84172ece0f1d818b49cda746ee33
diff --git a/dev-python/pydantic/metadata.xml b/dev-python/pydantic/metadata.xml
index 8370aeb1dd33..908435493b36 100644
--- a/dev-python/pydantic/metadata.xml
+++ b/dev-python/pydantic/metadata.xml
@@ -9,7 +9,7 @@
 		<remote-id type="pypi">pydantic</remote-id>
 		<remote-id type="github">pydantic/pydantic</remote-id>
 		<bugs-to>https://github.com/pydantic/pydantic/issues</bugs-to>
-		<doc>https://pydantic-docs.helpmanual.io/</doc>
+		<doc>https://docs.pydantic.dev/</doc>
 	</upstream>
 	<use>
 		<flag name="native-extensions">Compiles native "C" extensions.</flag>
diff --git a/dev-python/pydantic/pydantic-1.10.2.ebuild b/dev-python/pydantic/pydantic-1.10.2.ebuild
deleted file mode 100644
index 8daa21803134..000000000000
--- a/dev-python/pydantic/pydantic-1.10.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.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"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.3.ebuild b/dev-python/pydantic/pydantic-1.10.3.ebuild
deleted file mode 100644
index 7f061956a374..000000000000
--- a/dev-python/pydantic/pydantic-1.10.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.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"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index d7f0aa34c2db..b6b69be48c89 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,5 @@
 DIST pyOpenSSL-22.1.0.tar.gz 181704 BLAKE2B b10a8db111726c5f6626cae670a04af73cc1856a3084d3ca683fcba942724e99e5bd4ab6eb7dc4eb02ea4c6f14aa21f7744020aae1532145e1db24dbe58976cd SHA512 7cccb48cbb1655414d21c5e66e7defee7ec370cb6b46294ae0307208f9a9bc13708345b2c088a43292262f5d5bb3d45241c18ae66d2ad6824046ffe30f0c707e
 DIST pyOpenSSL-23.0.0.tar.gz 182375 BLAKE2B 8a902ecd7e771dcd281dda184569fef53c7f7d1a801f5cea663ff95014717786ceaaa999b6f67fe710ade253335c856c3964a96705afd6ddb93679856d57d7cd SHA512 68c42de58305461606d9fb932a7711775cfcf1a7c5dbe900b2c7ba18eab546d4c37fcd3dd82ab2c18b15eb07bef126534473b5b29f8af4f46e0147d45ac9e64b
 EBUILD pyopenssl-22.1.0.ebuild 1577 BLAKE2B 63cca4bf0017d906e0c6b3b5e1bf1b8f6e703a3babc99721f45a7ac6e4b00ff6cd4328f884619d68db4707455402b6be9cfc592feecbae0a9eff6e61c2eb8a63 SHA512 35d1186fcbfc85c1b361677e8e584a73254ac365db63390ddbe359149f8e9a1f88fdb1c727a44458056b405bfd19fd87f53ce9b51197274b6351086c0144ae90
-EBUILD pyopenssl-23.0.0.ebuild 1584 BLAKE2B 7c5e84bb0fcc17dcc78eed854e1220ad64850305adff4038e86595947a031b902a9ceb0a0361d98f59b09f9c0cc66b77976873d89f448cfcd38433dc966473bd SHA512 2d0b9f0672775e00e829c9c1ea48d9f19a3dc99598a6529f662caef5067dd9491bd8232c4975fdddb26e2dd64033ed50c80d5f343d97547f44af972a50944be1
+EBUILD pyopenssl-23.0.0.ebuild 1578 BLAKE2B bb5683583efdaf8fe09c7209e699ff75330907fa5dcfde030bf6932e9b8ba30bb87a9bbee48d84d1b01407c890c414a885a37d2e44df49867c5957c69e5e0eef SHA512 51806a50fef5ad6eb0215dad2e3634bb70fadfbca45b835a8de8e09ca64509f273110c5d461d9227435b4f5199cfa0b10c3e2dc5b16bcb5bab0a109cafc8671f
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-23.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-23.0.0.ebuild
index 0a04ea8ffe11..79f894b0a88d 100644
--- a/dev-python/pyopenssl/pyopenssl-23.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-23.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	<dev-python/cryptography-40[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index b5cedeb64a28..3b4c37d28bfc 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy-exe-7.3.10-1.amd64-musl.gpkg.tar 13107200 BLAKE2B 5b54930b2504e063839ca0e2017f6e0150ec3815c4ae783ceb97cbd11900e97edf3791bd998f686e3d16b122bb4e3f6f5abb387490af8589472c31170bc0f033 SHA512 9ee7998b391b0ff2d244346b8aef730b0c3cd5028e3a6c7dbcac77d248335eba3a01c6d1b478a21f1fca674d7ff6d2dd72df13ced5919b70b6eceb4b7991070f
-DIST pypy-exe-7.3.10-1.amd64.gpkg.tar 13107200 BLAKE2B be6846f99504d5b7e80b6316e3164a9e46ce0510fc31daee429aa97800b734c21e751d205e1d93046fd4e4e008ca48b4738167249551052cb7bfffde50197af6 SHA512 eb1b01aae999ada190409ae087500ec6a3d03328da17625fe77cd7af3568275b43df158e06c6e7f595690aff539ab4ee61c67379bd7e8360403aaeb509a62de8
-DIST pypy-exe-7.3.10-1.arm64-musl.gpkg.tar 10956800 BLAKE2B 484123a23d5f39a976672cda199b405fcd144e5943328f1723d267e6918ef39b9f7cc0196d09287171046a2feaa15a9b80d5ec121f8f1cbe86d18d8aede678d7 SHA512 a8f46284f0e5ff822183f5a6ccb306a5e26adcf50e53dfa4e5e6f3d6418617935a9d92da092f4303adc2a10013860209a7011cf10da4c85dd77efe2bcf28123d
-DIST pypy-exe-7.3.10-1.arm64.gpkg.tar 10885120 BLAKE2B 4d9a64cf4e63de1614b670fdbe8561681f4b6620ccfe3d3cb0ce72f7db986e85436323f074864c18c96722fb57d6909d2531867b0e8bed59afa8294fe482f6a2 SHA512 659c4e9b24c517c64f0d64580da99387aab0fec3bf5dbbc9ce663b111f0b339583ec1b4f8c808490c02ef71e09b9c08b29e02f9ad671dfe29a74489d72283ad4
-DIST pypy-exe-7.3.10-1.ppc64le-musl.gpkg.tar 6686720 BLAKE2B 8e740fc4a4244622c93a872537060f81daede6872e509654500b06b87904d2d396fc4ff7c3fe82eff3a0d523a8047e419223869f65779385c25f7cb68dae92a1 SHA512 267a7c771d09d40e28525683a85d539722584c88c5d007f6bdf2fe573d8bc46b199098ab176422b49bddc3d857d0c9376d4cb920a670c8959034950b9b4ed3a5
-DIST pypy-exe-7.3.10-1.ppc64le.gpkg.tar 11089920 BLAKE2B 9d2f551a2d3f797ac9afef0b2f5eec626f64c50225d53b5e0abc740abe8fe8f70165fa3fdcad43d3bfd04a456459a9fcfcfe5d0e61969ebb64f20b44b0c2de06 SHA512 c592463cb8d50a15723e74151e1327abf2e1cfb68524f588cb4e841e88177837198695afb073835ef2411b8a1d4dc7b9bf515106de876a6a6607cc4a0fbea7d7
-DIST pypy-exe-7.3.10-1.x86-musl.gpkg.tar 9707520 BLAKE2B 635e25ba163c1edd34eddaf5b2ddcac10b68385772b40e77fbbb2b901ab4301b0952d6da0743fd209e06f9d683d438e8849a0d26052c331edcb0f91aa90fe0b3 SHA512 0819fcdcfb88b4bfbac61932f887bdad6a456816d670b5844bca2164ecfff9a581a766e0e478b5799d7459b0a094515af3de444ca88318359fdda268f9bbdc9d
-DIST pypy-exe-7.3.10-1.x86.gpkg.tar 9707520 BLAKE2B 53592d7991b5f5565f4aa1cb8de25658245c516c1ff042c0dce611abce35d9496bd048b2aeab748f16f11a89129894fc44b693c385bb8fea6ee1934e5970fd9e SHA512 458fabfcaabf6e225d5dbb45b11d301dd4655a85a3d00bf33c5a7c4c9ab1eeae25bfe059434f92303aaf0a0fa631494d51b37e17a7db9582de8eb1e19509d93b
 DIST pypy-exe-7.3.11-1.amd64-musl.gpkg.tar 13056000 BLAKE2B f08e3ad8060fa076922d2f89ba86cc6956dbd8cc91d66e764b4e32efbc55712325cb6a9eb3f1689a406572d271fda94ea312f1846d8a00723f97dadde538a10d SHA512 5bce851c3131bf848bcaf89938c7d59e103da2276381812d9d2359eea5063dc3e0547738976c23aed6b321735e32ffa248aabb5ed85eb57711e91a8bb593567d
 DIST pypy-exe-7.3.11-1.amd64.gpkg.tar 13076480 BLAKE2B 530f2257227ac30b906c6e987de6f7c31ed0328d6eef6bc3cf717a7fbff29dfe7c464948cb514bf69daa8524770c81eb14f738087ab8ce480efd2f01e12d3e64 SHA512 4bd3b9c85e71e39a17bdd0007790b4c75c2d459fccb631c8404b317ca70dbb6427d997af9cc65a98102b5363cf9b2d7b4a30b7e8159b794721ee16b4a74cd4bc
 DIST pypy-exe-7.3.11-1.arm64-musl.gpkg.tar 10926080 BLAKE2B 1ce6dd1c41e1b86dcd76090635a47c920b3655a53c130dc0b09e70ea343265d5fb5f455389c3a1dafe1f9a3f296be90a0b8bbd10f81183bd14d2621618eded42 SHA512 d6c1577449b1a30b721feaf32b62d3d9a33e6b614f84f6fac2d4203d479ea96b219526cfea236e50cc1fe2363b147088331ffc2cf7c3dbf9278f714ed81baa0e
@@ -14,6 +6,5 @@ DIST pypy-exe-7.3.11-1.ppc64le-musl.gpkg.tar 6656000 BLAKE2B 6934c8cf6b0c6ae8f25
 DIST pypy-exe-7.3.11-1.ppc64le.gpkg.tar 11110400 BLAKE2B 5c37eec6ee5f38821c9f2a53df525387a1b29535b0063be40de18b4f14d755f4e0568a694a34b00835d905d7d724baf80d4b27a2fcbcb4b35f9366226a42d1e5 SHA512 4e04c388af7cf4c3a3893345a5c02fbe651004237d8dfac00ab61210f387956bd16aacadad2dd288d7d9111d5863f37349d284d405cdef20c11009037700750e
 DIST pypy-exe-7.3.11-1.x86-musl.gpkg.tar 9758720 BLAKE2B 19fa123ca6d25f90a8b330efe1bf8147a29f7a2038f4c23897442ef9f7fd6a5ea7a56c51e1539ec43e5726d333e7037e4f60999d15b87bd4de0fe336b48bcefa SHA512 e761b37c9fa8801b51015329707e1b92cadd3901937ecc5ccc5ce51a564933553e4b4058092f87930a6da080ab2a608bffb1e76376ef711091cce8d3f773cbdd
 DIST pypy-exe-7.3.11-1.x86.gpkg.tar 9748480 BLAKE2B 737b88b88c756b084183a30149709d10d868c9a8feb723c6d1ae10fb1cc4b9f5a363e3aba3d2dd2718b5df727e0a6cf4a55efc449b8d2a00ea12bc1a67b9762f SHA512 56518c8142909296e01d716062acc4187d204af958ff197fc3116bfaac47b94abc67f6ba1d8ac0ac74c9a287231af8d35c7511b0f65c9fdf1f93b75294094ccc
-EBUILD pypy-exe-bin-7.3.10.ebuild 1947 BLAKE2B 59a640910afb08fa48c719783dc436375119399b0ecc1f631e9083c41c7e045259b351b266b75f2dc414a597020800ba041f746ee37a7860f319c96dc3d4c2f1 SHA512 b62b37579075642688c4e3a5f8c2f803c9c8b175f815d22bbaecf788656f5fdcbbb8725caeebb78208bb67c8aa22616ead150461c89122a762706218dbf2f534
 EBUILD pypy-exe-bin-7.3.11.ebuild 1947 BLAKE2B ced9c32c68bc0d6991a3c023c5ac6f3952cae5be14c39bbaf498c2efa249715235747526090d59f6a39da4645c83551ebfebabb2a2c7a25343c5acb64d9a1d6e SHA512 3ca0ae4098385dbd208bb3d069b17f9654b2b61b8d85fc822776a91e69341a60492c101310c24fc10a7d0e68b080ce28976d1bc9d5c120dbb40d4af04a7215ae
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.10.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.10.ebuild
deleted file mode 100644
index a94faab9ea06..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy-exe:${SLOT}
-"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}
-"
-
-src_install() {
-	insinto /
-	doins -r */image/usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 7764be6fd609..958b1f96ae2b 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.10.tar.xz 5312 BLAKE2B 3ca6d3a01914ae92d93fbd185705dae6bebfd4869a818f4a8058c9df3ea243fd9f1e5b962351f8d07a9679e8020499e81b7d1114d4f1b7493dc1d34c8c04409e SHA512 6758894f6d66dc99a13471cf373c5a2d2bbf37ac561e8d7c4f57ec2f1a9653cf9859547d9a7a80e7f0f7df16078030a4b1cee69536958176f0261da49493310e
 DIST pypy2.7-gentoo-patches-7.3.11.tar.xz 5312 BLAKE2B 3692453a184a88d61fe1dd7aa815aa02a4bdf4b29defd2e98a354261784643f78799b979bb356c19311b40932cc7f8b8e050e10553755a846938951a87021bc9 SHA512 24308317d92b278f9f7d74327303ebba34628a2d8dd5798ae3d472d14fd0519a470b6f9c420da88e07251215342a1e4f5cf8d4230f9663119274d3194d3811a5
-DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
 DIST pypy2.7-v7.3.11-src.tar.bz2 19850421 BLAKE2B ed8bd61e3857c37689f24a23d38d5043bd190ee0e6de5d7906284ea2eab5e7aeff5c994c22f97195f5a1ded2867725f74dc562b375c0165b6231eae69213c06e SHA512 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55
-EBUILD pypy-exe-7.3.10.ebuild 4060 BLAKE2B 35622522d66a0274062153e59b7f967dfd205fb2b077d5b00a3dfdfe6faa041d03568d1abf5cac7fe2c420ed8ea83b4a0e52b9c74b1735b306f3fc58ea895009 SHA512 85be0f5307418c8fdd50fd214c59761cec0a288a8cc22f73bace863d04da7f05a15e99615fdf8758121a1c4b9b3edeb2b27b78ecd57fd22f2ce37989d1c7a003
 EBUILD pypy-exe-7.3.11.ebuild 4060 BLAKE2B 5c6883e608eba8f972af83966b23dfd3e13edfeeb511d1a47f303b60746d5cb08ab9bdb9914b5b7dd2ff6ef630e15a0fca3a3c3f253e4f76aca7145ff72cf35c SHA512 d5dc8433dd88b0ae58b3283ad233dd7524acf31763e917e46ab8f837623d340f4d487a06fce679a7e91fa96cf89acf98171a423acf4b0251776f1e2abdf41c0c
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.10.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.10.ebuild
deleted file mode 100644
index 84d9a4d10226..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-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"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-RDEPEND="
-	${DEPEND}
-	!dev-python/pypy-exe-bin:${PYPY_PV}
-"
-# don't enforce the dep on dev-python/pypy with USE=low-memory
-# since it's going to cause circular dep with unhelpful error message
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)
-"
-
-check_env() {
-	if ! has_version -b dev-python/pypy; then
-		if use low-memory; then
-			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
-			eerror "installed."
-		else
-			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
-			ewarn "recommends using (a prior version of) dev-python/pypy instead."
-		fi
-		elog "You can install a prebuilt version of PyPy first using e.g.:"
-		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-
-		if use low-memory; then
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-	fi
-
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp
-	if use low-memory || has_version -b dev-python/pypy; then
-		einfo "Using already-installed PyPy to perform the translation."
-		interp=( pypy )
-		if use low-memory; then
-			local -x PYPY_GC_MAX_DELTA=200MB
-			interp+=( --jit loop_longevity=300 )
-		fi
-	else
-		einfo "Using CPython 2.7 to perform the translation."
-		interp=( python2.7 )
-
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 129caafe7a3e..0a1e0ab36762 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.10.tar.xz 5312 BLAKE2B 3ca6d3a01914ae92d93fbd185705dae6bebfd4869a818f4a8058c9df3ea243fd9f1e5b962351f8d07a9679e8020499e81b7d1114d4f1b7493dc1d34c8c04409e SHA512 6758894f6d66dc99a13471cf373c5a2d2bbf37ac561e8d7c4f57ec2f1a9653cf9859547d9a7a80e7f0f7df16078030a4b1cee69536958176f0261da49493310e
 DIST pypy2.7-gentoo-patches-7.3.11.tar.xz 5312 BLAKE2B 3692453a184a88d61fe1dd7aa815aa02a4bdf4b29defd2e98a354261784643f78799b979bb356c19311b40932cc7f8b8e050e10553755a846938951a87021bc9 SHA512 24308317d92b278f9f7d74327303ebba34628a2d8dd5798ae3d472d14fd0519a470b6f9c420da88e07251215342a1e4f5cf8d4230f9663119274d3194d3811a5
-DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
 DIST pypy2.7-v7.3.11-src.tar.bz2 19850421 BLAKE2B ed8bd61e3857c37689f24a23d38d5043bd190ee0e6de5d7906284ea2eab5e7aeff5c994c22f97195f5a1ded2867725f74dc562b375c0165b6231eae69213c06e SHA512 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55
-EBUILD pypy-7.3.10-r1.ebuild 7010 BLAKE2B e04e62419077ac42ea4a98823a417c93178e449848028d444639c702e974cbe4b91dc8cf845f007e73dd0f09059337f6d572ef95ea1d064a29951f17009db799 SHA512 f0ace1f6f9c2538dde403216add2d6d739a8d2d05bdf5a913be3cf08fa423cd9beb021637c1431c94f244a889ffd0189912029fc8b79f9e60d22542a1262c7fd
-EBUILD pypy-7.3.11.ebuild 7010 BLAKE2B 29eee9f19e86d4f69010d30f96b37e04e4eb7719f6ddf04a25c6d94a1c81ce41290b94745acdc2e0033d423f3021c996adbae62edf12b0e920c90dabbce44ff1 SHA512 814f448596809f50908e0bef9e77834cf3e5551ea49bbaccdef243cf321e841d2063a8ca0efd9db253f38c69ddb1ec85deda6132ac73f8eb58ba8c6976087bb0
+EBUILD pypy-7.3.11.ebuild 6979 BLAKE2B 686a1e5b5821a0c9552345736bb20bc508840934979c66c3d2199c17f1fd7066dbfabaf1f11925f38cc508efe2390690306fecc967088a187c4ff470fa0f28bc SHA512 1dc67d9882f9a007053b75e39bda286c86aa8a4f3cd010939da3ea056a0c343f04b3958ffbe55d0faeff6f4499bf53ab12097a9fbfae9c079ce687675032529b
 MISC metadata.xml 565 BLAKE2B 956a62e9d3632a7ab9ade67527bae54fe0b58d79a6c2f26dc7017a6b8d337f7e5a155b747f24b98f345eb9e1d15c3f38d8530212ad16cfa5292d6cb1ecbf3e91 SHA512 6dd5bc7712533a926b7efdba10c3bea32c813d703916f6bf152ff14f7561cdc466354c8fdbb9640afe415daa3cf2d9365351261e89b8aadfae7b74afd48ae061
diff --git a/dev-python/pypy/pypy-7.3.10-r1.ebuild b/dev-python/pypy/pypy-7.3.10-r1.ebuild
deleted file mode 100644
index 1eeaaa8fe66f..000000000000
--- a/dev-python/pypy/pypy-7.3.10-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python 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"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
-RESTRICT="!full-stdlib? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
-		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-	)
-	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/pypy-bin-7.3.0:0
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy-c - <<-EOF
-			import sysconfig
-			print sysconfig.get_config_var("SOABI")
-		EOF
-	)
-	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	if use full-stdlib; then
-		# Generate Grammar and PatternGrammar pickles.
-		./pypy-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!
-		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
-		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
-			../pypy-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=2d3acf18
-		local local_cksum=$(
-			../pypy-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)),))
-			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
-	fi
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-
-		# broken by expat-2.4.5
-		--ignore=lib-python/2.7/test/test_minidom.py
-		--ignore=lib-python/2.7/test/test_xml_etree.py
-		--ignore=lib-python/2.7/test/test_xml_etree_c.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	if use full-stdlib; then
-		doins -r include lib_pypy lib-python
-
-		# replace copied headers with symlinks
-		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-		done
-
-		if ! use gdbm; then
-			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-		fi
-		if ! use sqlite; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-				"${ED}${dest}"/lib_pypy/_sqlite3.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-		fi
-		if ! use tk; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-				"${ED}${dest}"/lib_pypy/_tkinter \
-				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-		fi
-	else
-		# install only the absolutely minimal subset of modules needed
-		# for pypy3 build
-		local lib_py_modules=(
-			# base modules needed to even start pypy (and import site)
-			codecs.py
-			copy_reg.py
-			encodings
-			genericpath.py
-			linecache.py
-			os.py
-			pkgutil.py
-			posixpath.py
-			re.py
-			runpy.py
-			site.py
-			sre_compile.py
-			sre_constants.py
-			sre_parse.py
-			stat.py
-			string.py
-			sysconfig.py
-			traceback.py
-			warnings.py
-			UserDict.py
-
-			# needed for python_optimize
-			compileall.py
-			getopt.py
-			py_compile.py
-			struct.py
-
-			# needed for rpython
-			argparse.py
-			atexit.py
-			base64.py
-			bdb.py
-			bisect.py
-			cmd.py
-			code.py
-			codeop.py
-			collections.py
-			colorsys.py
-			contextlib.py
-			copy.py
-			ctypes
-			dis.py
-			fnmatch.py
-			functools.py
-			gettext.py
-			hashlib.py
-			heapq.py
-			inspect.py
-			io.py
-			json
-			keyword.py
-			locale.py
-			logging
-			new.py
-			opcode.py
-			optparse.py
-			pdb.py
-			pickle.py
-			platform.py
-			pprint.py
-			random.py
-			repr.py
-			shlex.py
-			shutil.py
-			StringIO.py
-			subprocess.py
-			tempfile.py
-			textwrap.py
-			threading.py
-			tokenize.py
-			weakref.py
-			zipfile.py
-		)
-
-		local distutils_modules=(
-			# needed by site
-			__init__.py
-			errors.py
-			sysconfig.py
-			sysconfig_cpython.py
-			sysconfig_pypy.py
-		)
-
-		local lib_pypy_modules=(
-			# needed by site
-			_sysconfigdata.py
-
-			# needed by rpython
-			cffi
-			_ctypes
-			_ffi.py
-			_functools.py
-			_sha.py
-			_sha256.py
-			_sha512.py
-
-			# NB: we're deliberately skipping _hashlib to avoid some deps
-		)
-
-		cd lib-python/2.7 || die
-		insinto "${dest}/lib-python/2.7"
-		doins -r "${lib_py_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib-python/2.7/distutils || die
-		insinto "${dest}/lib-python/2.7/distutils"
-		doins -r "${distutils_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib_pypy || die
-		insinto "${dest}/lib_pypy"
-		doins -r "${lib_pypy_modules[@]}"
-		cd - >/dev/null || die
-	fi
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.11.ebuild b/dev-python/pypy/pypy-7.3.11.ebuild
index 0539950e6f62..cefd623b2968 100644
--- a/dev-python/pypy/pypy-7.3.11.ebuild
+++ b/dev-python/pypy/pypy-7.3.11.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy-bin-7.3.0:0
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 262dd6e0dd7a..55da244716f4 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
 DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
-EBUILD pytest-plus-0.2-r1.ebuild 659 BLAKE2B a0bb40f17fb0b01b7fbc5cf89fc86605d3f7df3ef2adb853af3ba200c594b82516cf299e3ac6435c7c99e496a3073a4f77c75734cce86292d73837935b310e68 SHA512 2af3e07957276834fb2cf84448004b3135e3bc58454cbf3d74ecdc0759edfc01f5df6c2280430ea72ac4a3728338de2571c3ee6d831c0a59081947b24e8b3827
 EBUILD pytest-plus-0.4.0.ebuild 616 BLAKE2B 48c5e78be088a297fe3ad24c944f32c1b8f60e44e9698560d3ce1193756d275e4ce09e5cbdb1099df544809be8245bf5e610743322b65a721cae688ae3fbabe1 SHA512 4db88205af10291dffc69b6f679e2cfe940741528d43ac589d43f4a1967618b9580eb1bf79a5834f67ebb05af20c2ce11064e4fee96319cdb63eb7deef1c7c1d
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild b/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
deleted file mode 100644
index 7bb0503caffa..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-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-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index f063b4783bbb..d32f1407af06 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
 DIST pytest-skip-markers-1.4.0.gh.tar.gz 70932 BLAKE2B d1bd597de0004ca37d8582896166be8f70833b386adbb53e5f812b28ac15bca613fea5e85b21bfb3549892f45ea8bbff13e66bafb97fc5db93e2fc6226a73c85 SHA512 6cb88833fd328f8e7cc6a2d0c8a0c9106b07186b8a20164c8272d685e93c21b111d4e7885ac1739ce777a9279a59705229ea41c3c31c71ac71d1bc26c13318f2
-EBUILD pytest-skip-markers-1.3.0-r2.ebuild 948 BLAKE2B 6645e517a40fbcda1c815c7c05479965f1c5b2dcd2d3698db216255402dca99be49bae257f601b035d38c5277c1bfdfa845fa7418676b88d56362b34d3791790 SHA512 5abe27e1ce477663bc0ffa4df90475cfa7af18b01da1d2e299a891f2b7473b5ab4a0266bcdd1a425c7d20dd3e56acb453fe75dafe24d401b3b1986922da46e53
 EBUILD pytest-skip-markers-1.4.0.ebuild 1109 BLAKE2B f4811c70520ec9ebdea7b683a6f48a6c23d6bc92c55c0a54475c6c2de154b2758c7cb260050f652ed049e8b927017e75dbece6d7a6040d90fdf7550c3f536d08 SHA512 9f496420470514b1aeb903f5c7b77ef5c86cb83a38bb0f13cbf5ce4399b9866dd8be14f81483ee09d81a959835ef3a06b67e1093e056be445a5fd53cad77e15e
 MISC metadata.xml 502 BLAKE2B 7bdc44ea13e9ebfa8d021af8a1dc4d83d391d4e5432ca0c953fef593861cea852b76817214ccf80a8bef9fd481641b1eaecccabe839c6378d84d198d172754da SHA512 439a3664c428abd1796d33f15c7791ceb33ba65428b7bde27a42c181bbfda099d7a8c28e723fceb9bc5caa094072c77d6b84831b152d50653f4ef3d4dd54e412
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r2.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r2.ebuild
deleted file mode 100644
index a87f6f98c30c..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2023 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="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
-		-> ${P}.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/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index c8cb0b9da705..74b0d925c52e 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,5 +1,3 @@
-DIST python3-xapp-2.2.2.tar.gz 20872 BLAKE2B 72bfd020477382480a5cf007107a197a86bd96c886b54440bee5eb0cf124294feac01c04dee24525d892cc5e701abf4e64753f2bff09d417e9e18ee314eb57a4 SHA512 d4aac6949bfe4adfe5fdb08edb80e622ccf04c2d571760aec280b43ff26b246c0d8f09eda6d7281381bf3a367002a7cce780664eb1f9933db6e9f63084d99def
 DIST python3-xapp-2.4.0.tar.gz 20787 BLAKE2B e225ad100119f90813b0f7657832bb186675542b3476beec639ff4e0771f4c00629c5d297a2ca0392fbd630066ba0a95a6f8553bd01a9f2df18752536a513127 SHA512 7c9afabbc810ffe878e831f7e1ff585ce49abc6d1db3d4ea70deb6630e2bb18f61ded31ae0e075cccae2283cac50b3440204a586f844ba9ee9cfbcb572bf7573
-EBUILD python3-xapp-2.2.2.ebuild 546 BLAKE2B 944b23d4756f6a8e4f69510b7aeada91acb0921ea78c007741823187f3636202cbf068db8819c388918c251302a967e3c0a5d6519904be03183c4ec3bc533fbe SHA512 a5d7607ed77720f45d1dcce65028e2903f431b6e86019bbb643fff2b780aa245eef61bde4c3bb6a2279cba9da8cbdaafedb5ffd92c35448b60d22e1439a10bfa
 EBUILD python3-xapp-2.4.0-r1.ebuild 1161 BLAKE2B b281cab1718a499338faeca5aaafdc51d1d9f8b2f56977066650f2bb5e4926f9d3378763c6ece0dae1b3ca757c80429445183c0a891e7d555cea1571768c34c5 SHA512 a4e0c0166fb0b2158d72863d54e50a5fcc2b4f9c798c174bf15e7b47eafcfd16a285d96a72dc7254129dc8897d34c0610fe8ec156d5febdcb280804f8ab6955a
 MISC metadata.xml 516 BLAKE2B e9429fe1f541d1763f644fb18fbef2bef3e105e943a7099792951a63a38c0083ae35e64160233ab48a8556d5bba96ad9031dc09fcdcf24033494d222e25a9cfa SHA512 b23a2d82ecbdb03abce2b3c40579c6aec5caad09b556c513600ded65d21ab56949ffe1eae0b04238f79c9e3c5c95a66a263e23281fcc2d16978c6a787e53c813
diff --git a/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild b/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
deleted file mode 100644
index 9a2826c2d5d6..000000000000
--- a/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapp"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/xapp-2.2.0[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index ba4b3e03e89e..ac68b7a881d6 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.3.2.tar.gz 430792 BLAKE2B 246dadaab92851f8da65dfa4c7e80390defeb0855fdb3ea5ef6aab96bf56b28597dc65d7cb4fc95f0f795a19f4b826d0ec1e1e0b025f4fa49d4d5a78473a2b29 SHA512 715e7e4b185a656f395a30c575e8996271cea4672871d9471c74a13364be1ef0fe0e63951e8f52f10b9c887592dc899c399ae82e09f9934492d13119b1154796
 DIST qtconsole-5.4.0.tar.gz 431119 BLAKE2B 48348b400a9b594bd028d3905719f2d67f6c9281df99863f3d0d87cf83162c91ede3e65529a8efd3bff62ad3ea343cc4ee7ea028913cd5bf7e48d0c493930445 SHA512 c25a381d8494c64d63e379c1dd5a44c1945e773b87b9a27f8494905e7eca24c6381ec5b9792d9a57ac41b14137ce238795a5ff8d83d1b6ddaa62603e7d9ab165
-EBUILD qtconsole-5.3.2.ebuild 1593 BLAKE2B 04237e5a526a635c935186d90575d828283c5d999c10f2fce8dc874cf8173b0bff64bbc6c0a47e467776f56d6cc67b06fbc66741f5a5266d7a9c4f7bfe9045ba SHA512 12c61160b4ff73ec085b5aa6168f25f72dd343db7dfe29d53dd93c83f96da4b57a58c9878886d90c6902e594368624bb47e4e8b5ebff615528fe9472b220835d
 EBUILD qtconsole-5.4.0.ebuild 1600 BLAKE2B b00fe04cc4e2242e34e7ce3c2da464b230ef3f95fb5139cd08eba9fa21d64275ec6b4ba87263e5d8626375eff1f2d4ebc834c66f89e48695a9bc8bdae7a58b08 SHA512 167627ba96503e5c64c59894d5659f8bd78e9c6e213b95f987ae7fa1e2f3ae6eb936730a30039bf09e3590828ca3ef5b10aeb2a1f25a0e165eacb11982083678
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.3.2.ebuild b/dev-python/qtconsole/qtconsole-5.3.2.ebuild
deleted file mode 100644
index 66ab3fbf3bae..000000000000
--- a/dev-python/qtconsole/qtconsole-5.3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/qtconsole/
-	https://pypi.org/project/qtconsole/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm 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-5.2.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.0.1[${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
-		qtconsole/tests/test_jupyter_widget.py
-	)
-	epytest
-}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 34994527ed29..6e50b7b4fd75 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,11 +1,3 @@
-DIST translate-3.7.4.gh.tar.gz 1153973 BLAKE2B 55fd5d8f8d9c53d3aabaaece54272650fc412c778cbbc86d83b391946aebb627c7ad3dd8e10d5bc0bd6380f8396fd5c373a47d9323365886a50299f392238b4c SHA512 0eb93712de9fd7324e0e99cd31996694356452df51ac9f081f27f7bf15391e9630d4b042e2af4ca5b06d43d92f35cfd8806f18ad936c293bd08bdd465b09789e
-DIST translate-3.8.0.gh.tar.gz 1155430 BLAKE2B 53b9964373c49d2eaaa11f13c0a80aefef8572077561fbc2666b5c4f2f7b7731cda9ef665b0f077a84237bb7ccc6251b23308c18672d6397b08a6a64e91426bb SHA512 9ebacfa76e16e179cb000e9f60b1f91ddacf70644764d215df43c55876bc684c6e4c2c1d52e2c1aa00c6e757f87167f04ee7dac7ce996c5b9d3d39aff4bb7484
-DIST translate-3.8.1.gh.tar.gz 1157283 BLAKE2B fffe95aa8d874a98cb6bc45a37ae03752ba9903b151ba894ca4bcaff48fbec524fadef4133b2bdf0c65b0d834c094bd6897d7ecca33ce00ef89840d1eb4fcf81 SHA512 a7739f0ddd64677e8a5236f017b9a36b7c4c2ea7b3710ffcae5dea5e738049b12f77a1b7cb6755712bdc55184258fb80e48ffa082abce886322614049d68dca9
-DIST translate-3.8.2.gh.tar.gz 1157429 BLAKE2B 3e611d2f1843fefd0d335a1f9a307b4239ab634499324631dd678a79c28ee17d909be621a0e0e00950ab97ea1dd2a46682f45f713895db85f62feacee8cbeef6 SHA512 3875a711dc7d070d4d857304848bd454fab0c5f78bc6722da4a905c21fa7a95d8b9f165397ea3c0e82216f312ecdd9ee0763da8a58338c51853d526b5956895b
 DIST translate-3.8.3.gh.tar.gz 1157587 BLAKE2B 4dc8ca9cb7f0040364ceeb6fae47d9189642e8383fb1c808713aeb82452690ffe5957c63d649994eae486efaa51aee664fa7b0bb199036d869a87d7a0bf21806 SHA512 ad5a814cc03ed0d41aeac60bea72133fcd47470ab254849647d674bc00b71f2afe1c0956891decc6906fafbd07c4e3d5efcf4212c0e449f3fb3fb4fdbee9aab8
-EBUILD translate-toolkit-3.7.4.ebuild 2436 BLAKE2B 8fd08eb23c92d158095c64aa147083428393b9633126cd2b512f1679ff5a25476571b7f123b3b208982852dda689879f9269a1f74589f02518589118ce47db18 SHA512 24d68f30806aa4bebe852239b2ac261e054cf282f93125299da85268e8a57f2d6b7a9ebc2e1a855102efbf8bbaf48ad7842086d35513cd3a5a59d672403170bb
-EBUILD translate-toolkit-3.8.0.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
-EBUILD translate-toolkit-3.8.1.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
-EBUILD translate-toolkit-3.8.2.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
 EBUILD translate-toolkit-3.8.3.ebuild 2436 BLAKE2B c84859e2882719d6557918f1580a4a027ea586ae062f877baef0559cac641b59281abadfe9a1f888899778fa76babdb301e73796dff6fe03cea09161848bea2c SHA512 9f50a862bf8ff4129ff974c3ab1d4e4c3863585393aaf35fc1056c63fb6fda24485458e240abda227f5d995427e4796913b30e63b6bae5459f903c50f40384cf
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild
deleted file mode 100644
index b13315e59e23..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${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_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'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	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/translate-toolkit/translate-toolkit-3.8.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.0.ebuild
deleted file mode 100644
index 5628bcd1f693..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${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_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'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	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/translate-toolkit/translate-toolkit-3.8.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.1.ebuild
deleted file mode 100644
index 5628bcd1f693..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${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_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'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	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/translate-toolkit/translate-toolkit-3.8.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.2.ebuild
deleted file mode 100644
index 5628bcd1f693..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${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_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'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	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-util/Manifest.gz b/dev-util/Manifest.gz
index 39c914123748..aee7825ee935 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4dce42b828dd..9f6e9b8a772a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -8,24 +8,18 @@ AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af2
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
-DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
-DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
 DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e
 DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
 DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
 DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
-DIST cmake-3.25.1-SHA-256.txt 1646 BLAKE2B b5ebf93e481b2bf63c5448875983f0b4d13f4e588eb226577969738f3b56c0ca14d9ab99ffc4dbcf8a2ab74a159de00368ce6ebf9667b90ef657083f351c4c01 SHA512 5e7618b27b0cdb674ee0ea7e1e6641ba31da6f4414ae1a08ed11691e105ebd89a39a307b53e04e2386785bcd2917e1b8d65755ef7c07a1d9f4f400dcb5385b44
-DIST cmake-3.25.1-SHA-256.txt.asc 833 BLAKE2B 3dce05d9ad5852165418726fc16de4fcc6c66aa379ce926a68c10515dcd87ed40b60ce345952fc2c83f342b5ebb0f02134af6c07b58e9dcf7e1757ad6294d8b5 SHA512 70ec7f1cef52d76ab6732556b663509de780648a2009608632a7df0de86c1d8b91fab874233413216a486fa97648d95de1556f89f48cea936408b609380c5aa4
-DIST cmake-3.25.1-docs.tar.xz 499680 BLAKE2B 0baac457fbde68046080a906093be96c6fe3d7a4b592125237258768eeb0f9c80d3e1e867e2850fe3ebd27a1284d2f47245ca73b8f5b6eb4c046f2afdab78e56 SHA512 02e1bf84be15a7c796a9a7535ee286ca3cddc478707daa1be076be44285f762a0c5eb620b34815e6713b7262a534d7c7fb48e53896c4706645792397f8da83e3
-DIST cmake-3.25.1.tar.gz 10561054 BLAKE2B 3aaf546ebc935caaaf6d15c61f99184964902a50004222ba29e17714488b219f8d8754008f2b2d701dd7befe8c0f4cd0edad92fcabb8ad37b981f31b2d1e37a2 SHA512 ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57
 DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 10289acf1a74e45ad1109bb0759ce82024553947ff60c8358854f26d276e89155df9b44561adee4b838d95fb2fcb54b4d2ca1e957b35a90ee80ea56dc63d94be SHA512 75d6a0c4c9350ad466559f44f56f2d18308cdfbaba24da3c86950c9bfb4861f9486f031b41206de83019850944081f304953dbd04b55501ea7b3912aabfb1e00
 DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc SHA512 16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486
 DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8 SHA512 191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91
 DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 SHA512 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390
-EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
+DIST cmake-3.26.0-rc1.tar.gz 10666314 BLAKE2B 1fcc779757447f3c07e41160f2f16648e902fff66ece3099bf5c5c57b6cca75e55e7b35c5eca0dc128146aec5d0064f5a35fecca0015beca6fa0102585c6e808 SHA512 6280fd7f3f04da291350441847d4be001bcc56d7e31a08739327958a26721a88cab2de608e53b28154324dc857aeb67dca0f2cd5243b4b3269744628273d6386
+DIST cmake-3.26.0_rc1-docs.tar.xz 507308 BLAKE2B 83cc5c43acdd7b38961b68c3b477ef070553230823a0a1636222b8ac4e5d268beab4f6bfbaf7d631c07135011a5c1842db227306fbbe5542a629fd03d039c324 SHA512 d2a366e8c56035ad697f71d30b37bd9b096c07edb7c84e0b8c271ba1daf1cdc4f59caa1fadf9ad9fad597dcbbd2a0b80f0bf7cd5a23f6888d2d8794d604cf617
 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
-EBUILD cmake-3.25.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
-EBUILD cmake-3.25.2.ebuild 8817 BLAKE2B 27df0065700970defcef1d429d98ff6f6d0d798d2dd2d0c1fb203eb820bf5b0229f3d803f88f34867de877d3cb341dc62e9a0f8db48509735ee9caa18a75762f SHA512 11ae2131ff707092c2d09ae01acaecce14ddf2ccc19cff4acb738f453a389c265543f7fce10620d7917f3b6ce77dd46a80ef1f6273b37bcd3128b497224082f6
-EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
+EBUILD cmake-3.25.2.ebuild 8813 BLAKE2B 3a2babe4aa927b69bfceaf54412a366e6cf1d2233f2510a679c97870c6981bb05411e55c6b5becffbf73eaf0ce1ede950002034a639eba684b159be0d089b2f1 SHA512 8edf82c43677bca99ecdad20b811a67d2d723f7da02dea56fd4706b36ef52809b2581131af19c3c9fc9254328102869c97dbe7bf6c828beee5b6dd540715c25a
+EBUILD cmake-3.26.0_rc1.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e
+EBUILD cmake-9999.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.23.3.ebuild b/dev-util/cmake/cmake-3.23.3.ebuild
deleted file mode 100644
index 01a0ab88915d..000000000000
--- a/dev-util/cmake/cmake-3.23.3.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.25.2.ebuild b/dev-util/cmake/cmake-3.25.2.ebuild
index bcb269c0b956..8825af2a4a7c 100644
--- a/dev-util/cmake/cmake-3.25.2.ebuild
+++ b/dev-util/cmake/cmake-3.25.2.ebuild
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cmake/cmake-3.25.1.ebuild b/dev-util/cmake/cmake-3.26.0_rc1.ebuild
index 9491df325a39..a2b661bbcdbe 100644
--- a/dev-util/cmake/cmake-3.25.1.ebuild
+++ b/dev-util/cmake/cmake-3.26.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=${PV}
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # See bug #784815
 CMAKE_DOCS_USEFLAG="+doc"
@@ -133,7 +134,7 @@ cmake_src_bootstrap() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
 		default
 	else
 		cd "${DISTDIR}" || die
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 9491df325a39..a2b661bbcdbe 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=${PV}
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # See bug #784815
 CMAKE_DOCS_USEFLAG="+doc"
@@ -133,7 +134,7 @@ cmake_src_bootstrap() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
 		default
 	else
 		cd "${DISTDIR}" || die
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 6304f68dc6df..f7ada984ffae 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
+DIST gnome-builder-43.5.tar.xz 10289424 BLAKE2B b0676ebf4b475a6223a57f79d135371d3cfcadd3d4dd37abf48f000f9fc0d0b3e48fb615bc07ed1415324f7661a8f4c7b05c3f31f41a70870f9c4b320d33160c SHA512 24533109c0be9bd595b04ab2abceb2a894034c648837181e8f21fb52e54b8f0e0d043f4d89ab2fff0f84cf0114d3824e05fc8f466745e9e4b577f298cafb483f
 EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B af7facf902f7d84accc297d52f4835723f33afa2ba1582047151e984f3a36a187318b2951c4aa49704fcec149c7e249e3d988a98026f359255265e72f2556f86 SHA512 3a32edf77f4eb16ca9a4ca0e4b451767d79a36c97910e3c775e8c54696d246383ba9d85d44fba15dd27f1fb3ead680d98f31ec5d02c686eb04a26b04d2825caf
+EBUILD gnome-builder-43.5.ebuild 8734 BLAKE2B d07c20305a6dc16056df0558665675e8e2e27a2564b02e5cb3f5fdcc145fd14b95c8079c2ede5322b18b1fc8a79c4ee21a9ee0aa804dd12aadedee57137b585b SHA512 2af6fef459ecebf4b2cae7808403a5536afe8c870663ac0661ee6c294588026ae8a25513dc790bee78bba0ec628c45f7d6438cc8d53e7c5bb85277f3e355b17c
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.5.ebuild b/dev-util/gnome-builder/gnome-builder-43.5.ebuild
new file mode 100644
index 000000000000..ef2c2fc96d89
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-43.5.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2
+	>=gui-libs/gtk-4.7.1:4[introspection]
+	>=gui-libs/libadwaita-1.2.0:1
+	>=gui-libs/libpanel-1.0.0:1
+	>=gui-libs/gtksourceview-5.5.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.42.0:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.0:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* virtual/rust for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=true
+		-Dplugin_jhbuild=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_shellcmd=true
+		-Dplugin_shellcheck=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_sysroot=true
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_valgrind=true
+		-Dplugin_vls=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index f12f37818a43..670d9910d74e 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,16 +1,12 @@
 AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
 AUX valgrind-3.13.0-malloc.patch 1024 BLAKE2B 3917fe49e5b7f8f678801edd3236b76fbc3eaf790bc19db7a1055cd949df802fc7612b8ec8fb40371814790d24f15fc2cdfd5349297ed5b48e28d3224bb2d170 SHA512 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
-AUX valgrind-3.19.0-clang-15.patch 1263 BLAKE2B 0b1734061165735c0eba127d46250bca3bffc4a5c884c4ced121172561e36c7bebc9e138ef6e0ee519de5fb3dac37050540fdf576da5e7690e47a8ecac6a6f32 SHA512 d7af318c02815f705cf307ab673622de7c1b9afa4cc9fdbedfe6b06a98ac7798e1d19ee5836826f0d45c331a2ec2518c5515f7d908b6b8f22d3e4753b176d977
 AUX valgrind-3.20.0-gcc-13.patch 1181 BLAKE2B a7cdca7b99e822444ab3c453efba979a341c31ad0882a8a8232ba96af4ccc94277b142a833435afc911b06b743c5bc6e7bd126b7f65246308147130ab0ee86c4 SHA512 c4d14851f7ea41d8b3f8391f3e2c0fd72afae0944594d126bf2d3dbbf65fd3cd5fdf5303c4b7b3f40c5fe48f0e965dcd6265d268b8e3483c9354ede8e5c53af5
 AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729
 AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
-EBUILD valgrind-3.19.0.ebuild 3954 BLAKE2B d8d02f214a8c371c7636d9c39ad30e341926028cc77d983f7c99d576a47904499522808c70b03c374b98a19c0df9e4965e60594a52d61b17c01efd35f192df75 SHA512 ce5e9ae78091d0437149aabfe690f3ecd15c18f78318133c08256625846d20e577ba6ed68f5f2773e2bba8cb70e1674e4e22051abb1466d47116d674189da032
 EBUILD valgrind-3.20.0-r2.ebuild 4348 BLAKE2B b69609c8be736593c8e82e7e267d68a3708a686b1ac56d7a556e6263626858cb14e1caa185fbe00f31fc6649124fa70f1a0ebdb8793e62f6f7bd6285c1dd11ab SHA512 53e95ff5d1f971667cb747d7f745f5f9e3ca9960d0f4791de84af2f3784bc3614673843c4165a5d43ddb5ae01f05258cc6abdc3c2b1465c78d68fbd3ff35ab8e
-EBUILD valgrind-3.20.0.ebuild 3952 BLAKE2B d60d14a52fd07b3deef8cfb9b909919bc4d495b5adacbaf676f6ff31f847ca1389e1b7b9cc1735dc2a54386e592bc90f60edadc61953302db616bb459913ba9b SHA512 71e4d9fe16ebee33d03e10c2933cf9a3ce4a49178560ae4e2a252d49df526ebf9fadb6477331e1e104f4b77e2fef5b3b862fe376f804f401f75253180701da5d
 EBUILD valgrind-9999.ebuild 4230 BLAKE2B e371ed0bfedc19162d814b3939e270405ccc68b49f59e40d92e237d692cfaa2f2fded8d3985887150da212d7f8594453eee70b861b1c057a242550d62903a2e8 SHA512 4d49d8ae018ddc0c0cfab9d30a135554eb31f59f01c4aa0b3b344fd02fae9f9b1cd5576ffdfe084ba894d2ee9c5842f8d5c7b821d093833458914b030712eb07
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch b/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch
deleted file mode 100644
index 77b2e8b091a4..000000000000
--- a/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://sourceware.org/git/?p=valgrind.git;a=commit;h=1dbc46750f7f716ae3b9cf718380df77422379da
-https://bugs.gentoo.org/869320
-
-From: Paul Floyd <pjfloyd@wanadoo.fr>
-Date: Tue, 19 Apr 2022 22:03:01 +0200
-Subject: [PATCH] Bug 452779 Valgrind fails to build on FreeBSD 13.0 with
- llvm-devel (15.0.0)
-
-This fixes building.
-
-I may make the -lgcc and libgcc-sup conditonal on not using clang later.
---- a/Makefile.tool.am
-+++ b/Makefile.tool.am
-@@ -16,14 +16,14 @@ TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \
- 	$(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
- endif
- 
--
--TOOL_LDADD_COMMON = -lgcc \
--	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
-+TOOL_LDADD_COMMON = -lgcc
- TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \
--	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON)
-+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) \
-+	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
- if VGCONF_HAVE_PLATFORM_SEC
- TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
--	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
-+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) \
-+	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
- endif
- 
- 
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
deleted file mode 100644
index f7e812e805cc..000000000000
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://valgrind.org"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Respect CFLAGS, LDFLAGS
-	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-	"${FILESDIR}"/${PN}-3.19.0-clang-15.patch
-)
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Conditionally copy musl specific suppressions && apply patch
-	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}" || die
-		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	default
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	# -flto*                fails to build, bug #858509
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-	filter-lto
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
deleted file mode 100644
index 5d8a7a3727cd..000000000000
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="https://valgrind.org"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Respect CFLAGS, LDFLAGS
-	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-	"${FILESDIR}"/${P}-tests-clang16.patch
-)
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Conditionally copy musl specific suppressions && apply patch
-	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}" || die
-		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	default
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	# -flto*                fails to build, bug #858509
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-	filter-lto
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index a07e555ab635..84e2245454a0 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-dev-tools-4.17.2.tar.bz2 353571 BLAKE2B af3ec3e603b2224ee47feefd63eb3
 DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 EBUILD xfce4-dev-tools-4.17.2.ebuild 629 BLAKE2B 67dc7710e79735b17caf0f59b60731da8079b3b5e28ab25562d2bc662dc9f6e0183cbe2c330361997ebd256146f5a6fbf7d9220b7251dedf6ed85c68f8292c52 SHA512 deee8675a7e3e9694f9fe303a6de33b925e84fc2e5194f7b4cdef464d03f71ee68afa71764296fefe0cdde68d212c5922cbfcb87b09888e5bcc2cd8a684c8aa1
-EBUILD xfce4-dev-tools-4.18.0.ebuild 628 BLAKE2B 60e7547653ac9b145b0390b9571766f8da3c0ec804e40b75aee4faf42bfb704cf97d3867d4b8d1e8ddf76d02a6de0477c16689bfab3656227e38f32729870972 SHA512 2ab92fe9b49ae6239f80dc8385d5a50b2aceac7af996ee2cdfa80602fc57431da84c20f8fd9ddba2f8d283e4eae8639c5c25681ebff2fc13ce6bb77b68b71957
+EBUILD xfce4-dev-tools-4.18.0.ebuild 627 BLAKE2B ee0ab2ee51de20f04815ab0e97afcfcfc4d77ad753b0efaef17eb5d249e04a72aaf50ef317fd0216a92525bf3cfd38b8d84ef21aa84d9a77061b1d2176287547 SHA512 d37e99fd5d57454f33bea94352e07f09ac64726a087390475724df1ef174db22c91de786fe4748d83107335446c8e589541d58b961754116d457592454162f7a
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
index e0bc4a0e8919..a17c0cf70206 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index f6d877e09f30..d515101a866c 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index cdbc766feeb3..022820d012d5 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: llvm.eclass
@@ -78,7 +78,7 @@ DEPEND="!!sys-devel/llvm:0"
 # @INTERNAL
 # @DESCRIPTION:
 # Correct values of LLVM slots, newest first.
-declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} )
+declare -g -r _LLVM_KNOWN_SLOTS=( {17..8} )
 
 # @FUNCTION: get_llvm_slot
 # @USAGE: [-b|-d] [<max_slot>]
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index ea39ac87ac0d..4192f3c7e765 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 94b239d799af..8b95553aa970 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,6 +1,6 @@
-DIST prismlauncher-6.0.tar.gz 15242433 BLAKE2B 33f99a4c8ca5ace049035edec217890116cbb6cb7b88061d010677d3c5167a986b02116a4fe92e780636e1771e90a550902a9a19e33aa750d90fca6e23761199 SHA512 d80fe1dd1d057003acb8cf9a0f0bf793b346932e068ac516f7f6e6fbed69e1485a9267f7b37f4d6659385e3b01a3f1b41b5ae208ceaaddda0b4e5caf4ac8119f
 DIST prismlauncher-6.1.tar.gz 15238520 BLAKE2B 358c8b7377200598ec8f8f855db9b82c07aba82c939bacdb2d4af6c84a68306450f6d30fba97c9fdc3134f3c28abfc524a8853f36fbf5d32201a91635f22f5c8 SHA512 b4c55ee7bc3d71e13f1ca514b6fc4a0826e49ddb6c93c7d4f9d3fd226e6062a0678e29bf2736f3ae79e205f7c28e4b3782051b92dcd6293471e20d87f646ead5
-EBUILD prismlauncher-6.0.ebuild 3776 BLAKE2B a78fc21882fc264cd422499b3e91ae56dac24894db301685f21ac0f6b4d62a6917492f4632bef83e9e5d675ab849d18c9536047185345cce5e1158a7f7efb2c4 SHA512 2f0a8dadab7d301b198996a0b009e8366eb4e84761e4f4c0fdb098e7150d79dfa53b430d255d5d91bab78935c2739b4d2f5e696b86f7fa31f1ce9da34f7bcf24
+DIST prismlauncher-6.3.tar.gz 15675450 BLAKE2B 6117172ad13c56c809755230cc9acd1a3987c9cc40bf80e853bfdcb319811ab5fd67cfe981a5301ac8a7bed7ef43f8d93fef31a368095fc8933d4782be7038fd SHA512 ccd37df6113b4c0460a6a2be6babed8d977d07a94f04e0dde65e185008158a4c99a6a991222de66756200b9aafcae8c441e4c30375306affcbe8e158b9242fc4
 EBUILD prismlauncher-6.1.ebuild 3776 BLAKE2B a78fc21882fc264cd422499b3e91ae56dac24894db301685f21ac0f6b4d62a6917492f4632bef83e9e5d675ab849d18c9536047185345cce5e1158a7f7efb2c4 SHA512 2f0a8dadab7d301b198996a0b009e8366eb4e84761e4f4c0fdb098e7150d79dfa53b430d255d5d91bab78935c2739b4d2f5e696b86f7fa31f1ce9da34f7bcf24
+EBUILD prismlauncher-6.3.ebuild 3776 BLAKE2B 22d0869aada18c32aea52b71bd08c06a302c505fde70de2fb7db376911f75870c4771132a379d36c9b6dd881af80f08a53d30f38c97ad1cb772ec442ae443d3b SHA512 36323738a8eae87ffd85eecb89b4e2efba4d1402d805f353018dd8a89d44557907caaed8458177660e94cbbb57d46b5206718cf0c6b0905010ce3591455e3450
 EBUILD prismlauncher-9999.ebuild 3776 BLAKE2B a78fc21882fc264cd422499b3e91ae56dac24894db301685f21ac0f6b4d62a6917492f4632bef83e9e5d675ab849d18c9536047185345cce5e1158a7f7efb2c4 SHA512 2f0a8dadab7d301b198996a0b009e8366eb4e84761e4f4c0fdb098e7150d79dfa53b430d255d5d91bab78935c2739b4d2f5e696b86f7fa31f1ce9da34f7bcf24
 MISC metadata.xml 1084 BLAKE2B 7def85b6f71b9b18fc987e89c3c2c3e32eaef060183e05a1be179eefe322258c7f83c84066e7300df87c62857e66c2499943db960f45e6532d803b671aa028b9 SHA512 0f893adce9d7b7b259226da5047b594774930afbf25d5a933dbfc9d7247380ae255b97d765ef0b07814101cd017c3c4852131d2f38b57acae0961b4b4606da0e
diff --git a/games-action/prismlauncher/prismlauncher-6.0.ebuild b/games-action/prismlauncher/prismlauncher-6.3.ebuild
index 2c80e3d6509d..1990da8035c1 100644
--- a/games-action/prismlauncher/prismlauncher-6.0.ebuild
+++ b/games-action/prismlauncher/prismlauncher-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 0575dfa87d80..052625608301 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/basis_universal/Manifest b/games-util/basis_universal/Manifest
index f98dbe9790b5..6a726f5b342c 100644
--- a/games-util/basis_universal/Manifest
+++ b/games-util/basis_universal/Manifest
@@ -1,5 +1,6 @@
+AUX basis_universal-1.16.3-SSE4.1-AVX-checks.patch 1230 BLAKE2B fcf212a61147a8a3af2fb1592f521049e1e678ec767b4faf4720ce709f294c6dc15c1c1bc985d9ec6268451164097412f29c701466a4964473cfed052bf38da7 SHA512 3f128ddaf27191940fcc5f438718ae2680fd50d6c829ca7ec0279bd0882a773d2f1a7aa48eeebc2fb9434c38f91cecf9eb3899a28cdd4a3162b4a2c59f40f625
 AUX basis_universal-1.16.3-fix-RPATH.patch 332 BLAKE2B 46349fb09343dfd28dfb383a7d21a5abbb64245f4ba85012f3bc97084740bb8dcbbbb2432902f27863c5a80cc04e3f2b3569dc13ee97b498932fd75182c7a6a2 SHA512 0ab6e03146c5e924644112200b6c0b6cce3f9ab5797be4a052994ee553814c128b74a1e91f66f248af21c496a4407267d0b27c46bc6c29bb1554a66581da3f58
 AUX basis_universal-1.16.3-respect-CFLAGS.patch 556 BLAKE2B b9e099ddcca8a5902da78faf293b953f231c2d05c746f6ff105a0db5dcab07009276c76f8a034a22aa42ac063850fbfaba905ce1c5022aff4e0889b9f2546123 SHA512 5eaa8339b853fb14fd5efd2596ae7221c648203fb253678c0791d7b6278e3ea55ab3d275ee28c2c9a704a5d23dc52e7f54e825c2d8de86874f79ecaced37e3be
 DIST basis_universal-1.16.3.tar.gz 29151155 BLAKE2B e3ef3ead6223aa73012bd74e51dae269746cfcf2720c524be8096ce8643777723888f98a140d2e28c881ed60ab54b7ea6fef4205b72757d72e766f85806b4484 SHA512 3dca02ad6c14e74df7a89d3b2a59b970635cf5e268b96eb91b10033e2b8e635c83aca6b8e9b34a1b689ed5ffe7c8348d15b8524385f6d07a51cc34a46246a0b7
-EBUILD basis_universal-1.16.3.ebuild 1054 BLAKE2B 01e96f18229d358ceaa35429dd43453d4ea17def4b14836067e9a77416ad384f518c16208b090dad6162996fe21f3276aa3f3567e216559175bc29131b6b8a81 SHA512 17779d73995ceba80ca92c1a71f7ec0e655ad1cc1aed81648bd3a854c2ff13629fd1592fe987038797ed8afe3b07dfa1a08740da2a53c7bebd009de0ddd4a52b
+EBUILD basis_universal-1.16.3.ebuild 1106 BLAKE2B c9f5799da8006837d2c1d8421fb6479f0ddc93bda9aa5fcebd807f72639a29e5b3e715b695ac12b6ee4625e6bf434eec2970dfe77080fce27754f7a51549fd1e SHA512 61ba9c296828e7cb6b7e999405b531ec9b2fe4d199b43b185f6f1f92586baad7a5ffb21cbfaff315ed2c0f40cc8d467e6bd48fc07f676bb5ceea1525b7470f8d
 MISC metadata.xml 412 BLAKE2B 00c914af265ebe97107ee3ed185ae7693348de4902d557beb6590efae0b1ec351baed1fd02facb6605b390fff36ddc40aa49ff1786472ccd5376d16abd522540 SHA512 1a971517dc0b642e254f2acab248d9364b510b16b80fe095c320d552869f6e8909343fd6e62a1896c344d57d7f4624e10f193c3b4f3b7689eb5b669b85517998
diff --git a/games-util/basis_universal/basis_universal-1.16.3.ebuild b/games-util/basis_universal/basis_universal-1.16.3.ebuild
index 298c8ecdb705..239d01901831 100644
--- a/games-util/basis_universal/basis_universal-1.16.3.ebuild
+++ b/games-util/basis_universal/basis_universal-1.16.3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.16.3-respect-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.16.3-fix-RPATH.patch
+	"${FILESDIR}"/${PN}-1.16.3-SSE4.1-AVX-checks.patch
 )
 
 src_configure() {
diff --git a/games-util/basis_universal/files/basis_universal-1.16.3-SSE4.1-AVX-checks.patch b/games-util/basis_universal/files/basis_universal-1.16.3-SSE4.1-AVX-checks.patch
new file mode 100644
index 000000000000..89be7b13482e
--- /dev/null
+++ b/games-util/basis_universal/files/basis_universal-1.16.3-SSE4.1-AVX-checks.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/892727
+https://github.com/BinomialLLC/basis_universal/issues/342
+https://github.com/BinomialLLC/basis_universal/pull/343
+
+From e61fe1e4ff66decbb14f86a1bf8ec4ea40d23bbf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
+Date: Tue, 31 Jan 2023 14:39:17 +0100
+Subject: [PATCH] SIMD: disable compile time checks
+
+SSE4.1 support is checked at runtime, so compile time checks are
+redundant at best and harmful when compiling for a different machine.
+
+Further more, a logic error prevented the use of SSE4.1 on systems with
+any version of AVX available. This is fixed now.
+--- a/encoder/basisu_kernels_sse.cpp
++++ b/encoder/basisu_kernels_sse.cpp
+@@ -22,22 +22,6 @@
+ #include <intrin.h>
+ #endif
+ 
+-#if !defined(_MSC_VER)
+-	#if __AVX__ || __AVX2__ || __AVX512F__
+-		#error Please check your compiler options
+-	#endif
+-	
+-	#if CPPSPMD_SSE2
+-		#if __SSE4_1__ || __SSE3__ || __SSE4_2__ || __SSSE3__
+-			#error SSE4.1/SSE3/SSE4.2/SSSE3 cannot be enabled to use this file
+-		#endif
+-	#else
+-		#if !__SSE4_1__ || !__SSE3__ || !__SSSE3__
+-			#error Please check your compiler options
+-		#endif
+-	#endif
+-#endif
+-
+ #include "cppspmd_sse.h"
+ 
+ #include "cppspmd_type_aliases.h"
+
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 0fa238fcfe3a..83062fcd7d99 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 92d051b52866..9503aa57083a 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,5 @@
 DIST libwpe-1.14.0.tar.xz 62928 BLAKE2B 3d74d8282548048db0814b557c14ab170a3c7603014dc94e8a7f128f043f10fdfc3877c10bfffd655396f684b012dbb7e5a43ced6a164476f79ee3de7fcf92b8 SHA512 a443bc3777239140aff140a6b98595687aa50a3506e09d872cbabf843f5a6da575b90d0b3728062b7957b73c75778fc7d3a178d267b5ceca1da58e69f8ed9fed
+DIST libwpe-1.14.1.tar.xz 62980 BLAKE2B 5f24322ff463fe9701e47c5eb46076fd406cbef2f54ca08b962c93f425a2ee217eed810ee7d2582ba6d54691071d651f8e60f624a88e99330027a8221e3f4d2c SHA512 302f5e795c1d3c927f583eea8f52a1e764ce4d610b8021dc6cd6fd672331bf5999388c0d3f4bda2fa2096385beda2fe399f18b6d8d31bddb18c5a4aae87b2e35
 EBUILD libwpe-1.14.0.ebuild 610 BLAKE2B fbeeb71a20951e7d4001249bbeed4d483a2c9b6b04a192cfaca5ef0feffa67ebc518fa47c8020d04935d9f4c2d3428de9a143db59d7812bcf22d06fee2617836 SHA512 13024c84997daff5d730be6efebad6a180aeb8e916370e697d917e650238a28254bda0403e046cd2351d360052c18916987a1b546fae826b430e1a5190e8e28c
+EBUILD libwpe-1.14.1.ebuild 616 BLAKE2B 17cdea4a87b2ce77a4b95db2537a1d5b40a86bad53f7581c9d89850a5f9a91b99860773a0528e89570d8cdc0fb50a63dcfd0388cd25f6e38f0e63a88a75e0c08 SHA512 08b06441b3573cd1b63538ac2ef649ff75c6492626ce9e49053fdd50d9b15379dec570d0f755e76bc16183523e6c339f500979cb5e6e3f1b91592fac5b9345ba
 MISC metadata.xml 358 BLAKE2B d4e80fdffa433298c517d9c0bafbef96bfb06cf0938b951e89349089c4bd651d7697133b16aaa9a99c99478ae4c02526a642e91b3934a0fbea762e08a997a75b SHA512 48a741a24d3bf6661b9656906c16625751360787116da9990e70f59a4d79bad35d93fa770b7dc85587c83d3304eb6002346378bb22c251bc54d7d7d8d2926c50
diff --git a/gui-libs/libwpe/libwpe-1.14.1.ebuild b/gui-libs/libwpe/libwpe-1.14.1.ebuild
new file mode 100644
index 000000000000..d8dce1ac8315
--- /dev/null
+++ b/gui-libs/libwpe/libwpe-1.14.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Platform-agnostic interfaces for WPE WebKit"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/mesa[egl(+)]
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Denable-xkb=true
+		-Dbuild-docs=false # hotdoc not packaged
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e016773d6dd3..d525f2516aa2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index f3d70ca680be..25e295020a22 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,7 +1,10 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
 AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c241eb36662c8eea9f3f28b2979c9936a7af60920ff0d951bb8a36ef5075881a25e3ed8e73781b538df5b7da97344ba36229f2defa3d928cd SHA512 3a0215f484ca9341e81194c2f5f73c9eb64f1322de5c3bb0e3d8615e7b7f1e4c9044c2db3855f3a68c04db9f1476d3f0115545925cb3f5f8082e5189ee9c2b6c
+AUX graphite2-1.3.14-fix-nodefaultlibs.patch 1029 BLAKE2B ba35d7c4a6200626035bac940749740cdda89b5c8cf3c37428578214de8ba647331b454ab75d92a4d333d702a39e335c716010299a2ca2dd07a678d8d08eea93 SHA512 5ddcec369ea8bc8e7ea935d3cecc936a148cf275314008b6993574f18c77a3bf7689fd551ac119f82b15ddf365b23ad168726facd5ba78bd611b196b2cf614a2
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
+AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3032 BLAKE2B a247b15f51be2e871396ea037c55d1085053781f518e62d23fd2f251cb25296eaf0ad187a864701812d2dce90a480fb44be55cad27982a131a14c570fbe2f8a0 SHA512 90a54f29e5a12fdfc87b6afb1c90e793c9d3dbc75f9171358f024c2e64c01af59cb23cf46fa28b1f7e390b2629c374fd5ec6379064b2456dda0069046d761d51
+EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 97382f67bc420d5c500b910c58cc79001cb2fbd6389fb48dfbfe59c48d4c360211676bfd1cf5e24df6e35d7762fe73ccb445d1ee6687dac3ce8fb138a681ddeb SHA512 65a359911161ca92e5684e77c2866b3d9997ae6e0ca0ff951ca710f32e4bb75f85d221eeec9ac251b985d7ba128dae8f0c3571317f9f440bf727c1c495d426da
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
new file mode 100644
index 000000000000..c55f67c44f55
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
@@ -0,0 +1,26 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,7 @@
+                 LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
+         else()
+             set_target_properties(graphite2 PROPERTIES
+-                LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++                LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+ 
+             if (GRAPHITE2_SANITIZERS)
+                 target_link_libraries(graphite2 c gcc_s)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -51,9 +51,9 @@
+             LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
+     else()
+         set_target_properties(graphite2-base PROPERTIES
+-            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++            LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+         set_target_properties(graphite2-file PROPERTIES
+-            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++            LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+     endif()
+ 
+     set_target_properties(graphite2-base PROPERTIES
+
diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch
new file mode 100644
index 000000000000..e4413d1f9a61
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch
@@ -0,0 +1,17 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -127,12 +127,7 @@
+             set_target_properties(graphite2 PROPERTIES
+                 LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
+ 
+-            if (GRAPHITE2_SANITIZERS)
+-                target_link_libraries(graphite2 c gcc_s)
+-            else()
+-                target_link_libraries(graphite2 c gcc)
+-            endif()
+-
++            target_link_libraries(graphite2 c gcc_s)
+             if (BUILD_SHARED_LIBS)
+                 nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+             endif ()
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
new file mode 100644
index 000000000000..bd53468cf978
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{9..10} )
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/graphite-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib:2 )
+"
+BDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/Locale-Maketext-Lexicon
+		dev-perl/Module-Build
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+		media-libs/fontconfig
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+	"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch"
+	"${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	python_has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		-DGRAPHITE2_VM_TYPE=direct
+	)
+	# https://sourceforge.net/p/silgraphite/bugs/49/
+	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+		-DGRAPHITE2_NSEGCACHE:BOOL=ON
+	)
+
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \
+				-i "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
+	cmake_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		# we rely on the fact that cmake_src_configure sets BUILD_DIR
+		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			-i "${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cmake_src_test
+	else
+		einfo "Cannot test since python is not multilib."
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		# Perl tests fail due to missing POD coverage...
+		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index ae63dfd137e1..09fdf24c68c3 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
 DIST ristretto-0.12.4.tar.bz2 619084 BLAKE2B c04d09b8475a46e89a2151cc46121ec9960f52ba8e861c474a46a8bda470c6620dfe2c38a35a80c075d830b7d4d3b80c435ebe1baf10bb913e20d26945d1701c SHA512 666e127646b9f30bed54d8605c4892d302b15dff39e8b532ebb3da22dc5700414e6d7bcb29d8d66f6a8a7d487cff50b0a0cc610d8b4616479397ebf987ff409b
-EBUILD ristretto-0.12.3.ebuild 899 BLAKE2B 22909ebbf5a641d6b26ccc1e3595a388086bb0dfd981d565cf042868a96c2e816dee6f5420b2549ed06401e6e5822b5070ea6e30f595e66c61e97c0ec4c81fb4 SHA512 e171f72e986df77de173def2b98fad78bd7c8f504a82ff956eea1da6dd849ea2add21d073e12ffdbc460570c0939c4b594d249bbfe98da9ba306c81786c1e8c0
 EBUILD ristretto-0.12.4.ebuild 899 BLAKE2B aac782b2f470476e31569056c436160caabb9c41166f8dfe02182fad70b209bdf925105e7229f6c4925092d62059798dd807beabb95633add6dac5cdb90d0b36 SHA512 e73bf19c0f18e55dba40807be7731c5d35669e8c89709f78c142beb18f96bb6a6dd8efa0bf95dc44b66678ae9820c8e4d9ff6199316d5a986323c186ca3ef637
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.3.ebuild b/media-gfx/ristretto/ristretto-0.12.3.ebuild
deleted file mode 100644
index a6016ef6eba1..000000000000
--- a/media-gfx/ristretto/ristretto-0.12.3.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 xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.16:0=
-	>=xfce-base/libxfce4util-4.16:0=
-	>=xfce-base/xfconf-4.12.1:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index bf0e6eeebc63..dcec9df87c94 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 635 BLAKE2B 26b2ae79ac190852f5151dd912247806927ba3648406d2e0030811e90a7dd3b997babbb6df04585c4e37002e75e9a2194ebb4124b9f043162f8147d1fa280a3b SHA512 0b5c252b1cc4e40350aa8e2fe87d838b7ca96fa126ab8dd9197e00aba6c6e47e8b43f35d0efd75047f6993ca7563aa4e23a0d550413532bf60184b30052770e5
+EBUILD scour-0.38.2-r1.ebuild 667 BLAKE2B 97b305b80b844d56e81553e522a098156651dd817934c8469fa8f15b78fb7c33db9f29d4148896e2ba612ed35a44aa1f042b78b55ae317ea15e30204d978cde2 SHA512 40b6c20657e429b6dc130c9995fda6297221175732a7dd5149cc0b21985e186ce2ee96c478a3d046223aa6bc20c5ee1e2e5e86b936e0fd610c8345964b731388
 MISC metadata.xml 282 BLAKE2B 6620cd1197d43d2a968e882186c2e144bf20ee709d4f3c812cec56f48899477fda8fbdd7f198d5e2bc9e9a3b7e8f72b547013e31b6d0d2fdc6271dc7680d48e1 SHA512 41c21e7c62696f6a337d3ed21585284972244e0cbb6b92247a1f745e75ce1a901d4b290f0e99ac6f866f110c08d926375f107e4eabbae000c918fe9f939af2cd
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2-r1.ebuild
index cced72566648..30d85af79f5f 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2f1772ef8c91..ce9b2b2750ac 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5fc27631661a..5873b247ea87 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 14:39:38 +0000
+Fri, 03 Feb 2023 20:39:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7fc02664fd6e..4ee8db49fccf 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-03T14:39:41Z
+TIMESTAMP 2023-02-03T20:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdcQtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBVkw//cjurSdAPHa2J8/lc1MGkZjGsAZb6wikWgFmw6kCYnteAXUL0kgMZm7UC
-NYmt3Bp+nhROcsmHKNpxcqvn7v2mVGrWrnQQsf+BbnxxJtytGSuPYN1eEVd7dvxr
-4BZVpm3X9Tha/Z2jXJ+BnRYSFqGKUgJ5ewT+s+erJJKxKidfJuTIFGMKbzqTaNcs
-68XvUNePZo12Y8D6UXp//Am7cA+kwkZHLsNgvz+YKb6lcGgmgYJqvpmb4vSJC4VF
-berSRcy1DdFGdoBhLvZpBU6tkkkYsdPPdSKuwF19d5CTMgpW9ken8ZsIDJKScj/A
-ps8FFbXN5OVkwQAR2HAsIPQiGkfXZUBq6Hz2CygkFySyQaBR5+mRNmtXDku6kAC/
-Q5U29wy6ak4FXmlZb+srsAal1SMRQXdv7TiyDPe/AK7aYvxQNnA+D2MI+SzdzRZv
-0SkVlW34Ujjg+uPbfDnuQ9z3V3oXOwC6u04xJFTFNxuDQG9ZDEzdXlEPQ8Roxohl
-1NA2j0ZWTXxlqMjLYXWjaDDYd5XQCYwk2qDReWN4hrc/YvwCKorXUYouO8URE9ld
-X6G2SzQHgtloypSCqUS2dzxkiAApKZgWzMKWrdDg++QyrB80R2qRBxvpIa3pgyK1
-SPDmjSI8KWwRQyxddpV9Wzf4FYrqny7l9Qy+NmGnmosHG2ZBBoo=
-=aiA8
+klActw/+P2t8Igt1zfGOW7vW2fYFy5NBubkVyCe3ms7pXBszlkQx0dFaTOngLTgT
+cLZuFtADTsELixL9NMD6STddEBWbf1F9bF0N30uxm8f3B4TFsBkw0J812oavJRyu
+G3/HnpdibiuHYcM11Z4LHBDiB1/A78WFf05MGhZukQAbhxJAvRNANTLxt0lFSLcC
+Kpy2eiPjkM+yHe0cfZisgHJ9E5jID1NYNAPR5nuOT+4oWqo1HqGcybCYiHOOfIOO
+udSFBl++VXBpL5eFzDnxukIa4KGqa0PWu8Ho0bghBSCf03MVdsOY9zB1KHQrDYR6
+YfJbfaixTnHwOixwPYbRiXFFjPGGeSqWccI/KE877ECoY5hYBhQAxV9dZcLXwPh5
+jbQ6TpWS/eIk8zPqLRBmEW1B8MTIUzs291j6KVocbFjJqSKkgvv0D0AJxHRnArhM
+dmGDbYMFCPJ3MSWf5XUeUvHLQ+ZjJaiNzuDUUZt74l7UNXQEfkxZE5hqOb3RT8aS
+Spw6+TZSfTZtaZsMIJkf306nJ3zSHrPjmav569nGFTQJyErIE0bNbBaoSSIAyg9c
+vQiTxo3jdeR3lmDz5IK3mLB1vfEW7sdAVWU4eJEgFtn8mH2AQLM5BuHqq1qrwOkM
+zyDCw9HEaRyJGZBHiWJm0dt0m6cp4pIh50aa9ObT54AMnDWdEGc=
+=xLIB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5fc27631661a..b76a4f62d600 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 14:39:38 +0000
+Fri, 03 Feb 2023 20:39:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index d11ae4f06b52..c1c2769f2cca 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 5eb21c4909a2..5d152ecfd95f 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.50 b/metadata/md5-cache/app-admin/awscli-1.27.50
deleted file mode 100644
index f63cf5c459c2..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.50.tar.gz -> aws-cli-1.27.50.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.54 b/metadata/md5-cache/app-admin/awscli-1.27.54
index f1d60acb5c68..68a1198f2cc5 100644
--- a/metadata/md5-cache/app-admin/awscli-1.27.54
+++ b/metadata/md5-cache/app-admin/awscli-1.27.54
@@ -5,7 +5,7 @@ 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_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/botocore-1.29.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.27.54.tar.gz -> aws-cli-1.27.54.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
+_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.57 b/metadata/md5-cache/app-admin/awscli-1.27.57
deleted file mode 100644
index a7c7f3b28de3..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.57
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.57[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.57[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.57.tar.gz -> aws-cli-1.27.57.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.58 b/metadata/md5-cache/app-admin/awscli-1.27.58
deleted file mode 100644
index 30405726a118..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.58
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.58.tar.gz -> aws-cli-1.27.58.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.60 b/metadata/md5-cache/app-admin/awscli-1.27.60
deleted file mode 100644
index 2cdc7cf57f37..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.60
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.60[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.60[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.60.tar.gz -> aws-cli-1.27.60.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.61 b/metadata/md5-cache/app-admin/awscli-1.27.61
deleted file mode 100644
index 935a20394205..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.61
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.61[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.61[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.61.tar.gz -> aws-cli-1.27.61.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.62 b/metadata/md5-cache/app-admin/awscli-1.27.62
deleted file mode 100644
index 624d27b52fb9..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.62
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.62[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.62[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.62.tar.gz -> aws-cli-1.27.62.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 995675543481..2998de086b35 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-1.0.0 b/metadata/md5-cache/app-antivirus/clamav-1.0.0
index a0922dc1e25a..8b81603fe453 100644
--- a/metadata/md5-cache/app-antivirus/clamav-1.0.0
+++ b/metadata/md5-cache/app-antivirus/clamav-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamap
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cisco-Talos/clamav/archive/refs/tags/clamav-1.0.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.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/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/bindgen/0.59.2/download -> bindgen-0.59.2.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/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/bytemuck/1.12.3/download -> bytemuck-1.12.3.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cbindgen/0.20.0/download -> cbindgen-0.20.0.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.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/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.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/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.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.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/env_logger/0.9.3/download -> env_logger-0.9.3.crate https://crates.io/api/v1/crates/exr/1.5.2/download -> exr-1.5.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/2.1.0/download -> half-2.1.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/image/0.24.5/download -> image-0.24.5.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/jpeg-decoder/0.3.0/download -> jpeg-decoder-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.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.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.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.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.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.1/download -> num-rational-0.4.1.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.14.0/download -> num_cpus-1.14.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.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/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/png/0.17.7/download -> png-0.17.7.crate https://crates.io/api/v1/crates/primal-check/0.3.3/download -> primal-check-0.3.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.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/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustdct/0.7.1/download -> rustdct-0.7.1.crate https://crates.io/api/v1/crates/rustfft/6.1.0/download -> rustfft-6.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.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/serde/1.0.148/download -> serde-1.0.148.crate https://crates.io/api/v1/crates/serde_derive/1.0.148/download -> serde_derive-1.0.148.crate https://crates.io/api/v1/crates/serde_json/1.0.89/download -> serde_json-1.0.89.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/strength_reduce/0.2.4/download -> strength_reduce-0.2.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.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/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.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.8.0/download -> tiff-0.8.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/transpose/0.2.2/download -> transpose-0.2.2.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/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.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/which/4.3.0/download -> which-4.3.0.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	73ed573e1525a108d236a0dffb3a68fb	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=df45334d09f1702729b832afce2c84ac
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 724f49078950..5eef7fb4de00 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.5 b/metadata/md5-cache/app-doc/doxygen-1.9.5
index 5babc41c5606..d79e94fa79b0 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.5
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.5
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://doxygen.nl/files/doxygen-1.9.5.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.5/doxygen-1.9.5.src.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=41d9fee6a2895d1ee174cb3fd39ca2dd
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.6 b/metadata/md5-cache/app-doc/doxygen-1.9.6
index c7030326be0a..60077cafefde 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.6
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://doxygen.nl/files/doxygen-1.9.6.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.6/doxygen-1.9.6.src.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=dd61d15ffbb42cc3f7acadb66c8aec0a
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index 84430355c74b..633f65eaf9c3 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -12,5 +12,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libi
 REQUIRED_USE=test? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ef7ab9419089c70f7e3dc38da61e0adc
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3c3e8545a25f..6297f2897955 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.221.1 b/metadata/md5-cache/app-emulation/virtio-win-0.1.221.1
index d8f838669b08..0a20d0139487 100644
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.221.1
+++ b/metadata/md5-cache/app-emulation/virtio-win-0.1.221.1
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install postinst
 DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
 EAPI=8
 HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
+INHERIT=readme.gentoo-r1
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL
 SLOT=0
 SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.221-1/virtio-win-0.1.221.iso
-_md5_=fd2f4b3cae9d063d12924da28e02b9ea
+_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=23928a0597ecff5476023972ed50b031
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.225.2 b/metadata/md5-cache/app-emulation/virtio-win-0.1.225.2
index 025415557d26..3d5732e2f19a 100644
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.225.2
+++ b/metadata/md5-cache/app-emulation/virtio-win-0.1.225.2
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install postinst
 DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
 EAPI=8
 HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
+INHERIT=readme.gentoo-r1
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL
 SLOT=0
 SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.225-2/virtio-win-0.1.225.iso
-_md5_=fd2f4b3cae9d063d12924da28e02b9ea
+_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=23928a0597ecff5476023972ed50b031
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.229.1 b/metadata/md5-cache/app-emulation/virtio-win-0.1.229.1
index 471ede8caf4a..e5316e4dfffb 100644
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.229.1
+++ b/metadata/md5-cache/app-emulation/virtio-win-0.1.229.1
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install postinst
 DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
 EAPI=8
 HOMEPAGE=https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html
+INHERIT=readme.gentoo-r1
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL
 SLOT=0
 SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.229-1/virtio-win-0.1.229.iso
-_md5_=fd2f4b3cae9d063d12924da28e02b9ea
+_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=23928a0597ecff5476023972ed50b031
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.5 b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
index 4e588cc56105..734770059138 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.5
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.5
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-5.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=90552996ee3e215ea7e4ba5ac8ee8e64
+_md5_=4e1e9db1d76ae60f1d1e74894c904db1
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.6 b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
new file mode 100644
index 000000000000..0cd7039409c2
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers x11-base/xorg-proto
+DESCRIPTION=Valve Software's fork of Wine
+EAPI=8
+HOMEPAGE=https://github.com/ValveSoftware/wine/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +vkd3d +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
+RDEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=7.0.6
+SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-6.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=689c960d0f182a85f87a31dd4a0bcf24
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999 b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
index 3a3356d6d506..0a7d54ce0c6c 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
 SLOT=7.0.9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f85165ef6e112cabba9c2745fb518d7
+_md5_=689c960d0f182a85f87a31dd4a0bcf24
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 26ddd6f54086..cad51b15a28f 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.03c b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
index e6b70e275ff0..320517bdedbb 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.03c
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.03c.tar.gz -> aflplusplus-4.03c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.03c-patches.tar.xz
-_eclasses_=llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=b2200ee52329369f5aa14d9bc7fc6bf6
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1
index 03e135bc8404..23f05568a7f3 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.04c.tar.gz -> aflplusplus-4.04c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.04c-patches.tar.xz
-_eclasses_=llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=2f67cbe0ed3d1341b755bb746361fce8
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.05c b/metadata/md5-cache/app-forensics/aflplusplus-4.05c
index d4efebb5a8ce..6a334bfe2aaa 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.05c
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.05c
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.05c.tar.gz -> aflplusplus-4.05c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.05c-patches.tar.xz
-_eclasses_=llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=66f66b27d4649c7e8595234d331210a1
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 12f9c2efe94c..001e00df5b27 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/github-exporter-1.0.3 b/metadata/md5-cache/app-metrics/github-exporter-1.0.3
new file mode 100644
index 000000000000..8fa9c5056754
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/github-exporter-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Github statistics exporter for prometheus
+EAPI=8
+HOMEPAGE=https://github.com/infinityworks/github-exporter
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD
+RDEPEND=acct-group/github-exporter acct-user/github-exporter
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/infinityworks/github-exporter/archive/1.0.3.tar.gz -> github-exporter-1.0.3.tar.gz https://dev.gentoo.org/~williamh/dist/github-exporter-1.0.3-deps.tar.xz
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=fef53954faa94a5c742a1bf106dfc89e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ad3d32a7a582..a4a08ea37388 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.3 b/metadata/md5-cache/app-portage/gpyutils-0.8.3-r1
index b19b46257ddf..b655b71a04e9 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.3
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utitilies for maintaining Python packages
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.3.tar.gz -> gpyutils-0.8.3.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8a543ee1583c2527acdbde9bd0e330a1
+_md5_=2a196d5d21667f31c501285dd8557541
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.4 b/metadata/md5-cache/app-portage/gpyutils-0.8.4
new file mode 100644
index 000000000000..fd9c265cc96b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=8
+HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.4.tar.gz -> gpyutils-0.8.4.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=2a196d5d21667f31c501285dd8557541
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 7fe1a0c09b7a..d2bd2b71d726 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/e3-core-22.1.0-r1 b/metadata/md5-cache/dev-ada/e3-core-22.1.0-r1
deleted file mode 100644
index 7415fd44be1d..000000000000
--- a/metadata/md5-cache/dev-ada/e3-core-22.1.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/httpretty[python_targets_python3_10(-)?] dev-vcs/subversion dev-python/mock[python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] !app-editors/e3 >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/colorama[python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] !app-editors/e3
-DESCRIPTION=Ease the development of portable automated build systems
-EAPI=8
-HOMEPAGE=https://www.adacore.com/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/colorama[python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] !app-editors/e3 python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AdaCore/e3-core/archive/refs/tags/v22.1.0.tar.gz -> e3-core-22.1.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d88b9c2a7b8efcfed29c08301096e31b
diff --git a/metadata/md5-cache/dev-ada/e3-core-22.2.0 b/metadata/md5-cache/dev-ada/e3-core-22.2.0
index a25350071d13..2db04f5595f3 100644
--- a/metadata/md5-cache/dev-ada/e3-core-22.2.0
+++ b/metadata/md5-cache/dev-ada/e3-core-22.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.adacore.com/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/colorama[python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] !app-editors/e3 python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/e3-core/archive/refs/tags/v22.2.0.tar.gz -> e3-core-22.2.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5468fabc03555e66ea3d16fe79b3b135
+_md5_=e2a4fdc08b2a4cee596b2e27aa1c679c
diff --git a/metadata/md5-cache/dev-ada/e3-testsuite-24.0 b/metadata/md5-cache/dev-ada/e3-testsuite-24.0
deleted file mode 100644
index 086067683e64..000000000000
--- a/metadata/md5-cache/dev-ada/e3-testsuite-24.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-ada/e3-core[python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ada/e3-core[python_targets_python3_10(-)?]
-DESCRIPTION=Generic testsuite framework in Python
-EAPI=8
-HOMEPAGE=https://www.adacore.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/e3-core[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AdaCore/e3-testsuite/archive/refs/tags/v24.0.tar.gz -> e3-testsuite-24.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=08a57a8afe7ded67b005b6a9b42a30b7
diff --git a/metadata/md5-cache/dev-ada/e3-testsuite-25.0 b/metadata/md5-cache/dev-ada/e3-testsuite-25.0
index 45759d387e05..c86ce7d453bf 100644
--- a/metadata/md5-cache/dev-ada/e3-testsuite-25.0
+++ b/metadata/md5-cache/dev-ada/e3-testsuite-25.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.adacore.com/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/e3-core[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/e3-testsuite/archive/refs/tags/v25.0.tar.gz -> e3-testsuite-25.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=08a57a8afe7ded67b005b6a9b42a30b7
+_md5_=b460c70a741e68136c8ecd1efe16fcfc
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
deleted file mode 100644
index 9e5e7ca7a1c0..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),-ada_target_gcc_12(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),-ada_target_gcc_12(-)]
-DESCRIPTION=GNAT Component Collection
-EAPI=7
-HOMEPAGE=http://libre.adacore.com
-INHERIT=ada multiprocessing python-single-r1
-IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),-ada_target_gcc_12(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz -> gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
-_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ffdf3983574e68aa70fa1eab406fa8ed
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1
deleted file mode 100644
index 656be09b3d5b..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
-DESCRIPTION=GNAT Component Collection
-EAPI=7
-HOMEPAGE=http://libre.adacore.com
-INHERIT=ada multiprocessing python-single-r1
-IUSE=gmp iconv lzma openmp python readline +shared static-libs static-pic syslog ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] )
-REQUIRED_USE=|| ( shared static-libs static-pic ) || ( gmp iconv lzma openmp python readline syslog ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-SLOT=0/22.0.0
-SRC_URI=https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz -> gnatcoll-bindings-22.0.0.tar.gz
-_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8ec1288a4275a157218827cc85f9189c
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-23.0.0 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-23.0.0
index 32b3a79104c5..55e59653dde4 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-23.0.0
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-23.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com
 INHERIT=ada multiprocessing python-single-r1
 IUSE=gmp iconv lzma openmp python readline +shared static-libs static-pic syslog ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] )
 REQUIRED_USE=|| ( shared static-libs static-pic ) || ( gmp iconv lzma openmp python readline syslog ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v23.0.0.tar.gz -> gnatcoll-bindings-23.0.0.tar.gz
 _eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8ec1288a4275a157218827cc85f9189c
+_md5_=e0f8d7504e1ea7f2428d9c23312d4bef
diff --git a/metadata/md5-cache/dev-ada/gtkada-2021-r1 b/metadata/md5-cache/dev-ada/gtkada-2021-r1
deleted file mode 100644
index 5c6d7744ac57..000000000000
--- a/metadata/md5-cache/dev-ada/gtkada-2021-r1
+++ /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-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) app-accessibility/at-spi2-core dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),-ada_target_gcc_12(-)]
-DESCRIPTION=A complete Ada graphical toolkit
-EAPI=7
-HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-INHERIT=ada autotools multiprocessing
-IUSE=+shared static-libs ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) app-accessibility/at-spi2-core dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=ada_target_gnat_2021 || ( shared static-libs )
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/8f1daefcb56e3ee7feaad67bac66deb0f7c37a82?filename=gtkada-2021-20210518-1A011-src.tar.gz -> gtkada-2021-20210518-1A011-src.tar.gz
-_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1df3437f30e67197a0bb4afa48cb728e
diff --git a/metadata/md5-cache/dev-ada/gtkada-22.0.0-r1 b/metadata/md5-cache/dev-ada/gtkada-22.0.0-r1
deleted file mode 100644
index 0634d4ff6695..000000000000
--- a/metadata/md5-cache/dev-ada/gtkada-22.0.0-r1
+++ /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-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) app-accessibility/at-spi2-core dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
-DESCRIPTION=A complete Ada graphical toolkit
-EAPI=7
-HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-INHERIT=ada autotools multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) app-accessibility/at-spi2-core dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-SLOT=0/22.0.0
-SRC_URI=https://github.com/AdaCore/gtkada/archive/refs/tags/v22.0.0.tar.gz -> gtkada-22.0.0.tar.gz
-_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5147424671f04fa3d4093f554ce60c48
diff --git a/metadata/md5-cache/dev-ada/gtkada-23.0.0-r1 b/metadata/md5-cache/dev-ada/gtkada-23.0.0-r1
index 84a9286d8cc2..50ad3d73df33 100644
--- a/metadata/md5-cache/dev-ada/gtkada-23.0.0-r1
+++ b/metadata/md5-cache/dev-ada/gtkada-23.0.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
 INHERIT=ada autotools multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) app-accessibility/at-spi2-core dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/gtkada/archive/refs/tags/v23.0.0.tar.gz -> gtkada-23.0.0.tar.gz
 _eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=82dacd19788cccc1eb698c39f7f0edc7
+_md5_=d662bc16756fa22fd0a68c20797cefe3
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index d3aacd048187..67ad288ddf20 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.11-r1 b/metadata/md5-cache/dev-db/mariadb-10.6.11-r1
new file mode 100644
index 000000000000..7bcc79ecbe46
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.11-r1
@@ -0,0 +1,18 @@
+BDEPEND=app-alternatives/yacc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=8
+HOMEPAGE=https://mariadb.org/
+INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
+IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.6/18
+SRC_URI=mirror://mariadb/mariadb-10.6.11/source/mariadb-10.6.11.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4d402a88fd8ed29fcb0888e9a3ab814a
diff --git a/metadata/md5-cache/dev-db/postgresql-11.17 b/metadata/md5-cache/dev-db/postgresql-11.17
index 39a04792bcbb..bbcb021ac12d 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.17
+++ b/metadata/md5-cache/dev-db/postgresql-11.17
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.17/postgresql-11.17.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=4fa584ec8ec821fe67856d0e64397055
diff --git a/metadata/md5-cache/dev-db/postgresql-11.18 b/metadata/md5-cache/dev-db/postgresql-11.18
index 95c82550f23c..b836c1f5ef14 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.18
+++ b/metadata/md5-cache/dev-db/postgresql-11.18
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.18/postgresql-11.18.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=c84ee635445470b19cba7dda61565c9e
diff --git a/metadata/md5-cache/dev-db/postgresql-12.12 b/metadata/md5-cache/dev-db/postgresql-12.12
index 1190f52313c3..d15cec25face 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.12
+++ b/metadata/md5-cache/dev-db/postgresql-12.12
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.12/postgresql-12.12.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=249d362d521f3510fee1c6aa3c9363e3
diff --git a/metadata/md5-cache/dev-db/postgresql-12.13 b/metadata/md5-cache/dev-db/postgresql-12.13
index e416eca35f57..1a7b0ca7bc34 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.13
+++ b/metadata/md5-cache/dev-db/postgresql-12.13
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.13/postgresql-12.13.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=ec1ff8de47b0d375c1fefd942c19da01
diff --git a/metadata/md5-cache/dev-db/postgresql-13.8 b/metadata/md5-cache/dev-db/postgresql-13.8
index 9ab4be30c02c..224fce607c21 100644
--- a/metadata/md5-cache/dev-db/postgresql-13.8
+++ b/metadata/md5-cache/dev-db/postgresql-13.8
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13.8/postgresql-13.8.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=d95b5042768886d9a46e7a8222076b68
diff --git a/metadata/md5-cache/dev-db/postgresql-13.9 b/metadata/md5-cache/dev-db/postgresql-13.9
index 0325d23509f0..8aab2f797360 100644
--- a/metadata/md5-cache/dev-db/postgresql-13.9
+++ b/metadata/md5-cache/dev-db/postgresql-13.9
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13.9/postgresql-13.9.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=9558308d3a18a173e46c5929df1a648b
diff --git a/metadata/md5-cache/dev-db/postgresql-14.5 b/metadata/md5-cache/dev-db/postgresql-14.5
index 0c70a3141a95..cf815e4affa2 100644
--- a/metadata/md5-cache/dev-db/postgresql-14.5
+++ b/metadata/md5-cache/dev-db/postgresql-14.5
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( 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.5/postgresql-14.5.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=df04264934d01e205083975e4dbd1c49
diff --git a/metadata/md5-cache/dev-db/postgresql-14.6 b/metadata/md5-cache/dev-db/postgresql-14.6
index 60aa81fc4877..843af566651b 100644
--- a/metadata/md5-cache/dev-db/postgresql-14.6
+++ b/metadata/md5-cache/dev-db/postgresql-14.6
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( 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.6/postgresql-14.6.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=aff10d60553dac7156b3017d5309c390
diff --git a/metadata/md5-cache/dev-db/postgresql-15.0 b/metadata/md5-cache/dev-db/postgresql-15.0
index 3ae45f2378ea..96e5a44039e4 100644
--- a/metadata/md5-cache/dev-db/postgresql-15.0
+++ b/metadata/md5-cache/dev-db/postgresql-15.0
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=15
 SRC_URI=https://ftp.postgresql.org/pub/source/v15.0/postgresql-15.0.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=811812505bde56df3164c80425fa5ebb
diff --git a/metadata/md5-cache/dev-db/postgresql-15.1 b/metadata/md5-cache/dev-db/postgresql-15.1
index dea19e0a345a..340ec59cb507 100644
--- a/metadata/md5-cache/dev-db/postgresql-15.1
+++ b/metadata/md5-cache/dev-db/postgresql-15.1
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=15
 SRC_URI=https://ftp.postgresql.org/pub/source/v15.1/postgresql-15.1.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=0708369ecc49a1d24a2b185781839b1c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 94f31199bf72..e397ab076de7 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/crystal-1.5.0 b/metadata/md5-cache/dev-lang/crystal-1.5.0
index c673cc810720..323ebd9e36d5 100644
--- a/metadata/md5-cache/dev-lang/crystal-1.5.0
+++ b/metadata/md5-cache/dev-lang/crystal-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boehm-gc[static-libs,threads] dev-libs/gmp:= dev-libs/libatomic
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/1.5.0.tar.gz -> crystal-1.5.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.5.0/crystal-1.5.0-1-linux-x86_64.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=3a7680df6d712b411545a41f5aa60e93
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.2-r3 b/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
index 129de3f79e01..62474ac461f8 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary ) ?? ( llvm unregist
 RESTRICT=!test? ( test )
 SLOT=0/9.0.2
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( arm64? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-aarch64-unknown-linux-gnu.tar.gz ) amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 ) ppc64? ( big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz ) !big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz ) ) riscv? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=246675db7554f556eed85dd7dc158ea5
diff --git a/metadata/md5-cache/dev-lang/ispc-1.18.0 b/metadata/md5-cache/dev-lang/ispc-1.18.0
index 8d25b969b671..856532e9c270 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.18.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.18.0
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-15:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.18.0.tar.gz -> ispc-1.18.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=06e2185f7e89031d2c2103b9cb3eba15
diff --git a/metadata/md5-cache/dev-lang/rust-1.65.0 b/metadata/md5-cache/dev-lang/rust-1.65.0
index d5a8e77ab2e7..e277be5f997c 100644
--- a/metadata/md5-cache/dev-lang/rust-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-1.65.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.65
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=e7ed01cc61933708f40e46631756927e
diff --git a/metadata/md5-cache/dev-lang/rust-1.66.1 b/metadata/md5-cache/dev-lang/rust-1.66.1
index ec7ff13d9ec7..e5e152547577 100644
--- a/metadata/md5-cache/dev-lang/rust-1.66.1
+++ b/metadata/md5-cache/dev-lang/rust-1.66.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.66
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=d8f19a094127d07b58068922eea626ad
diff --git a/metadata/md5-cache/dev-lang/rust-1.67.0 b/metadata/md5-cache/dev-lang/rust-1.67.0
index c67e28058992..db86bb96e128 100644
--- a/metadata/md5-cache/dev-lang/rust-1.67.0
+++ b/metadata/md5-cache/dev-lang/rust-1.67.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.67
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=96874e4fec1b22a07a6407fb83feb905
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.6.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.6.0
index e6b618bf9754..fca9c837d9d9 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-102.6.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.6.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=102
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.6.0esr/source/firefox-102.6.0esr.source.tar.xz -> firefox-102.6.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=d510c8c13c50a664165c62e5a3102a95
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.7.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.7.0
index f37d6b99b075..74400adfa05a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-102.7.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.7.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=102
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/source/firefox-102.7.0esr.source.tar.xz -> firefox-102.7.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=b4c75ace8ae54bce7a36f0e465caf512
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.15.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
index e2fb26fcff79..6d79dcd2e6a3 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/source/firefox-78.15.0esr.source.tar.xz -> firefox-78.15.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bc13e054c40afad1f969a6c555fcdf37
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-91.13.0-r1 b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0-r1
index e90e7ab1ae88..99c45d2bd2be 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-91.13.0-r1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/icu-69.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=91
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.13.0esr/source/firefox-91.13.0esr.source.tar.xz -> firefox-91.13.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-91-patches-05j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-91-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-91-patches-05j.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=a39bd2047e8b1427cee98b51c71a0a23
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.0-r1 b/metadata/md5-cache/dev-lang/zig-0.10.0-r1
index 4bf3cdcd4b4c..eef7dff886e1 100644
--- a/metadata/md5-cache/dev-lang/zig-0.10.0-r1
+++ b/metadata/md5-cache/dev-lang/zig-0.10.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
 SLOT=0
 SRC_URI=https://ziglang.org/download/0.10.0/zig-0.10.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=efe6b2b123c59b7b7c50e72a080a48fc
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.1 b/metadata/md5-cache/dev-lang/zig-0.10.1
index db66b5199a46..d09976f0d985 100644
--- a/metadata/md5-cache/dev-lang/zig-0.10.1
+++ b/metadata/md5-cache/dev-lang/zig-0.10.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
 SLOT=0
 SRC_URI=https://ziglang.org/download/0.10.1/zig-0.10.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5b8a82927c25f48c3c66dd559ebf473b
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index d8ce9689d62c..99064648c3be 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
 SLOT=0
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=21a1facb641735d037514ee913128ea0
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 94a4952ee353..4c5b58002f8f 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-2.0.6-r1 b/metadata/md5-cache/dev-libs/flatbuffers-2.0.6-r1
deleted file mode 100644
index 1048b67aa511..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-2.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Memory efficient serialization library
-EAPI=8
-HOMEPAGE=https://google.github.io/flatbuffers/
-INHERIT=cmake
-IUSE=static-libs test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test !test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/google/flatbuffers/archive/v2.0.6.tar.gz -> flatbuffers-2.0.6.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0b2f6d2bad94398e4ffd38ced19357fb
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-22.12.06 b/metadata/md5-cache/dev-libs/flatbuffers-22.12.06
deleted file mode 100644
index f009f7e604ed..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-22.12.06
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Memory efficient serialization library
-EAPI=8
-HOMEPAGE=https://google.github.io/flatbuffers/ https://github.com/google/flatbuffers/
-INHERIT=cmake
-IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/google/flatbuffers/archive/v22.12.06.tar.gz -> flatbuffers-22.12.06.gh.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23229d8268ba39d196541019480103b2
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-23.1.4 b/metadata/md5-cache/dev-libs/flatbuffers-23.1.4
deleted file mode 100644
index e580fad3b700..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-23.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Memory efficient serialization library
-EAPI=8
-HOMEPAGE=https://google.github.io/flatbuffers/ https://github.com/google/flatbuffers/
-INHERIT=cmake
-IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=https://github.com/google/flatbuffers/archive/v23.1.4.tar.gz -> flatbuffers-23.1.4.gh.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=66eae6413c082c84e8da1838a723c916
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.11.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.11.0
index 678262c12f5f..7d803458ba6b 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.11.0
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.11.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:14 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.11.0.tar.gz -> intel-vc-intrinsics-0.11.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=176d289e7e973b442d1e353d5a88769a
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1-r1 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1-r1
index 550a41b8cb6e..75351d72c15d 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1-r1
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:14 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.7.1.tar.gz -> intel-vc-intrinsics-0.7.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=176d289e7e973b442d1e353d5a88769a
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.8.1 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.8.1
index 13410eeb4efa..9015519eb1ef 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.8.1
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.8.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:14 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.8.1.tar.gz -> intel-vc-intrinsics-0.8.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=176d289e7e973b442d1e353d5a88769a
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
index 1b04b3d0401b..cdf5ea68f93d 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llv
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3378e1fd8afc04516d097384bfeb24b0
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 3de4d3d8da19..0333a82d5df1 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_target
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ac8c311d575186178a27bd7d83ad0853
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index fb29e005b79b..b24d0898a126 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index d2c26b794158..e605309e5427 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
index 397114ad4e16..52305db5a01a 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107 b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107
index 6d4e041cba25..7edcde1813a1 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230127 b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230127
index 57a3dffaac1c..2d4fe559842f 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230127
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230127
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc1 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc1
index b7ac17953070..7887cef05057 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc1
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc1
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
index 11ab90f340f2..a1afe5dace06 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libretls-3.5.2-r1 b/metadata/md5-cache/dev-libs/libretls-3.5.2-r1
deleted file mode 100644
index 90be70f717e8..000000000000
--- a/metadata/md5-cache/dev-libs/libretls-3.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
-EAPI=8
-HOMEPAGE=https://git.causal.agency/libretls/about/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=ISC
-RDEPEND=dev-libs/openssl:=
-SLOT=0/22
-SRC_URI=https://causal.agency/libretls/libretls-3.5.2.tar.gz
-_md5_=6e961f6b8f65424c02170df007a29fd4
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-14.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-14.0.0
index 85bf0f2be9c9..106f443c8da7 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-14.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-14.0.0
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:14= sys-devel/clang:14=[static-analyzer] sys-devel/llvm:14=
 SLOT=14
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v14.0.0.tar.gz -> opencl-clang-14.0.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1f462019c269d57e6140f89a1ff041ef
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
index 2fd7c082ee99..db5a9336837d 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15=
 SLOT=15
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v15.0.0.tar.gz -> opencl-clang-15.0.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2b7bef2e786ed18fc67712a5c7b9f9c5
diff --git a/metadata/md5-cache/dev-libs/pocl-3.0 b/metadata/md5-cache/dev-libs/pocl-3.0
index 795187cbc995..d263eee9e9ae 100644
--- a/metadata/md5-cache/dev-libs/pocl-3.0
+++ b/metadata/md5-cache/dev-libs/pocl-3.0
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libltdl <sys-devel/llvm-15:* virtual/opencl !cuda? ( <sys-devel
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/pocl/pocl/archive/v3.0.tar.gz -> pocl-3.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=aedaca2d9b10d545dfc2e1cba3cd9836
diff --git a/metadata/md5-cache/dev-libs/pocl-3.1 b/metadata/md5-cache/dev-libs/pocl-3.1
index 52b695a4bf03..e3ebe65af60d 100644
--- a/metadata/md5-cache/dev-libs/pocl-3.1
+++ b/metadata/md5-cache/dev-libs/pocl-3.1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libltdl <sys-devel/llvm-16:* virtual/opencl !cuda? ( <sys-devel
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/pocl/pocl/archive/v3.1.tar.gz -> pocl-3.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=56c8cae8fa53d4f0321d959c8ead77f1
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3 b/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
index c099fb439fc6..ccfb41f9eb67 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-5.1.3 sys-devel/clang:15= sys-devel/clang-runtime:= sys-devel/lld:15=
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.1.3.tar.gz -> rocm-comgr-5.1.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e1bf54859fed172751c563d8c0b0d3f4
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r1 b/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r1
index 19d8a732ff5e..772f1db53817 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-5.3.3 sys-devel/clang:15= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.3.3.tar.gz -> rocm-comgr-5.3.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5b0aa778e02fb18dee21bd056fc02993
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1
index 44925d2e0bf0..ff9bf78b5d8a 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.1.3.tar.gz -> rocm-device-libs-5.1.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2e9adc58ebc3605bf5d6bf76058e4db8
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3
index de8dbf4a86e8..00413066b3bd 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15
 RESTRICT=!test? ( test )
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.3.3.tar.gz -> rocm-device-libs-5.3.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2e9adc58ebc3605bf5d6bf76058e4db8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
index 782bb79d15fb..3116bb71861c 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.1.3.tar.gz -> rocr-runtime-5.1.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7a2f1162f552887abd6e71c26eb4b2e3
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3 b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3
index 667db3e5c1b2..862cabed58ac 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.3.3.tar.gz -> rocr-runtime-5.3.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e489f87a87e65e1a915683ce9b2bd662
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 80ae04f51d45..b1fb01f1d2bd 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-14.0.0.20220729-r1 b/metadata/md5-cache/dev-lisp/c2ffi-14.0.0.20220729-r1
index cf14306d2a82..7eb550e5c7f5 100644
--- a/metadata/md5-cache/dev-lisp/c2ffi-14.0.0.20220729-r1
+++ b/metadata/md5-cache/dev-lisp/c2ffi-14.0.0.20220729-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-devel/clang:14 sys-devel/llvm:14
 SLOT=0
 SRC_URI=https://github.com/rpav/c2ffi/archive/25fcec13381f495460f4a4eafdd1b939c799df4a.tar.gz -> c2ffi-14.0.0.20220729.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ab0464029b3091ccda56d1294c64182a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 127c8cad6a1d..28e97ebbe86f 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 7159435f8e9e..cfd28081072e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index 406ba53ac01a..1b2b35cef285 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
index db52cf8cbf22..7affc0cc7ead 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107
index d1fbe01d747b..0199fd70d33b 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_pre20230107
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230127 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230127
index 425edfb9d8d0..dbb0c65ec940 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230127
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_pre20230127
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc1
index 500fc8ea0a65..c2c6e2a00ac4 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_rc1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
index d06e95000d5e..0b43989b23df 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5c36ec8141b4..9e1ff8b71efb 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/bitarray-2.6.1 b/metadata/md5-cache/dev-python/bitarray-2.6.1
deleted file mode 100644
index fefd6ef169ef..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.6.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=98d7de83844bb13d455c3ac8a5ce5195
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.50 b/metadata/md5-cache/dev-python/boto3-1.26.50
deleted file mode 100644
index 5dfb7823021f..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.50.tar.gz -> boto3-1.26.50.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.54 b/metadata/md5-cache/dev-python/boto3-1.26.54
index e4c3a0612767..c6df8be51a5b 100644
--- a/metadata/md5-cache/dev-python/boto3-1.26.54
+++ b/metadata/md5-cache/dev-python/boto3-1.26.54
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.29.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.26.54.tar.gz -> boto3-1.26.54.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
+_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.57 b/metadata/md5-cache/dev-python/boto3-1.26.57
deleted file mode 100644
index 6dfae8a10409..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.57
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.57[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.57[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.57.tar.gz -> boto3-1.26.57.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.58 b/metadata/md5-cache/dev-python/boto3-1.26.58
deleted file mode 100644
index af7165e28c3c..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.58
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.58.tar.gz -> boto3-1.26.58.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.60 b/metadata/md5-cache/dev-python/boto3-1.26.60
deleted file mode 100644
index 379f9b3fb70a..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.60
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.60[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.60[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.60.tar.gz -> boto3-1.26.60.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.61 b/metadata/md5-cache/dev-python/boto3-1.26.61
deleted file mode 100644
index b4deca93ad58..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.61
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.61[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.61[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.61.tar.gz -> boto3-1.26.61.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.62 b/metadata/md5-cache/dev-python/boto3-1.26.62
deleted file mode 100644
index 8e795ac9cce0..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.62
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.62[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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.29.62[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.62.tar.gz -> boto3-1.26.62.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.50 b/metadata/md5-cache/dev-python/botocore-1.29.50
deleted file mode 100644
index 1fe13cef126b..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.50.tar.gz -> botocore-1.29.50.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.54 b/metadata/md5-cache/dev-python/botocore-1.29.54
index 336b70060fd1..d14cf5cc61c5 100644
--- a/metadata/md5-cache/dev-python/botocore-1.29.54
+++ b/metadata/md5-cache/dev-python/botocore-1.29.54
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/botocore/archive/1.29.54.tar.gz -> botocore-1.29.54.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
+_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.57 b/metadata/md5-cache/dev-python/botocore-1.29.57
deleted file mode 100644
index 4d4a2bb577c3..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.57
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.57.tar.gz -> botocore-1.29.57.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.58 b/metadata/md5-cache/dev-python/botocore-1.29.58
deleted file mode 100644
index 04b693170bb6..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.58
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.58.tar.gz -> botocore-1.29.58.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.60 b/metadata/md5-cache/dev-python/botocore-1.29.60
deleted file mode 100644
index 002988c5eb52..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.60
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.60.tar.gz -> botocore-1.29.60.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.61 b/metadata/md5-cache/dev-python/botocore-1.29.61
deleted file mode 100644
index 0ce0c2f5e9c5..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.61
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.61.tar.gz -> botocore-1.29.61.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.62 b/metadata/md5-cache/dev-python/botocore-1.29.62
deleted file mode 100644
index d19253da9f38..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.62
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.62.tar.gz -> botocore-1.29.62.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/flatbuffers-22.12.06 b/metadata/md5-cache/dev-python/flatbuffers-22.12.06
deleted file mode 100644
index 1c76b37da30f..000000000000
--- a/metadata/md5-cache/dev-python/flatbuffers-22.12.06
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=RFC 7049 - Concise Binary Object Representation
-EAPI=8
-HOMEPAGE=https://github.com/google/flatbuffers/ https://pypi.org/project/flatbuffers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/flatbuffers/archive/v22.12.06.tar.gz -> flatbuffers-22.12.06.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ceb8f7c94860c7a0ca85234a4e2a47c5
diff --git a/metadata/md5-cache/dev-python/flatbuffers-23.1.4 b/metadata/md5-cache/dev-python/flatbuffers-23.1.4
deleted file mode 100644
index 22860c2af861..000000000000
--- a/metadata/md5-cache/dev-python/flatbuffers-23.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=RFC 7049 - Concise Binary Object Representation
-EAPI=8
-HOMEPAGE=https://github.com/google/flatbuffers/ https://pypi.org/project/flatbuffers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/flatbuffers/archive/v23.1.4.tar.gz -> flatbuffers-23.1.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=afff51af859cf7cdd622bbbb653ed30a
diff --git a/metadata/md5-cache/dev-python/networkx-2.8.8 b/metadata/md5-cache/dev-python/networkx-2.8.8
index 4536875bb7d9..40c4e16cccda 100644
--- a/metadata/md5-cache/dev-python/networkx-2.8.8
+++ b/metadata/md5-cache/dev-python/networkx-2.8.8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.8.8.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=de2ccc02a638d4c6cf8d248d042c41b3
+_md5_=8f10fd80dd0b7619ba1c8880d1eadc8e
diff --git a/metadata/md5-cache/dev-python/networkx-3.0 b/metadata/md5-cache/dev-python/networkx-3.0
index 49dbe12bcd7c..4a140ac62c5e 100644
--- a/metadata/md5-cache/dev-python/networkx-3.0
+++ b/metadata/md5-cache/dev-python/networkx-3.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-3.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=1fe0f58ccd5cef472725cbf26548c08c
+_md5_=65e182f6ee3bb9d7b208dec6286d1999
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.2 b/metadata/md5-cache/dev-python/pydantic-1.10.2
deleted file mode 100644
index da9a94afcb58..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=native-extensions? ( dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-email-validator-1.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data parsing and validation using Python type hints
-EAPI=8
-HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pydantic/pydantic/archive/v1.10.2.tar.gz -> pydantic-1.10.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f5d8d9dcfe39115e4ef63ac13778994e
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.3 b/metadata/md5-cache/dev-python/pydantic-1.10.3
deleted file mode 100644
index 1d7f5c745f52..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=native-extensions? ( dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-email-validator-1.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data parsing and validation using Python type hints
-EAPI=8
-HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pydantic/pydantic/archive/v1.10.3.tar.gz -> pydantic-1.10.3.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=fdda6a4aeef704089f243bfc0565c6f0
diff --git a/metadata/md5-cache/dev-python/pyopenssl-23.0.0 b/metadata/md5-cache/dev-python/pyopenssl-23.0.0
index a46b240e9be4..469e2e7250f3 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-23.0.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-23.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.pyopenssl.org/ https://github.com/pyca/pyopenssl/ https://pypi.org/project/pyOpenSSL/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc test python_targets_pypy3 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=Apache-2.0
 RDEPEND=<dev-python/cryptography-40[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-38.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-23.0.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=068e7d1ba62999d774337bcbde49d2f1
+_md5_=34ac2233cb359e10d3c3e58f0bc0e627
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.10-r1 b/metadata/md5-cache/dev-python/pypy-7.3.10-r1
deleted file mode 100644
index 0c522b2b6fe6..000000000000
--- a/metadata/md5-cache/dev-python/pypy-7.3.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.10:7.3.10 >=dev-python/pypy-exe-7.3.10:7.3.10[bzip2?,ncurses?] ) 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/pypy-bin-7.3.0:0
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/
-INHERIT=pax-utils python-utils-r1
-IUSE=bzip2 full-stdlib gdbm +jit ncurses sqlite tk
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.10:7.3.10 >=dev-python/pypy-exe-7.3.10:7.3.10[bzip2?,ncurses?] ) 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/pypy-bin-7.3.0:0
-RESTRICT=!full-stdlib? ( test )
-SLOT=0/73
-SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.10-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.10.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d175d762a9908c220f99c6f6fb238574
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.11 b/metadata/md5-cache/dev-python/pypy-7.3.11
index af461e7b862e..488508478725 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.11
+++ b/metadata/md5-cache/dev-python/pypy-7.3.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.11:7.3.11 >=dev-python/pypy-exe-7.3.11:7.3.11[bzip2?,ncurses?] ) 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/pypy-bin-7.3.0:0
+DEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.11:7.3.11 >=dev-python/pypy-exe-7.3.11:7.3.11[bzip2?,ncurses?] ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
 DESCRIPTION=A fast, compliant alternative implementation of the Python language
 EAPI=8
 HOMEPAGE=https://www.pypy.org/
@@ -7,9 +7,9 @@ INHERIT=pax-utils python-utils-r1
 IUSE=bzip2 full-stdlib gdbm +jit ncurses sqlite tk
 KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.11:7.3.11 >=dev-python/pypy-exe-7.3.11:7.3.11[bzip2?,ncurses?] ) 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/pypy-bin-7.3.0:0
+RDEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.11:7.3.11 >=dev-python/pypy-exe-7.3.11:7.3.11[bzip2?,ncurses?] ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
 RESTRICT=!full-stdlib? ( test )
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.11.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=24e796e7162368f8c9360574b6799449
+_md5_=900dce45dce1a3b9e7f9ad24fe5feae4
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.10 b/metadata/md5-cache/dev-python/pypy-exe-7.3.10
deleted file mode 100644
index cca5c11ef86e..000000000000
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
-DEFINED_PHASES=compile configure install prepare pretend setup
-DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= )
-DESCRIPTION=PyPy executable (build from source)
-EAPI=8
-HOMEPAGE=https://www.pypy.org/
-INHERIT=check-reqs pax-utils toolchain-funcs
-IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.10
-SLOT=7.3.10
-SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.10-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.10.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f4cd5260a6d342c7a57b51e28f4a6a69
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.10 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.10
deleted file mode 100644
index 1e6e69b8751b..000000000000
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=PyPy executable (pre-built version)
-EAPI=8
-HOMEPAGE=https://www.pypy.org/
-INHERIT=pax-utils unpacker
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.10
-SLOT=7.3.10
-SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.10-1.gpkg.tar -> pypy-exe-7.3.10-1.x86-musl.gpkg.tar ) )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=0808ce0b147e77dec75b584c2c41fac3
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.2-r1 b/metadata/md5-cache/dev-python/pytest-plus-0.2-r1
deleted file mode 100644
index 7000b7bcd849..000000000000
--- a/metadata/md5-cache/dev-python/pytest-plus-0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyTest Plus Plugin - extends pytest functionality
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-plus
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-plus/pytest-plus-0.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1351c27449636647f0d59d8ee24f9c6f
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r2 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r2
deleted file mode 100644
index b2987e8dd167..000000000000
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pip[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-subtests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Pytest plugin which implements a few useful skip markers
-EAPI=8
-HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-skip-markers/archive/1.3.0.tar.gz -> pytest-skip-markers-1.3.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=4498e3eb727ee6b2887acbe13c6fabfb
diff --git a/metadata/md5-cache/dev-python/python3-xapp-2.2.2 b/metadata/md5-cache/dev-python/python3-xapp-2.2.2
deleted file mode 100644
index 50db5503fa1b..000000000000
--- a/metadata/md5-cache/dev-python/python3-xapp-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/xapp-2.2.0[introspection]
-DESCRIPTION=Python bindings for x11-libs/xapp
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/python3-xapp
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=>=x11-libs/xapp-2.2.0[introspection] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.2.2.tar.gz -> python3-xapp-2.2.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ed23081dfc5ae83601d3f7c05383517f
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.3.2 b/metadata/md5-cache/dev-python/qtconsole-5.3.2
deleted file mode 100644
index 7dcc2878407b..000000000000
--- a/metadata/md5-cache/dev-python/qtconsole-5.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/QtPy[pyqt5,pyside2,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,svg,testlib] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/ipykernel-4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,printsupport,svg] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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/ https://github.com/jupyter/qtconsole/ https://pypi.org/project/qtconsole/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,printsupport,svg] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.3.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b401c3af959fa2824073ede2f94988e0
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.7 b/metadata/md5-cache/dev-python/shiboken2-5.15.7
index cf898fe1b7e4..e4b1bbf8f7fb 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.7
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=49b5184b886ee7105ad03d6ac2195810
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.8 b/metadata/md5-cache/dev-python/shiboken2-5.15.8
index eb1a7df4bf92..61e03edca243 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.8
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=57c5e5f23cfae2867a54c725610f841b
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.4.2 b/metadata/md5-cache/dev-python/shiboken6-6.4.2
index b91bea6a909d..aaea303b0384 100644
--- a/metadata/md5-cache/dev-python/shiboken6-6.4.2
+++ b/metadata/md5-cache/dev-python/shiboken6-6.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.4.2-src/pyside-setup-opensource-src-6.4.2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=69b37832f7d9454a33b21c83e04c7d7d
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.7.4 b/metadata/md5-cache/dev-python/translate-toolkit-3.7.4
deleted file mode 100644
index a500ab5c209d..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/setuptools-65.5.1[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 test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/3.7.4.tar.gz -> translate-3.7.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=822151f596779d817da657c7ad48b5ee
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.0 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.0
deleted file mode 100644
index 8ce658d06d85..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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 test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/3.8.0.tar.gz -> translate-3.8.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=41251925de77727bd484a653e8511b84
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.1 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.1
deleted file mode 100644
index fe82e0cd298d..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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 test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/3.8.1.tar.gz -> translate-3.8.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=41251925de77727bd484a653e8511b84
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.2
deleted file mode 100644
index 2a21b47fdc18..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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 test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/3.8.2.tar.gz -> translate-3.8.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=41251925de77727bd484a653e8511b84
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 30b5ea9f8a73..51e3ff80fffa 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-creator-8.0.2 b/metadata/md5-cache/dev-qt/qt-creator-8.0.2
index 2a63664d9cf5..0c56989dd5af 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-8.0.2
+++ b/metadata/md5-cache/dev-qt/qt-creator-8.0.2
@@ -14,5 +14,5 @@ REQUIRED_USE=android? ( lsp ) boot2qt? ( remotelinux ) clang? ( lsp ) coco? ( ls
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/8.0/8.0.2/qt-creator-opensource-src-8.0.2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7da852cbaa88d5a3a1602aa6f6424128
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4011e43852e0..2fc437e944fb 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/Tensile-5.1.3-r1 b/metadata/md5-cache/dev-util/Tensile-5.1.3-r1
index 5e9533c289f1..497cfdb2cc79 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.1.3-r1
+++ b/metadata/md5-cache/dev-util/Tensile-5.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.1.3.tar.gz -> rocm-Tensile-5.1.3.tar.gz https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/Tensile-5.0.2-PR1419.patch.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=a092191c19d1ab2821eb88317a23fae4
diff --git a/metadata/md5-cache/dev-util/Tensile-5.4.2 b/metadata/md5-cache/dev-util/Tensile-5.4.2
index 2038b581114a..dd1739d8dd9e 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.4.2
+++ b/metadata/md5-cache/dev-util/Tensile-5.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0/5.4
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.4.2.tar.gz -> rocm-Tensile-5.4.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=816a62e4640fa94301e180eab6aca0d1
diff --git a/metadata/md5-cache/dev-util/bcc-0.25.0 b/metadata/md5-cache/dev-util/bcc-0.25.0
index f0e6ceb806d9..1f79b3dabbdd 100644
--- a/metadata/md5-cache/dev-util/bcc-0.25.0
+++ b/metadata/md5-cache/dev-util/bcc-0.25.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.25.0.tar.gz -> bcc-0.25.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2e089951d44185872062e8592ff54afd
diff --git a/metadata/md5-cache/dev-util/bcc-0.26.0-r1 b/metadata/md5-cache/dev-util/bcc-0.26.0-r1
index 9dff7cd91020..4fd57de1d818 100644
--- a/metadata/md5-cache/dev-util/bcc-0.26.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.26.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.26.0.tar.gz -> bcc-0.26.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=534c5de92fa0ab8e0129b88f2e51fed6
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.16.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r1
index 70f5bf207605..70730951375a 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.16.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libbpf-1.0:= >=dev-util/bcc-0.25.0:= <sys-devel/clang-17:= <s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=69d648dcff10a19de746f10fa94426f1
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2 b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2
index ff6af9edc412..2c8d2c8787a8 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libbpf-1.0:= >=dev-util/bcc-0.25.0:= <sys-devel/clang-17:= <s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=51b4f4b8c7bb1a0bdca3c5df2dc37009
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.17.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.17.0-r1
index fffe173d86c1..7a67d4019bfe 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.17.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.17.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libbpf-1.1:= >=dev-util/bcc-0.25.0:= >=sys-devel/llvm-10:=[ll
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.17.0.tar.gz -> bpftrace-0.17.0.gh.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fa4670422a9be7c34db4880d2ace9717
diff --git a/metadata/md5-cache/dev-util/ccls-0.20220729-r1 b/metadata/md5-cache/dev-util/ccls-0.20220729-r1
index 0392f725d5bf..7ba2b929c3a4 100644
--- a/metadata/md5-cache/dev-util/ccls-0.20220729-r1
+++ b/metadata/md5-cache/dev-util/ccls-0.20220729-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/rapidjson <sys-devel/clang-16:=
 SLOT=0
 SRC_URI=https://github.com/MaskRay/ccls/archive/0.20220729.tar.gz -> ccls-0.20220729.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=027abae7adcc81369af58e8891347b53
diff --git a/metadata/md5-cache/dev-util/ccls-9999 b/metadata/md5-cache/dev-util/ccls-9999
index ddcc3d47f9f4..dcef34fed173 100644
--- a/metadata/md5-cache/dev-util/ccls-9999
+++ b/metadata/md5-cache/dev-util/ccls-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/rapidjson <sys-devel/clang-16:=
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8c0113055da894a0d3d7be6f859b6534
diff --git a/metadata/md5-cache/dev-util/clazy-1.11-r1 b/metadata/md5-cache/dev-util/clazy-1.11-r1
index e5d5fe39ea82..6e3b930b5424 100644
--- a/metadata/md5-cache/dev-util/clazy-1.11-r1
+++ b/metadata/md5-cache/dev-util/clazy-1.11-r1
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-15:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/clazy/1.11/src/clazy-1.11.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f2adcbc89f39dc3ad2f5a43f243c6e41
diff --git a/metadata/md5-cache/dev-util/clazy-1.11-r2 b/metadata/md5-cache/dev-util/clazy-1.11-r2
index a629afe5ad15..f5a3757aa40c 100644
--- a/metadata/md5-cache/dev-util/clazy-1.11-r2
+++ b/metadata/md5-cache/dev-util/clazy-1.11-r2
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-16:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/clazy/1.11/src/clazy-1.11.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b3fc872d8995b8f39a862aa193862c40
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.1 b/metadata/md5-cache/dev-util/cmake-3.25.1
deleted file mode 100644
index 0934a99df04b..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.25.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.1.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.1-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3cbefc3486064e5b6b988ebd99be4fac
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.2 b/metadata/md5-cache/dev-util/cmake-3.25.2
index bbbda79fc015..02549d802028 100644
--- a/metadata/md5-cache/dev-util/cmake-3.25.2
+++ b/metadata/md5-cache/dev-util/cmake-3.25.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
 IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.2.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.2-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f8986873b8c351bc5db0f2420229bf36
+_md5_=250730f7bb1002bdc3d166a19d774283
diff --git a/metadata/md5-cache/dev-util/cmake-3.23.3 b/metadata/md5-cache/dev-util/cmake-3.26.0_rc1
index f8d79910056a..99bed92926bf 100644
--- a/metadata/md5-cache/dev-util/cmake-3.23.3
+++ b/metadata/md5-cache/dev-util/cmake-3.26.0_rc1
@@ -1,16 +1,15 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=Cross platform Make
 EAPI=8
 HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
+IUSE=doc emacs ncurses qt5 test test
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.23/cmake-3.23.3.tar.gz verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.23.3/cmake-3.23.3-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.23.3/cmake-3.23.3-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9db434c851caf4b60b4ec4d7dfa6a35c
+SRC_URI=https://cmake.org/files/v3.26/cmake-3.26.0-rc1.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.26.0_rc1-docs.tar.xz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=94bc1f059df662317c9a05600e3ec4ec
diff --git a/metadata/md5-cache/dev-util/cmake-9999 b/metadata/md5-cache/dev-util/cmake-9999
index 6d491b734aae..1c31105fbeae 100644
--- a/metadata/md5-cache/dev-util/cmake-9999
+++ b/metadata/md5-cache/dev-util/cmake-9999
@@ -12,4 +12,4 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3cbefc3486064e5b6b988ebd99be4fac
+_md5_=94bc1f059df662317c9a05600e3ec4ec
diff --git a/metadata/md5-cache/dev-util/cvise-2.6.0 b/metadata/md5-cache/dev-util/cvise-2.6.0
index 16792b3d35c9..0b1ba64e9292 100644
--- a/metadata/md5-cache/dev-util/cvise-2.6.0
+++ b/metadata/md5-cache/dev-util/cvise-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v2.6.0.tar.gz -> cvise-2.6.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=60afe8aea8bd98243e069b3505c817c6
diff --git a/metadata/md5-cache/dev-util/cvise-2.7.0 b/metadata/md5-cache/dev-util/cvise-2.7.0
index cc7bdff4e036..bc37b3087e5f 100644
--- a/metadata/md5-cache/dev-util/cvise-2.7.0
+++ b/metadata/md5-cache/dev-util/cvise-2.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v2.7.0.tar.gz -> cvise-2.7.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3214a7a6d657334f46d9d6fc31b95629
diff --git a/metadata/md5-cache/dev-util/edi-0.8.0-r2 b/metadata/md5-cache/dev-util/edi-0.8.0-r2
index e796999e8bf5..b604884834ed 100644
--- a/metadata/md5-cache/dev-util/edi-0.8.0-r2
+++ b/metadata/md5-cache/dev-util/edi-0.8.0-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) >=dev-libs/efl-1.22.0[eet] clang? ( dev-util/bear sys-devel/clang:= )
 SLOT=0
 SRC_URI=https://github.com/Enlightenment/edi/archive/v0.8.0.tar.gz -> edi-0.8.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ddd3a97b6655584c83a5e39742243b5e
diff --git a/metadata/md5-cache/dev-util/gnome-builder-43.4 b/metadata/md5-cache/dev-util/gnome-builder-43.4
index 657322a41a74..7932e1aee3b3 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-43.4
+++ b/metadata/md5-cache/dev-util/gnome-builder-43.4
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6a020aa493ba12d9d31c5c098afd24e4
diff --git a/metadata/md5-cache/dev-util/gnome-builder-43.5 b/metadata/md5-cache/dev-util/gnome-builder-43.5
new file mode 100644
index 000000000000..8b030d712f11
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-43.5
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.5.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ae86a6b31f2fb90136319fbfb2408ec
diff --git a/metadata/md5-cache/dev-util/hip-5.1.3-r4 b/metadata/md5-cache/dev-util/hip-5.1.3-r4
index 4ab4ff651a54..205359245ab0 100644
--- a/metadata/md5-cache/dev-util/hip-5.1.3-r4
+++ b/metadata/md5-cache/dev-util/hip-5.1.3-r4
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.1 virtual/opengl dev-perl/URI-Encode sys-devel/clang-runtime:= >=dev-libs/roct-thunk-interface-5
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.1.3.tar.gz -> rocm-hipamd-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.1.3.tar.gz -> rocm-hip-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.1.3.tar.gz -> rocclr-5.1.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.1.3.tar.gz -> rocm-opencl-runtime-5.1.3.tar.gz profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.1.3.tar.gz -> rocm-tracer-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/hipamd/files/8991181/hip_prof_str_diff.gz -> hip-5.1.3-update-header.patch.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d61c505d1f628203ebb439a47ade2fa3
diff --git a/metadata/md5-cache/dev-util/hip-5.3.3-r2 b/metadata/md5-cache/dev-util/hip-5.3.3-r2
index be08148e044f..78420767591e 100644
--- a/metadata/md5-cache/dev-util/hip-5.3.3-r2
+++ b/metadata/md5-cache/dev-util/hip-5.3.3-r2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.3 virtual/opengl dev-perl/URI-Encode sys-devel/clang-runtime:= >=dev-libs/roct-thunk-interface-5
 SLOT=0/5.3
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.3.3.tar.gz -> rocm-hipamd-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.3.3.tar.gz -> rocm-hip-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.3.3.tar.gz -> rocclr-5.3.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.3.3.tar.gz -> rocm-opencl-runtime-5.3.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=885417776c8390bca1899948561cac53
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-0.19 b/metadata/md5-cache/dev-util/include-what-you-use-0.19
index e8d687453b34..19fdf49e9823 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-0.19
+++ b/metadata/md5-cache/dev-util/include-what-you-use-0.19
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15 sys-devel/llvm:15 python_single_target_python3_9? ( >
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/0.19.tar.gz -> include-what-you-use-0.19.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=80717d8c0e9f5ccf335edbdfa7dd5c74
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12260.1-r1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12260.1-r1
index e98f24573069..027b33720952 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12260.1-r1
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12260.1-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:14= dev-util/spirv-tools sys-devel/lld:14= sys-devel/llvm:14=
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.12260.1.tar.gz -> intel-graphics-compiler-1.0.12260.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=999137fe90d9857303776831170d6e86
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12504.5-r2 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12504.5-r2
index 5904f66e2fcb..44f8d59e1f2b 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12504.5-r2
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12504.5-r2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:14= dev-util/spirv-tools sys-devel/lld:14= sys-devel/llvm:14= vc? ( <dev-libs/intel-vc-intrinsics-0.11.0 dev-util/spirv-llvm-translator:14= )
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.12504.5.tar.gz -> intel-graphics-compiler-1.0.12504.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e551d200cf993783f45d1f1e6768c63b
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12812.26-r1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12812.26-r1
index 7dd65a8ab41a..c1e7cde1ec46 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12812.26-r1
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12812.26-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:14= dev-util/spirv-tools sys-devel/lld:14= sys-devel/llvm:14= vc? ( >=dev-libs/intel-vc-intrinsics-0.11.0 dev-util/spirv-llvm-translator:14= )
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.12812.26.tar.gz -> intel-graphics-compiler-1.0.12812.26.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=775c776b2fa076c1e0caeecf3a5a67c0
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 65cde3bf6755..92694d80de7b 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index 1f2fe03c448c..3a4012969750 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index 53267c8f1f43..2e9e1be49a69 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107 b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107
index b108aaa69ced..af7aa84c1a81 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230127 b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230127
index a182bdd5ac73..eeb850f642cb 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230127
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc1 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc1
index 631aa3e2d553..2ff1f860d756 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc1
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index ea28b2a10c9b..cc1c8fdc9df3 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/perf-5.19 b/metadata/md5-cache/dev-util/perf-5.19
index cda80f585042..d4793732f0c0 100644
--- a/metadata/md5-cache/dev-util/perf-5.19
+++ b/metadata/md5-cache/dev-util/perf-5.19
@@ -12,5 +12,5 @@ RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt?
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=ef6d4f99f30c050fcce9863a0dbdc875
diff --git a/metadata/md5-cache/dev-util/perf-6.0 b/metadata/md5-cache/dev-util/perf-6.0
index a89831e16ec4..a238e28e1c97 100644
--- a/metadata/md5-cache/dev-util/perf-6.0
+++ b/metadata/md5-cache/dev-util/perf-6.0
@@ -12,5 +12,5 @@ RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt?
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=6e58fc1e56b81baf32725d37df443d04
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-14.0.0-r1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-14.0.0-r1
index 3669bfc212a1..78b17b2864f9 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-14.0.0-r1
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-14.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v14.0.0.tar.gz -> spirv-llvm-translator-14.0.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f25b815c9f3d45adc4146745cceb3ec5
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
index 04b86dad49c9..c6910e6658d1 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=15
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v15.0.0.tar.gz -> spirv-llvm-translator-15.0.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c39337508b811cc341f49519b9819d1e
diff --git a/metadata/md5-cache/dev-util/valgrind-3.19.0 b/metadata/md5-cache/dev-util/valgrind-3.19.0
deleted file mode 100644
index 3ced8ec7c783..000000000000
--- a/metadata/md5-cache/dev-util/valgrind-3.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi )
-DESCRIPTION=An open-source memory debugger for GNU/Linux
-EAPI=8
-HOMEPAGE=https://valgrind.org
-INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
-IUSE=mpi
-KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.19.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7e70a89ea0d0812673dba835b79ea68c
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0 b/metadata/md5-cache/dev-util/valgrind-3.20.0
deleted file mode 100644
index bf9e0ec0c02d..000000000000
--- a/metadata/md5-cache/dev-util/valgrind-3.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi )
-DESCRIPTION=An open-source memory debugger for GNU/Linux
-EAPI=8
-HOMEPAGE=https://valgrind.org
-INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
-IUSE=mpi
-KEYWORDS=-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1999347461dee8245a214db9f7fdd705
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
index e74e77be18b7..eb160af2c80e 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.66.0
 DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.18/xfce4-dev-tools-4.18.0.tar.bz2
-_md5_=bf0df449c9baa8b8394439927684307f
+_md5_=58f07126fa1ee7d335442727f22a8e58
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index d36a0f0d6fe5..0dff8ebba501 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/prismlauncher-6.0 b/metadata/md5-cache/games-action/prismlauncher-6.3
index b2cc830e8405..ea03e743055a 100644
--- a/metadata/md5-cache/games-action/prismlauncher-6.0
+++ b/metadata/md5-cache/games-action/prismlauncher-6.3
@@ -13,6 +13,6 @@ RDEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt
 REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/6.0/PrismLauncher-6.0.tar.gz -> prismlauncher-6.0.tar.gz
+SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/6.3/PrismLauncher-6.3.tar.gz -> prismlauncher-6.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=29fd4480426d5cd52ee4bf825c713f0a
+_md5_=366487edd7063d9aa3156ce7f0e82797
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 156d17b3225d..ac02b2fa50d0 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/basis_universal-1.16.3 b/metadata/md5-cache/games-util/basis_universal-1.16.3
index 567d55d47398..49e9162daab0 100644
--- a/metadata/md5-cache/games-util/basis_universal-1.16.3
+++ b/metadata/md5-cache/games-util/basis_universal-1.16.3
@@ -11,4 +11,4 @@ LICENSE=Apache-2.0 zstd? ( BSD )
 SLOT=0
 SRC_URI=https://github.com/BinomialLLC/basis_universal/archive/refs/tags/1.16.3.tar.gz -> basis_universal-1.16.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6dd4e0644f376cfb8f8de6697f50c707
+_md5_=83af2484b80245696dde325a28642f71
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 1f1b17dc8d04..8219fcf8878d 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.14.1 b/metadata/md5-cache/gui-libs/libwpe-1.14.1
new file mode 100644
index 000000000000..a347cce7e348
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libwpe-1.14.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
+DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
+EAPI=8
+HOMEPAGE=https://wpewebkit.org/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
+SLOT=1.0
+SRC_URI=https://wpewebkit.org/releases/libwpe-1.14.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=3e8c24e2c30c874b7af09393b20d2d43
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 27d5a41484d6..6b1986e146e7 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.6.1 b/metadata/md5-cache/mail-client/thunderbird-102.6.1
index 670ef60c46db..a6b2f40498a0 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.6.1
+++ b/metadata/md5-cache/mail-client/thunderbird-102.6.1
@@ -13,5 +13,5 @@ RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/source/thunderbird-102.6.1.source.tar.xz -> thunderbird-102.6.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/af.xpi -> thunderbird-102.6.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ar.xpi -> thunderbird-102.6.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ast.xpi -> thunderbird-102.6.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/be.xpi -> thunderbird-102.6.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/bg.xpi -> thunderbird-102.6.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/br.xpi -> thunderbird-102.6.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ca.xpi -> thunderbird-102.6.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/cak.xpi -> thunderbird-102.6.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/cs.xpi -> thunderbird-102.6.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/cy.xpi -> thunderbird-102.6.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/da.xpi -> thunderbird-102.6.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/de.xpi -> thunderbird-102.6.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.6.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/el.xpi -> thunderbird-102.6.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.6.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.6.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.6.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.6.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.6.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/et.xpi -> thunderbird-102.6.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/eu.xpi -> thunderbird-102.6.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/fi.xpi -> thunderbird-102.6.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/fr.xpi -> thunderbird-102.6.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.6.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.6.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/gd.xpi -> thunderbird-102.6.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/gl.xpi -> thunderbird-102.6.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/he.xpi -> thunderbird-102.6.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/hr.xpi -> thunderbird-102.6.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.6.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/hu.xpi -> thunderbird-102.6.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/id.xpi -> thunderbird-102.6.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/is.xpi -> thunderbird-102.6.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/it.xpi -> thunderbird-102.6.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ja.xpi -> thunderbird-102.6.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ka.xpi -> thunderbird-102.6.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/kab.xpi -> thunderbird-102.6.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/kk.xpi -> thunderbird-102.6.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ko.xpi -> thunderbird-102.6.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/lt.xpi -> thunderbird-102.6.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/lv.xpi -> thunderbird-102.6.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ms.xpi -> thunderbird-102.6.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.6.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/nl.xpi -> thunderbird-102.6.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.6.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.6.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/pl.xpi -> thunderbird-102.6.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.6.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.6.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/rm.xpi -> thunderbird-102.6.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ro.xpi -> thunderbird-102.6.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/ru.xpi -> thunderbird-102.6.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/sk.xpi -> thunderbird-102.6.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/sl.xpi -> thunderbird-102.6.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/sq.xpi -> thunderbird-102.6.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/sr.xpi -> thunderbird-102.6.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.6.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/th.xpi -> thunderbird-102.6.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/tr.xpi -> thunderbird-102.6.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/uk.xpi -> thunderbird-102.6.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/uz.xpi -> thunderbird-102.6.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/vi.xpi -> thunderbird-102.6.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.6.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.6.1-zh-TW.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e5b6fcf077be08c701daca5fc4870edb
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.7.1 b/metadata/md5-cache/mail-client/thunderbird-102.7.1
index 0cd0e742353c..8423b0050a8b 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.7.1
+++ b/metadata/md5-cache/mail-client/thunderbird-102.7.1
@@ -13,5 +13,5 @@ RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/source/thunderbird-102.7.1.source.tar.xz -> thunderbird-102.7.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-08j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-08j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-08j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/af.xpi -> thunderbird-102.7.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ar.xpi -> thunderbird-102.7.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ast.xpi -> thunderbird-102.7.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/be.xpi -> thunderbird-102.7.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/bg.xpi -> thunderbird-102.7.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/br.xpi -> thunderbird-102.7.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ca.xpi -> thunderbird-102.7.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/cak.xpi -> thunderbird-102.7.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/cs.xpi -> thunderbird-102.7.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/cy.xpi -> thunderbird-102.7.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/da.xpi -> thunderbird-102.7.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/de.xpi -> thunderbird-102.7.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.7.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/el.xpi -> thunderbird-102.7.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.7.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.7.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.7.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.7.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.7.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/et.xpi -> thunderbird-102.7.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/eu.xpi -> thunderbird-102.7.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/fi.xpi -> thunderbird-102.7.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/fr.xpi -> thunderbird-102.7.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.7.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.7.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/gd.xpi -> thunderbird-102.7.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/gl.xpi -> thunderbird-102.7.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/he.xpi -> thunderbird-102.7.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/hr.xpi -> thunderbird-102.7.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.7.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/hu.xpi -> thunderbird-102.7.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/id.xpi -> thunderbird-102.7.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/is.xpi -> thunderbird-102.7.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/it.xpi -> thunderbird-102.7.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ja.xpi -> thunderbird-102.7.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ka.xpi -> thunderbird-102.7.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/kab.xpi -> thunderbird-102.7.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/kk.xpi -> thunderbird-102.7.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ko.xpi -> thunderbird-102.7.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/lt.xpi -> thunderbird-102.7.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/lv.xpi -> thunderbird-102.7.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ms.xpi -> thunderbird-102.7.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.7.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/nl.xpi -> thunderbird-102.7.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.7.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.7.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/pl.xpi -> thunderbird-102.7.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.7.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.7.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/rm.xpi -> thunderbird-102.7.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ro.xpi -> thunderbird-102.7.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/ru.xpi -> thunderbird-102.7.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/sk.xpi -> thunderbird-102.7.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/sl.xpi -> thunderbird-102.7.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/sq.xpi -> thunderbird-102.7.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/sr.xpi -> thunderbird-102.7.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.7.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/th.xpi -> thunderbird-102.7.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/tr.xpi -> thunderbird-102.7.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/uk.xpi -> thunderbird-102.7.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/uz.xpi -> thunderbird-102.7.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/vi.xpi -> thunderbird-102.7.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.7.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.7.1-zh-TW.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cf4209ea8dfad4b4a0134f96c538af57
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fb1e4c411b3b..afedf2c3a83c 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r3 b/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r3
new file mode 100644
index 000000000000..fe5ada4aa447
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.14_p20210810-r3
@@ -0,0 +1,16 @@
+BDEPEND=perl? ( dev-lang/perl dev-perl/Locale-Maketext-Lexicon dev-perl/Module-Build ) test? ( || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( >=dev-lang/python-3.10.9:3.10 dev-python/fonttools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/fonttools[python_targets_python3_9(-)] ) ) media-libs/fontconfig perl? ( virtual/perl-Test-Simple ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=perl? ( dev-lang/perl:= ) test? ( dev-libs/glib:2 )
+DESCRIPTION=Library providing rendering capabilities for complex non-Roman writing systems
+EAPI=8
+HOMEPAGE=https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home
+INHERIT=perl-module python-any-r1 cmake-multilib
+IUSE=perl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=perl? ( dev-lang/perl:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/silnrsi/graphite/archive/80c52493ef42e6fe605a69dcddd2a691cd8a1380.tar.gz -> graphite2-1.3.14_p20210810.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7671b61c7b0c5549966e785a13327314
diff --git a/metadata/md5-cache/media-gfx/openvdb-10.0.1 b/metadata/md5-cache/media-gfx/openvdb-10.0.1
index 826042c04e5b..e2e37d8435ee 100644
--- a/metadata/md5-cache/media-gfx/openvdb-10.0.1
+++ b/metadata/md5-cache/media-gfx/openvdb-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( abi8-compat abi9-compat abi10-compat ) cpu_flags_x86_avx? ( cp
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v10.0.1.tar.gz -> openvdb-10.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=58abe4e90f05962e2624847961aef10f
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.3 b/metadata/md5-cache/media-gfx/ristretto-0.12.3
deleted file mode 100644
index a946456e5429..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-DESCRIPTION=A fast and lightweight picture viewer for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.3.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a0cf6ee6b4e364c400506fd10154a06
diff --git a/metadata/md5-cache/media-gfx/scour-0.38.2 b/metadata/md5-cache/media-gfx/scour-0.38.2
deleted file mode 100644
index 1d9a717ae019..000000000000
--- a/metadata/md5-cache/media-gfx/scour-0.38.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
-EAPI=7
-HOMEPAGE=https://github.com/scour-project/scour
-INHERIT=distutils-r1
-IUSE=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
-RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/scour-project/scour/archive/v0.38.2.tar.gz -> scour-0.38.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2a85305f028ca154012a7a9c230c6caf
diff --git a/metadata/md5-cache/dev-python/bitarray-2.6.0 b/metadata/md5-cache/media-gfx/scour-0.38.2-r1
index ec8f125d3e82..9c40b315d960 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.6.0
+++ b/metadata/md5-cache/media-gfx/scour-0.38.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
+DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
 EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
+HOMEPAGE=https://github.com/scour-project/scour
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.6.0.tar.gz
+SRC_URI=https://github.com/scour-project/scour/archive/v0.38.2.tar.gz -> scour-0.38.2.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=29c463cbe9a4d6e9347aeb5fb21dcd1e
+_md5_=5b674e0bb6c65ce7d375d1e5b924ddd9
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 789f0ab845a8..7147cf7d1067 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/mesa-22.2.5 b/metadata/md5-cache/media-libs/mesa-22.2.5
index a15984901671..2b5be260ded1 100644
--- a/metadata/md5-cache/media-libs/mesa-22.2.5
+++ b/metadata/md5-cache/media-libs/mesa-22.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.2.5.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=d6ce7e91db9dac275706fa04794ac343
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.2 b/metadata/md5-cache/media-libs/mesa-22.3.2
index b3286e963a17..2d7ff82996fc 100644
--- a/metadata/md5-cache/media-libs/mesa-22.3.2
+++ b/metadata/md5-cache/media-libs/mesa-22.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.3.2.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=6dc4edfa8caa2a8ab6c512e63dbfa530
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.3 b/metadata/md5-cache/media-libs/mesa-22.3.3
index d5bfc2c27409..aaee9a2f8e5e 100644
--- a/metadata/md5-cache/media-libs/mesa-22.3.3
+++ b/metadata/md5-cache/media-libs/mesa-22.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.3.3.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=6dc4edfa8caa2a8ab6c512e63dbfa530
diff --git a/metadata/md5-cache/media-libs/mesa-23.0.0_rc3 b/metadata/md5-cache/media-libs/mesa-23.0.0_rc3
index e6d3ad7e94a9..aa9ecdba4e7a 100644
--- a/metadata/md5-cache/media-libs/mesa-23.0.0_rc3
+++ b/metadata/md5-cache/media-libs/mesa-23.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-23.0.0-rc3.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=f93b284aff5dafb0b79a42994591d99c
diff --git a/metadata/md5-cache/media-libs/mesa-23.0.0_rc4 b/metadata/md5-cache/media-libs/mesa-23.0.0_rc4
index f9c4308827ed..73d569cc335f 100644
--- a/metadata/md5-cache/media-libs/mesa-23.0.0_rc4
+++ b/metadata/md5-cache/media-libs/mesa-23.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-23.0.0-rc4.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=f93b284aff5dafb0b79a42994591d99c
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 6568596e48d7..620321efac0f 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=f93b284aff5dafb0b79a42994591d99c
diff --git a/metadata/md5-cache/media-libs/osl-1.12.7.0 b/metadata/md5-cache/media-libs/osl-1.12.7.0
index 05461948b44e..00a06f6d9738 100644
--- a/metadata/md5-cache/media-libs/osl-1.12.7.0
+++ b/metadata/md5-cache/media-libs/osl-1.12.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/v1.12.7.0.tar.gz -> osl-1.12.7.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f38f53a06ec34bc0262889ec2dcd138d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a8eccb720f4b..4837e8746ae0 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3
new file mode 100644
index 000000000000..e49b469041f2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure postinst
+DEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
+DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
+EAPI=8
+HOMEPAGE=https://www.monitoring-plugins.org/
+INHERIT=flag-o-matic
+IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=02312cb386554195d057ce002efefb3b
diff --git a/metadata/md5-cache/net-analyzer/ntopng-5.4 b/metadata/md5-cache/net-analyzer/ntopng-5.4
new file mode 100644
index 000000000000..655da7fb5ef7
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ntopng-5.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= dev-libs/openssl:= net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-4.6:= <net-libs/nDPI-4.8:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Network traffic analyzer with web interface
+EAPI=8
+HOMEPAGE=https://www.ntop.org/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= dev-libs/openssl:= net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-4.6:= <net-libs/nDPI-4.8:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap sys-libs/zlib acct-user/ntopng acct-group/ntopng dev-db/redis
+SLOT=0
+SRC_URI=https://github.com/ntop/ntopng/archive/5.4.tar.gz -> ntopng-5.4.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=d1ef37e0c355f093e56a368a98ea7860
diff --git a/metadata/md5-cache/net-analyzer/ntopng-5.6 b/metadata/md5-cache/net-analyzer/ntopng-5.6
new file mode 100644
index 000000000000..32c76f50b3b0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ntopng-5.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= dev-libs/openssl:= net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-4.6:= <net-libs/nDPI-4.8:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Network traffic analyzer with web interface
+EAPI=8
+HOMEPAGE=https://www.ntop.org/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= dev-libs/openssl:= net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-4.6:= <net-libs/nDPI-4.8:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap sys-libs/zlib acct-user/ntopng acct-group/ntopng dev-db/redis
+SLOT=0
+SRC_URI=https://github.com/ntop/ntopng/archive/5.6.tar.gz -> ntopng-5.6.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=d1ef37e0c355f093e56a368a98ea7860
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index d997e0055d38..9beb5229ab96 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.16.33 b/metadata/md5-cache/net-dns/bind-9.16.33
index 0bc514f9a5cd..4a6e1d2a85fc 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.33
+++ b/metadata/md5-cache/net-dns/bind-9.16.33
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
 INHERIT=python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
 IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) dev-python/ply[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_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f6658a375ee5668fd1d53dd056e40bfa
+_md5_=c02ddac839011c009cf0be4af4a893a2
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.33 b/metadata/md5-cache/net-dns/bind-tools-9.16.33-r1
index e369f1cdcd0f..94c157bda8eb 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.33
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.33-r1
@@ -1,6 +1,6 @@
 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-r5 >=sys-devel/libtool-2.4.7
 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:= ) )
+DEPEND=>=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
 IUSE=+caps doc gssapi idn libedit readline test xml
 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=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:= ) )
+RDEPEND=>=dev-libs/libuv-1.42.0:= 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.33/bind-9.16.33.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ffa73030b67dd00421223940c75f6016
+_md5_=a1f9ddf92888b8a605d4e232c6c6fdf5
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.36 b/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1
index f0de83a85600..15338a228b95 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.36
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1
@@ -1,6 +1,6 @@
 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-r5 >=sys-devel/libtool-2.4.7
 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:= ) )
+DEPEND=>=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
 IUSE=+caps doc gssapi idn libedit readline test xml
 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=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:= ) )
+RDEPEND=>=dev-libs/libuv-1.42.0:= 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.36/bind-9.16.36.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f237b357aa6ef11e47465fc68d7da9e2
+_md5_=3f68fef34c6d76907371b8090652e0f2
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.37 b/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1
index 4c0ffadb3b9a..ce8fbe565edd 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.37
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1
@@ -1,6 +1,6 @@
 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-r5 >=sys-devel/libtool-2.4.7
 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:= ) )
+DEPEND=>=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
 IUSE=+caps doc gssapi idn libedit readline test xml
 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=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:= ) )
+RDEPEND=>=dev-libs/libuv-1.42.0:= 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.37/bind-9.16.37.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=78f1773a808db9385d516693676f3f10
+_md5_=c6cffc736049f12a59c92a9ee7254664
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 8c5a5722facc..70d8b43a221c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/nDPI-4.6 b/metadata/md5-cache/net-libs/nDPI-4.6
new file mode 100644
index 000000000000..65ec8941d65f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nDPI-4.6
@@ -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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
+DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
+EAPI=8
+HOMEPAGE=https://www.ntop.org/
+INHERIT=autotools edo
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
+SLOT=0/4
+SRC_URI=https://github.com/ntop/nDPI/archive/4.6.tar.gz -> nDPI-4.6.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=0f6e4ff0d8a402165c84276180939256
diff --git a/metadata/md5-cache/net-libs/nDPI-9999 b/metadata/md5-cache/net-libs/nDPI-9999
index 8d1b1810e0a2..3d496890c2b5 100644
--- a/metadata/md5-cache/net-libs/nDPI-9999
+++ b/metadata/md5-cache/net-libs/nDPI-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= dev-libs/libgpg-error net-libs/libpcap
 SLOT=0/9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=3453d5aee8b48f53ff544d15f29fe6b3
+_md5_=0f6e4ff0d8a402165c84276180939256
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4
new file mode 100644
index 000000000000..3caf4cc2e09b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[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 >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=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 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 )
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4be6be7754133baa14945971673e1d16
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r410
new file mode 100644
index 000000000000..dd5c33b1c1aa
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r410
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[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 >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=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-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4.1/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e70857ef669ae84a44963d7a98612731
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r500
new file mode 100644
index 000000000000..c23f9ca1d538
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.4-r500
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[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 >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=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?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 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 ) 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 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=5/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0af9d935c860d6f58f7b6e8207320761
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index daea3a3b7136..5a0210a100e7 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/iputils-20221126 b/metadata/md5-cache/net-misc/iputils-20221126
index b3168e135b7d..a89b3aabe9b1 100644
--- a/metadata/md5-cache/net-misc/iputils-20221126
+++ b/metadata/md5-cache/net-misc/iputils-20221126
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=fcaps meson plocale systemd toolchain-funcs
 IUSE=+arping caps clockdiff doc idn nls test tracepath +filecaps
-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 arping? ( GPL-2+ ) clockdiff? ( BSD ) tracepath? ( GPL-2+ )
 RDEPEND=caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/20221126.tar.gz -> iputils-20221126.tar.gz https://dev.gentoo.org/~sam/distfiles/net-misc/iputils/iputils-20221126-docs.tar.xz
 _eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=939e7c8945b883873737386848268e3a
+_md5_=9637dea6b8c210e541c09e804cbbb9bc
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.4-r1 b/metadata/md5-cache/net-misc/pssh-2.3.4-r1
deleted file mode 100644
index b2d852a323ae..000000000000
--- a/metadata/md5-cache/net-misc/pssh-2.3.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=net-misc/openssh !net-misc/putty
-DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
-EAPI=7
-HOMEPAGE=https://github.com/lilydjwg/pssh
-INHERIT=distutils-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=net-misc/openssh !net-misc/putty python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/lilydjwg/pssh/archive/v2.3.4.tar.gz -> pssh-2.3.4.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e80d25a31d069462facc316ab2b29508
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.4-r2 b/metadata/md5-cache/net-misc/pssh-2.3.4-r2
new file mode 100644
index 000000000000..d6cc1fd835a8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pssh-2.3.4-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!net-misc/putty net-misc/openssh
+DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
+EAPI=8
+HOMEPAGE=https://github.com/lilydjwg/pssh
+INHERIT=distutils-r1
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!net-misc/putty net-misc/openssh python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lilydjwg/pssh/archive/v2.3.4.tar.gz -> pssh-2.3.4.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=51784ee31bc9008edbf2a3ea9b9b4745
diff --git a/metadata/md5-cache/net-misc/zerotier-1.6.4 b/metadata/md5-cache/net-misc/zerotier-1.6.4
index 7135cafcd004..f09f46c89b3b 100644
--- a/metadata/md5-cache/net-misc/zerotier-1.6.4
+++ b/metadata/md5-cache/net-misc/zerotier-1.6.4
@@ -11,5 +11,5 @@ LICENSE=BSL-1.1
 RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
 SLOT=0
 SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.6.4.tar.gz -> zerotier-1.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6cbe7d09b7a0ab11da457828f0fce150
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e4f2f56c8db9..ab1b524dcb2f 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/miopen-5.1.3-r1 b/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
index f1ef20e88a58..c57a17f56c88 100644
--- a/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
+++ b/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-util/hip-5.1.3 >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/5.1[amdgpu_
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.1.3.tar.gz -> MIOpen-5.1.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fb373885d26b519fccb307c5b28d43b5
diff --git a/metadata/md5-cache/sci-libs/symengine-0.9.0-r3 b/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
index 1597b04cd6b2..417d946f8c8e 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
+++ b/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) b
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://github.com/symengine/symengine/archive/v0.9.0.tar.gz -> symengine-0.9.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d6c887c0cb613be581fa73d130b177ec
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8a83e95b36fe..1175eaa486ae 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/kmod-30-r1 b/metadata/md5-cache/sys-apps/kmod-30-r1
index d8057b020aff..3a42a7518355 100644
--- a/metadata/md5-cache/sys-apps/kmod-30-r1
+++ b/metadata/md5-cache/sys-apps/kmod-30-r1
@@ -1,17 +1,16 @@
-BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[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-r5 >=sys-devel/libtool-2.4.7
-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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
+BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare test
+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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
 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_9 python_targets_python3_10
+IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2
-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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
+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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-30.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5f283bf93f0995860eab539642090f89
+_md5_=b6bee293dd80c9980c8db948b183bd81
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index c55401bedf25..ddceb942f800 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -1,16 +1,15 @@
-BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[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-r5 >=sys-devel/libtool-2.4.7 >=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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
+BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare test 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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
 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 git-r3
-IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_9 python_targets_python3_10
+IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
+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_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7ae9f87da54603b4596713ef16274752
+_md5_=565243e6c0139dbf212a84cb134a82ee
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index ab80856ad1f5..5e03595a0dc9 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.0
deleted file mode 100644
index 529511005c19..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=4cd4947a68a2a8004bd2a53e2d46b9ee
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.0
deleted file mode 100644
index 5d184ba6d37a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5
-_md5_=72c01f80663487d145745735cb43ad55
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.0
deleted file mode 100644
index 5b85e37f47b1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=8
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5
-_md5_=4d07d6e6a85f4283214166e3e03bd6da
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.0
deleted file mode 100644
index d8eaaa0ab6cd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5
-_md5_=27109a0647e998e2663cfeb27fd9d8df
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.16 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.16
index 232e45001e16..d618d4834b1c 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.16
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.16
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.16.tar.gz -> kubernetes-1.23.16.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1c5f65af036c6b8e13c3a7a2148aa324
+_md5_=b6f97b3c97261505c8cdd62024c1d4ba
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.10 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.10
index 53845901df9b..27e64cc478e2 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.10
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.10
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.10.tar.gz -> kubernetes-1.24.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=24806ba87de72d72f6d8fd344b307189
+_md5_=21341ede70d5e0b86ada648e49ef3896
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.25.6 b/metadata/md5-cache/sys-cluster/kubeadm-1.25.6
index 727ae052303a..ba43eb89896d 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.25.6
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.25.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.6.tar.gz -> kubernetes-1.25.6.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1254c744dee34612178a330ccaf220be
+_md5_=a1d6e48fff34b8182a7cf41e408c0de9
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.26.0 b/metadata/md5-cache/sys-cluster/kubeadm-1.26.0
deleted file mode 100644
index 6f52256509b0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=83328ff3b0ffa20913a29a32bbdb9711
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.26.0 b/metadata/md5-cache/sys-cluster/kubectl-1.26.0
deleted file mode 100644
index df3e18e9c003..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8d7568fac85c8036aac1e62b6f4ea63f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.26.0 b/metadata/md5-cache/sys-cluster/kubelet-1.26.0
deleted file mode 100644
index da26cb1a09c5..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.0.tar.gz -> kubernetes-1.26.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5af1a3c3e2ecac0c7e0ebb16fbfff2da
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 544c23224f3c..c2e4009ff439 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r2 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r2
index 54adefbc831d..180d4976a2db 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-lib
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=59eaaa9689b574fcbf1490cb5454f88f
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index 2e02695f8c8b..f20dc47995e0 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9167e5dbd7b3f39ad72a73e435641f45
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 3d4e67433194..fc9ddb819254 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=375f0da582e3d57aad2b0afc9dda0fc8
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index a09eecbde472..a34cb0eb5804 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=641bbc921004d6e98be4724cfe9f11fe
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
index e660d0fc1fb3..5179376aed21 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f1d76e535b3db3b7e25ce8d8e3653c25
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230127 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230127
index a27f5e5e15de..84e8463b5da0 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230127
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=641bbc921004d6e98be4724cfe9f11fe
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc1
index 0667c76a7299..a6ff4c23e1c0 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_rc1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d89968692ca8453d816a5c599e2ea626
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index a2ed17114bb2..834c443b27a9 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=641bbc921004d6e98be4724cfe9f11fe
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index 166c8845dd9c..9689f4983f65 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 31c294c8f8ba..ffa452e096b2 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index e72ee8ee83f5..97b6976169be 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
index d8f9019a34db..95d4ab0da7e2 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_pre20230107[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
index 31681b14f516..0e7faf1d5f6f 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_pre20230127[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc1 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc1
index bfeba3076fac..0bdc47f23ae4 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_rc1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_rc1[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index 0b2e0bd8e929..586537acef9c 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-17.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.4-r2 b/metadata/md5-cache/sys-devel/sparse-0.6.4-r2
index 065d164048e3..0c592a5a996f 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.6.4-r2
+++ b/metadata/md5-cache/sys-devel/sparse-0.6.4-r2
@@ -12,5 +12,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-15:= ) sqlite? ( dev-db
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.4.tar.xz
-_eclasses_=llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=5035213234d8561694cc21aab3873eb0
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 05680bd5ecc5..41ee34d25842 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 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	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=5035213234d8561694cc21aab3873eb0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index b6ddaedfe38b..f34a341cf595 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 0db47bc65295..f704be216b8d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f3a74dc36235bcb8a49192085575cfb
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 4ef78a6870c2..fffa24951a74 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=53e39020c8d23997da8e61e17fdb8a19
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index 88879999416b..bbf02701378c 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107
index 943fc9c12e15..e3c888d0239f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230127
index 927cb6570e8d..fa5455577cd9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230127
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc1
index ab4f3cd804b2..6cb734f67046 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
index 68c4b1da6eab..44ec842e1926 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index 98473ff9a339..f79b0b378fc0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cc699fcdf9f163bee883dde62fdcbdfd
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index 374badb9c847..6881fbbadeac 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4a6c28dfb8b0a1aa66ce2850011b96dd
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
index 767ef949a9cd..518f35a42fb7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107
index 9cdace6b7f51..c509a39ce406 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230127
index 34eeb86565ec..1be37832bd3f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230127
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc1
index eae8e8c1b7de..0360ada2669d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
index 8f93d0b8a6e0..cec903022ed4 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index bd28a61596a6..b677a765fcac 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ed4b7b665367a12874548fbffbf304e1
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 01a7c051e2e8..ffebdd4fa92a 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f5a8fba7d5d2d43189bfb259f861a89
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index deb28f1ccc11..8341a6d18fbf 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ec12a0f6e108c8b13319626ed8ce9939
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
index f6a14e5d99d1..c2d63955a013 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107
index 82932fb233a7..b61e7750fb44 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230127
index f8f9c6d30f70..271da9613787 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc1
index 9d4b7568e8ee..2029d5d40cd5 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
index 83dc860ded88..2d29c8986ddf 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 580001c0fc38..004dec333054 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4e54b656411cc807bdd92b2f892aa32f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 67ed15e9550c..f9c9c443e53b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=462e3f649f8df58db11379d6fa9c34ff
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
index 861b0f0ebc23..5f9670cdaa69 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107
index 6bb65f943dc4..bb1d1273f814 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230127
index 99b5eb9ae460..9a5a86e5f7a0 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc1
index a87d1a95703c..33f8f290cfcc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
index de7365d11d46..7fd2a70824c4 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index cde951759d0a..72bbd54c22f3 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7 b/metadata/md5-cache/sys-libs/libomp-15.0.7
index 30492cd7965f..f8ab2e67f2bc 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7
@@ -12,5 +12,5 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=570eb673181badef2bc4aef19404143e
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index 1b03eab46c55..b182beb85373 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3ff9c7770ba882cbfeb2cc32ccc476fa
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107
index 0fc8ce5a1404..e2111187e55b 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6a3184b01ec21aed4c6aab2fcaffab78
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230127
index 06a10340a071..a7edca0481b5 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3ff9c7770ba882cbfeb2cc32ccc476fa
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc1 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc1
index 4fb34552bc6b..f04de1307921 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc1
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2010234c4646f010f243335e7a214d3d
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index b19a3f570d93..921c161bec4e 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3ff9c7770ba882cbfeb2cc32ccc476fa
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index 3983ec531f79..6cbaa7967f17 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 8171eb1fe285..caa1c761a177 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
index d6aba5e321e8..34a3d7b33ab1 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107
index f8a971cb56fe..93b28ee1f365 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230127 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230127
index db201ce19748..fc621dad10d0 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230127
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc1 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc1
index 3b50878a3cca..836a79e4e9f8 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc1/llvm-project-16.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
index 0b744122d4c9..0765efa4289b 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	08b73a8e8873cec51687502fe56c8c3e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 963dc567259b..ac13a67c4228 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/hugo-0.108.0 b/metadata/md5-cache/www-apps/hugo-0.108.0
index 104a2dc99b15..70ed64959235 100644
--- a/metadata/md5-cache/www-apps/hugo-0.108.0
+++ b/metadata/md5-cache/www-apps/hugo-0.108.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.18 <dev-lang/go-1.20 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
 DESCRIPTION=Fast static HTML and CSS website generator
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.108.0.tar.gz -> hugo-0.108.0.tar.gz https://tastytea.de/files/gentoo/hugo-0.108.0-vendor.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d9d6eb5af22d9ebbbd5a0fa58e8f3d83
+_md5_=6a6d5336fe7003cacf23cadc984ec7b1
diff --git a/metadata/md5-cache/www-apps/hugo-0.110.0 b/metadata/md5-cache/www-apps/hugo-0.110.0
index 720b2ec21dc1..81bdfcca52bb 100644
--- a/metadata/md5-cache/www-apps/hugo-0.110.0
+++ b/metadata/md5-cache/www-apps/hugo-0.110.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.18 <dev-lang/go-1.20 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
 DESCRIPTION=Fast static HTML and CSS website generator
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.110.0.tar.gz -> hugo-0.110.0.tar.gz https://tastytea.de/files/gentoo/hugo-0.110.0-vendor.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0546070a6bd9de63e0a0c46ef12064c5
+_md5_=59f77f075bd4521f537c6ff425055e9f
diff --git a/metadata/md5-cache/www-apps/miniflux-2.0.40 b/metadata/md5-cache/www-apps/miniflux-2.0.42
index 279918749b48..f1d0afa8eba4 100644
--- a/metadata/md5-cache/www-apps/miniflux-2.0.40
+++ b/metadata/md5-cache/www-apps/miniflux-2.0.42
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-user/miniflux >=dev-db/postgresql-9.5
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/miniflux/v2/archive/2.0.40.tar.gz -> miniflux-2.0.40.tar.gz https://dev.gentoo.org/~concord/distfiles/miniflux-2.0.40-deps.tar.xz
+SRC_URI=https://github.com/miniflux/v2/archive/2.0.42.tar.gz -> miniflux-2.0.42.tar.gz https://dev.gentoo.org/~concord/distfiles/miniflux-2.0.42-deps.tar.xz
 _eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=525995f99e27ef6fae15b824ce29c8f3
+_md5_=d9c73d46cc6322347dd517cf908b8a80
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 34e144d36077..68a1ba0cad87 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-109.0.5414.119 b/metadata/md5-cache/www-client/chromium-109.0.5414.119
index 3f25f5232b33..cba0820f7fbb 100644
--- a/metadata/md5-cache/www-client/chromium-109.0.5414.119
+++ b/metadata/md5-cache/www-client/chromium-109.0.5414.119
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-109.0.5414.119.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-109-patchset-2/chromium-109-patchset-2.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_109.0.5414.74-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=999f07919ba40b46cc86dfee8c45e50c
diff --git a/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1 b/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1
index 0e518f024c7b..c23563bef1c6 100644
--- a/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1
+++ b/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-109.0.5414.74.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-109-patchset-2/chromium-109-patchset-2.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_109.0.5414.74-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=905a4287f5fa6733f33d445305773eb1
diff --git a/metadata/md5-cache/www-client/chromium-110.0.5481.38 b/metadata/md5-cache/www-client/chromium-110.0.5481.38
index 4405a65842ec..30c84ee31032 100644
--- a/metadata/md5-cache/www-client/chromium-110.0.5481.38
+++ b/metadata/md5-cache/www-client/chromium-110.0.5481.38
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/beta
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-110.0.5481.38.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-110-patchset-4/chromium-110-patchset-4.tar.xz pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=dd9ddd2ba41246c2523e5534a69c2e54
diff --git a/metadata/md5-cache/www-client/chromium-111.0.5545.6 b/metadata/md5-cache/www-client/chromium-111.0.5545.6
index 56bb8851f0af..2393f9c21cd0 100644
--- a/metadata/md5-cache/www-client/chromium-111.0.5545.6
+++ b/metadata/md5-cache/www-client/chromium-111.0.5545.6
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/dev
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-111.0.5545.6.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-111-patchset-2/chromium-111-patchset-2.tar.xz pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=595fd6b537251fee55fcb750112a424c
diff --git a/metadata/md5-cache/www-client/firefox-102.7.0 b/metadata/md5-cache/www-client/firefox-102.7.0
index ff7660eb9a52..1d02f6a37c6e 100644
--- a/metadata/md5-cache/www-client/firefox-102.7.0
+++ b/metadata/md5-cache/www-client/firefox-102.7.0
@@ -13,5 +13,5 @@ RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-vide
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/source/firefox-102.7.0esr.source.tar.xz -> firefox-102.7.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.7.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.7.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.7.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.7.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.7.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.7.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.7.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.7.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.7.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.7.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.7.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.7.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.7.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.7.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.7.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.7.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.7.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.7.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.7.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.7.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.7.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.7.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.7.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.7.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.7.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.7.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.7.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.7.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.7.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.7.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.7.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.7.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.7.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.7.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.7.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.7.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.7.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.7.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.7.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.7.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.7.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.7.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.7.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.7.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.7.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.7.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.7.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.7.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.7.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.7.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.7.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.7.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.7.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.7.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.7.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.7.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.7.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.7.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.7.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.7.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.7.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.7.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.7.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.7.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.7.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.7.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.7.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.7.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.7.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.7.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.7.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.7.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.7.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.7.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.7.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.7.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.7.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.7.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.7.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.7.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.7.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.7.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.7.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.7.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.7.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.7.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.7.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.7.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.7.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.7.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.7.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.7.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.7.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.7.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.7.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.7.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.7.0esr-xh.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b8a356581766a15c2c02613353d78bed
diff --git a/metadata/md5-cache/www-client/firefox-109.0.1 b/metadata/md5-cache/www-client/firefox-109.0.1
index c9cdc05d6821..6c629284aee0 100644
--- a/metadata/md5-cache/www-client/firefox-109.0.1
+++ b/metadata/md5-cache/www-client/firefox-109.0.1
@@ -13,5 +13,5 @@ RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/
 REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/109.0.1/source/firefox-109.0.1.source.tar.xz -> firefox-109.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-109-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-109-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-109-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/af.xpi -> firefox-109.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ar.xpi -> firefox-109.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ast.xpi -> firefox-109.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/be.xpi -> firefox-109.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/bg.xpi -> firefox-109.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/br.xpi -> firefox-109.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ca.xpi -> firefox-109.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/cak.xpi -> firefox-109.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/cs.xpi -> firefox-109.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/cy.xpi -> firefox-109.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/da.xpi -> firefox-109.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/de.xpi -> firefox-109.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-109.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/el.xpi -> firefox-109.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-109.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-109.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-109.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-109.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/et.xpi -> firefox-109.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/eu.xpi -> firefox-109.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/fi.xpi -> firefox-109.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/fr.xpi -> firefox-109.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-109.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-109.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/gd.xpi -> firefox-109.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/gl.xpi -> firefox-109.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/he.xpi -> firefox-109.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/hr.xpi -> firefox-109.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-109.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/hu.xpi -> firefox-109.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/id.xpi -> firefox-109.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/is.xpi -> firefox-109.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/it.xpi -> firefox-109.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ja.xpi -> firefox-109.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ka.xpi -> firefox-109.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/kab.xpi -> firefox-109.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/kk.xpi -> firefox-109.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ko.xpi -> firefox-109.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/lt.xpi -> firefox-109.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/lv.xpi -> firefox-109.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ms.xpi -> firefox-109.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-109.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/nl.xpi -> firefox-109.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-109.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-109.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/pl.xpi -> firefox-109.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-109.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-109.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/rm.xpi -> firefox-109.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ro.xpi -> firefox-109.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ru.xpi -> firefox-109.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sk.xpi -> firefox-109.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sl.xpi -> firefox-109.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sq.xpi -> firefox-109.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sr.xpi -> firefox-109.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-109.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/th.xpi -> firefox-109.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/tr.xpi -> firefox-109.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/uk.xpi -> firefox-109.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/uz.xpi -> firefox-109.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/vi.xpi -> firefox-109.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-109.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-109.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ach.xpi -> firefox-109.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/an.xpi -> firefox-109.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/az.xpi -> firefox-109.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/bn.xpi -> firefox-109.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/bs.xpi -> firefox-109.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-109.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/eo.xpi -> firefox-109.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-109.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-109.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/fa.xpi -> firefox-109.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ff.xpi -> firefox-109.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/gn.xpi -> firefox-109.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-109.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-109.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-109.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ia.xpi -> firefox-109.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/km.xpi -> firefox-109.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/kn.xpi -> firefox-109.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/lij.xpi -> firefox-109.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/mk.xpi -> firefox-109.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/mr.xpi -> firefox-109.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/my.xpi -> firefox-109.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-109.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/oc.xpi -> firefox-109.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/sco.xpi -> firefox-109.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/si.xpi -> firefox-109.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/son.xpi -> firefox-109.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/szl.xpi -> firefox-109.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ta.xpi -> firefox-109.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/te.xpi -> firefox-109.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/tl.xpi -> firefox-109.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/trs.xpi -> firefox-109.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/ur.xpi -> firefox-109.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xpi/xh.xpi -> firefox-109.0.1-xh.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7b8ad9f48dc55806040c3b934b60fe33
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 6c2007621a96..60eb6deb56b7 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.06 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.07
index 609e684521c6..98955a8d3e48 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.06
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.07
@@ -11,6 +11,6 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/vulkan
-SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5254706-linux -> NVIDIA-Linux-x86_64-525.47.06.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.85.05.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/525.47.06.tar.gz -> open-gpu-kernel-modules-525.47.06.tar.gz
+SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5254707-linux -> NVIDIA-Linux-x86_64-525.47.07.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.85.05.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/525.47.07.tar.gz -> open-gpu-kernel-modules-525.47.07.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=424687cfaf4ee02819930a9ca3f68859
+_md5_=b0fbec6e70d7a82f856d56592164163c
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index a43d04d55cbc..109785551103 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-4.18.0 b/metadata/md5-cache/xfce-base/exo-4.18.0
index 58cfa67690db..2d77d8adebc9 100644
--- a/metadata/md5-cache/xfce-base/exo-4.18.0
+++ b/metadata/md5-cache/xfce-base/exo-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extensions, widgets and framework library with session support for X
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start https://gitlab.xfce.org/xfce/exo/
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.18/exo-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7a9400729c6b42206fafd14937d9433f
+_md5_=4566d0cdcd1b350747efb02834618bea
diff --git a/metadata/md5-cache/xfce-base/garcon-4.18.0 b/metadata/md5-cache/xfce-base/garcon-4.18.0
index 0d1474548a6d..30e02b049f4e 100644
--- a/metadata/md5-cache/xfce-base/garcon-4.18.0
+++ b/metadata/md5-cache/xfce-base/garcon-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
 INHERIT=xdg-utils
 IUSE=introspection
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.18/garcon-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=577584424e08bcc4719bd4f805add477
+_md5_=e57f3027930b9a618c034f4e0d9e585a
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
index 715ba34c50c5..c7de3b72da3c 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
 INHERIT=xdg-utils vala
 IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=16077aa8a200fac04d5149b98fb09a43
+_md5_=5d14eddbaddfb4a9004a0902579d039f
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
index e2dcaf1a9a80..36de8cebb56b 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
 INHERIT=vala
 IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.18/libxfce4util-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=d84620aca3ba772c73b3d412d4e7ac9e
+_md5_=903efca2b8936d67f5193659fa676f2e
diff --git a/metadata/md5-cache/xfce-base/thunar-4.18.3 b/metadata/md5-cache/xfce-base/thunar-4.18.3
index f77b3e804d62..be8fe2417fb4 100644
--- a/metadata/md5-cache/xfce-base/thunar-4.18.3
+++ b/metadata/md5-cache/xfce-base/thunar-4.18.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start https://gitlab.xfce.org/xfce/thunar/
 INHERIT=xdg-utils
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.6:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre2-10.0:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( >=gnome-base/gvfs-1.18.3[udisks,udev] virtual/udev )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.18/thunar-4.18.3.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=54e1bbcacb1d0306a3d5ce704e5c0408
+_md5_=a6c880803007455d383d2302a317cc18
diff --git a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0 b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
index 62254865969a..0bf7135b2054 100644
--- a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
+++ b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/thunar-volman https://gitlab.xfce.org/xfce/thunar-volman/
 INHERIT=xdg-utils
 IUSE=libnotify
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libgudev:= >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/4.18/thunar-volman-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=340d8d5b3fbf0b9466b3a00b1c009cde
+_md5_=c421234f00d41ea3d3ae934f0eec89ad
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.18.0 b/metadata/md5-cache/xfce-base/tumbler-4.18.0
index 7fc0771042c9..e4a2ea043a8b 100644
--- a/metadata/md5-cache/xfce-base/tumbler-4.18.0
+++ b/metadata/md5-cache/xfce-base/tumbler-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/tumbler/start https://gitlab.xfce.org/xfce/tumbler/
 INHERIT=xdg-utils
 IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=xfce-base/libxfce4util-4.17.1:= >=x11-libs/gdk-pixbuf-2.40.0 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/tumbler/4.18/tumbler-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=869f69f8b2c17b3c44d11f27024a68e6
+_md5_=38c0fe17fb5b27c1ba498f4bb4975132
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
index 4bfdb06906ad..db6eb0436327 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=A tool to find and launch installed applications for the Xfce deskto
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.18/xfce4-appfinder-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bc81e7d74282e6e5b4d9727b1efe196c
+_md5_=8c2a8dae0a87897bb497c3e6c8155508
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.18 b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
index 34a107be83c0..76aa1b6bbc66 100644
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.18
+++ b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
@@ -3,8 +3,8 @@ DESCRIPTION=The Xfce Desktop Environment (meta package)
 EAPI=8
 HOMEPAGE=https://www.xfce.org/
 IUSE=minimal pulseaudio +svg upower
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=x11-themes/hicolor-icon-theme >=xfce-base/exo-4.18.0 >=xfce-base/garcon-4.18.0 >=xfce-base/libxfce4ui-4.18.0 >=xfce-base/libxfce4util-4.18.0 >=xfce-base/thunar-4.18.0 >=xfce-base/thunar-volman-4.18.0 >=xfce-base/tumbler-4.18.0 >=xfce-base/xfce4-appfinder-4.18.0 >=xfce-base/xfce4-panel-4.18.0 >=xfce-base/xfce4-session-4.18.0 >=xfce-base/xfce4-settings-4.18.0 x11-terms/xfce4-terminal >=xfce-base/xfconf-4.18.0 >=xfce-base/xfdesktop-4.18.0 >=xfce-base/xfwm4-4.18.0 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin ) svg? ( gnome-base/librsvg ) upower? ( >=xfce-base/xfce4-power-manager-4.18.0 )
 SLOT=0
-_md5_=b2fa43bc378dcfaa71523809e3a33064
+_md5_=a5e083ff7e645e7a478fdcac70085a6b
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
index 7032c5931804..700ffaeaf0ae 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4e14bc7ffe4ab0f3775c5a99a1e95f0a
+_md5_=e99f8c77fa5958c676d89eb2c6b2fff5
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
index ea74e57f2782..ad0319cf78fd 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e8737596784960515a748652561524c7
+_md5_=3a45f145d50d8c4018f531fa2b817da4
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
index 0f888b50a117..331184079438 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
 INHERIT=xdg-utils
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ad6e35e42dd170c6ba5b2c6a863236b
+_md5_=80f89724fa75ee335ebcaf1ca407e924
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
index 650916e05477..be75c2876ce7 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
 INHERIT=python-single-r1 xdg-utils
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e20c5f8ff586da602150d68226538bf7
+_md5_=449e81a5bc9a3f39baefc89f897ce100
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.18.0 b/metadata/md5-cache/xfce-base/xfconf-4.18.0
index ba217136b391..978540923dce 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfconf-4.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfconf/start https://gitlab.xfce.org/xfce/xfconf/
 INHERIT=bash-completion-r1 vala
 IUSE=debug +introspection vala
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.18/xfconf-4.18.0.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=99fcfe68d5cdca240f3144aea0f31bd0
+_md5_=a88888dbdd7e82d77ff997452f1af677
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1 b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
index 4e8ad5589e3c..0f5fe511c00f 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
 INHERIT=xdg-utils
 IUSE=libnotify +thunar
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.18/xfdesktop-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f0f9c0d05558475c7a882deddfc085e5
+_md5_=ea8e89eca6d98fc1a38ee495a1305b77
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.18.0 b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
index 48a2361a6017..892763edbcce 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfwm4/start https://gitlab.xfce.org/xfce/xfwm4
 INHERIT=xdg-utils
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.18/xfwm4-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6690a8a1be6cf4e503d45e60ad62b267
+_md5_=aca8c72a3747fd610cec5a2c69fb2d1b
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index e56a0c0521c6..ad4aa9e5a241 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
index e4f889cc1ffe..ca29a7d24855 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
@@ -5,10 +5,10 @@ DESCRIPTION=A panel plugin for showing information about cpufreq settings
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/
 INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4ui-4.16:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.8.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7fa3deb800b5b8e3380c4db66d0250c
+_md5_=a53398c73717f8f12a218b2eb2089a26
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
index b559a910e7ac..0ddf91c8a7b9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
@@ -5,10 +5,10 @@ DESCRIPTION=A system load plug-in for the Xfce panel
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16.0:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ce192f322fe8b4cf221b6d50ca1111f
+_md5_=49cef3141ebf6b975d9dadec8d82dc5b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1
deleted file mode 100644
index 8a3609e42387..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=net-libs/libsoup-3.0.0:3.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
-INHERIT=xdg-utils
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=net-libs/libsoup-3.0.0:3.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=78eb5a15654946bd96c4643f49c038f2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.2 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.2
deleted file mode 100644
index 1266e0f63413..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:= >=xfce-base/xfconf-4.18.0:=
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
-INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:= >=xfce-base/xfconf-4.18.0:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.2.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e790bc0c9e6455226edae9f99e20cfdd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
index b44b8558969c..ca1fa097f080 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/
 INHERIT=xdg-utils
 IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4ui-4.16:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.4.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=36dbd6e4d2ffd39346a818c0efb6b598
+_md5_=87eb0e409e451ea325e6720a5c0b6c4f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
index e4182408ed61..db2eb0874845 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/
 INHERIT=xdg-utils
 IUSE=upower
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.16:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:= >=xfce-base/xfconf-4.14:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.2.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ece7511ac281a91c07c1a1118f6de795
+_md5_=dc1f82c6d91d008aefaa85073ac988f4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.4 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.4
deleted file mode 100644
index 8d0c97a55af6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm
-DEPEND=x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libwnck:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/xfconf-4.14:=
-DESCRIPTION=Easy to use task manager
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libwnck:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/xfconf-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.4.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b777f1e824767a953fb9265b59ee69b4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 130d94dc16a2..6bfc87821709 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15152 BLAKE2B c1d08f39453125718bfb044cbe0dd8c2d1d6ee790e3d7e8488ae11fc536eb3f4232a0679f80662b1e041f8edd39b6ec4d2d39c7e6ac1b418151d9c3853698313 SHA512 b37bf15aece1c30972723d2b64d1d1613bce0e6747a01563fb993e46731ebc5b99ca0625ecd9086c739877084416aa12e6c2a5650a2bfe625796875f89cc89dc
-TIMESTAMP 2023-02-03T14:39:41Z
+TIMESTAMP 2023-02-03T20:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdcQxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAAnA//S7vDhoK0SKCwD3E80XLhxxgqnFcg64aoqY6fYAiYOBwzyHmsbn+jR3HE
-mJ0ap6ofbxnXtdgbm2zTDMrIsMJZdSiVeOuhQkT8bRyoGTrjgc5bhg1ubnUWvQXr
-4eKbg1T/lQEXSGMgCvZpYYC2qtQqu8kwEulVP+bXdS+07+5iVl3ks+Uo8cGdM9tb
-P0f6vbT10qlR/OoOfjgmR2Ddsj2HKe4sjti6yweZy4LNtPvqTb06V3ifEp//WI0V
-iZiwpF41xJLdTT3+elxWC06DJUoOGgxLjxaWbuqzXEAV+VjdQczW5faKLn2WZqK+
-fsR9QGJuUHglySZQehuwOKt7oMPw6ilz2SkhFoYIkpKn19kD5LYJv0trT/lYrh9O
-zEPJxamzwS9QAkE7qykFNAFNodaLHZeTMpivqIlMT+LiH6+suWk9p0zzojWkw1kB
-C2vaVKx9tkd1B54gznVeI7+jhA/oPZzI4rcvJ1bcKd7hBIhI11L/sMfRKjDL+OGE
-6LrctQxxrkDPo7gUzqTrleR/0Vz+4vSqFUCuIZ1NGCxvURn97594xlheVrZVjydt
-sdmBd/vySHUqXDOwtMm0a0kgOEDWLLCJRMC3sg8aNGP09rj6DKTnCt2hBHlw4r68
-wyMucbyv3dx06NwN4X7G/pXwy5ojsSST3gUTICSN76LDmcVQ4J4=
-=Uo7a
+klDu8BAArLn9ik0OIIpX6QqdWBDenQwjJiCVXcZSDlGOKH0SMrfMf0NUMLTr/XvN
+2xJJkr0VkWnoYAcJrLRmylfyv3O/TMgs1c9B92CVc4lgZyjCMWBSmZaiLpva5jVk
+Act4sxoVqhuLR31pvrynD/91fdWUmuz8Az/2JFTkFbp2cBD+bJR3+zTocr5MG4tw
+1+YNOsrN1RHMl+wMCutuFQISbxIDIbjish+Kj+UJC3+Xp6mw2yTo9VuB42sw5GHO
+f9BTL0NyyzcdUt1VReIAaRmLfU4gYDU3XnAKBtd5BhbkH+wErsmasAcr6nYo1/1c
+pu4wJe7+VjdHDNFjm3V1HCe1QI9GclgQj6tcpEtCbLbRTPhujGRDcbB1QOKl2jrU
+a2vsetHdvsbEnH4zFtf6097HImwR3ETXuBma2/U8jHIbEn9Cj0hWshHQw1x7loAA
+TPWFfRjIPJaBTW+UxXnheXOsbtKQB3wfRdBi/Ob/PezG4clibMkdrzXyl1DC3kdA
+J+tn2Jz6G0JK1AY5RlAx1lLAkF9uLJZxlwmLxQ5GUAUyWGsvEfpCtB3oJXTf5Tly
+7Ba884gLjKxVVTitN9IT/Kqzoa81Z7IykOvt815GJ3+pFxgqrMrS1y6yn2axAd24
+OqtbaEdEjRbEx+R30Ea8BWM3xIrWiI9b1K8LM/PBaTQGgKz5mNY=
+=4FqN
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5fc27631661a..b76a4f62d600 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 14:39:38 +0000
+Fri, 03 Feb 2023 20:39:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f058b7542899..4390c24985c3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Feb  3 02:39:38 PM UTC 2023
+Fri Feb  3 08:39:36 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a05d9d2b6bec..3d4a11308a40 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 14:45:01 +0000
+Fri, 03 Feb 2023 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 0be8e84ce897..5a39a09485fd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-429536804c65445a2c663c149dd6ee21502b2115 1675434843 2023-02-03T14:34:03+00:00
+0e885c018bd6468eaf18701d2e5017cda460b156 1675455939 2023-02-03T20:25:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9bece0858738..97d86fead267 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675435202 Fri 03 Feb 2023 02:40:02 PM UTC
+1675456801 Fri 03 Feb 2023 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5fc27631661a..5873b247ea87 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 14:39:38 +0000
+Fri, 03 Feb 2023 20:39:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 7562e89659fe..2a0093a9df57 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index a600f9679353..4bdd368f0170 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,6 +1,9 @@
 AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e
+AUX monitoring-plugins-gnutls.patch 782 BLAKE2B 52f3ad417fbbf9b6fd021a42dfa2b547fcdf5f6709701732029c4bcca00793d83be9bc56f95100ded0cfe6ddaa026972b7ebd1451a7ce9a756d1cf27f595a1a7 SHA512 bc52716ad032215ce8dcd2b59b18b84eddede536280fdfd263ea7c0bb7be93f57a8efd5fcaedf6b803b435325fba8f3197ba2b17f0dd037c3beecbcaeb5cce75
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
 DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765
+DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
 EBUILD monitoring-plugins-2.3.1-r4.ebuild 3128 BLAKE2B e98bc4bfd457e4d634560bf72b2edee08b47ed1b909bc691ade912ec5671da16f098d30ac62b1acb7512629f4da154836a9d01a7fca742f87b71f6cb8e0676e0 SHA512 f94963c668a11d67be9ab488ad39382d614bc0e246704fea51ca18bc3ec1dcf77c87fe36a3d3ab07b2d841fa7cbdb94db90d3bbca030458130b2087304e6c20f
 EBUILD monitoring-plugins-2.3.2-r1.ebuild 3056 BLAKE2B 59998577d7cf252f72058e359c7dcae42a199e16a16005e01279891e7e3fcb5277e64af4a32e512b8675fca128706e89a3e7f24483f16b8b0815427e17e68909 SHA512 357f02b81f09d3bb6a7054b11e0e06184da6c02ddc5794c27bb64aa29b4792428bdcdfb4aa331d46e53230102bed5a4a91dca417d23efa232da85e59215e9301
+EBUILD monitoring-plugins-2.3.3.ebuild 3119 BLAKE2B e30a581487eec7b4d4c152bfa1803b10210228bfac6561ff2a63ce3113a87d091baaf584a912e217310cf3222cc1dc2743e1f30b57e7ebe7942ca0da4c2ed9b5 SHA512 e9720f48cf2264cec56f4dcc3b1a4dbfaf0b1af2dc925abbcb60f6348ac5ddc121ea28d4f2d247c0f4263c11c107adb455f325713a5d9a1aa283ff2c61ffe936
 MISC metadata.xml 1541 BLAKE2B 979f2ab54aa6fd684023c25a2725f45ce1c3edfcc98f7b79e0bee72937f0c385c71c8f8a2caaa60231bdf26c4649ded397eeafb046a46fdcda5247ca030724be SHA512 a8d68c666fa3e9e181ab3d7f469395b19e26b47145fdf96f1135c3eb5001404f66a8c046a236d25238e4e31adb6269c1da7020b5b92262d3a7cb4f6f8a0f49d9
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
new file mode 100644
index 000000000000..00415f0b7111
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/880211
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
+https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
+
+diff --git a/plugins/sslutils.c b/plugins/sslutils.c
+index 286273f6..c26c4fb3 100644
+--- a/plugins/sslutils.c
++++ b/plugins/sslutils.c
+@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
+ 		return STATE_CRITICAL;
+ 	}
+ 	if (cert && privkey) {
++#ifdef USE_GNUTLS
++		SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
++#endif
++#ifdef USE_OPENSSL
+ 		SSL_CTX_use_certificate_chain_file(c, cert);
++#endif
+ 		SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
+ #ifdef USE_OPENSSL
+ 		if (!SSL_CTX_check_private_key(c)) {
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
new file mode 100644
index 000000000000..bf2ccb76116a
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	curl? (
+		dev-libs/uriparser
+		net-misc/curl
+	)
+	ldap? ( net-nds/openldap:= )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	acct-group/nagios
+	acct-user/nagios
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/monitoring-plugins-gnutls.patch"
+)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered (bug #468296). But also the path
+	# likes to move around on us (bug #883729).
+	myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with curl libcurl) \
+		$(use_with curl uriparser) \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index f57ac6e0de89..9f58e9688af5 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,8 +1,13 @@
 AUX ntopng-5.2.1-build-system.patch 2624 BLAKE2B 5fa408c42203009152d20b207e64b411ba9fa36687d4ec9264cfb0250ed5d701189b4549e8c147ca437d19fe92334b71c315ccc71074dcbe32e44b6ec2dbf510 SHA512 fcc46ee8c0173dd04e51c93cea009295fd636b7c9ad8aeb43bb96ef31e3a4a45763a6732fceb901ee58646f47067411faf600d5dba8820acfcba4b3ceec0c98b
 AUX ntopng-5.2.1-mysqltool.patch 494 BLAKE2B cff0845f604a0c73a025043417a2b70e7d8f36feb73684230e410dcf3b67c08432b79e852018299c829d36fce6d082fb7b9172d216477c8f928f720c04cba643 SHA512 0aed88a94fc21888e468c71212389f89765f5b394411e6a2838299a280a9cba8e996ebe652b8d116ddc8b9c51b66a463c206917187b138badc76246ade3a780f
 AUX ntopng-5.2.1-ndpi-linking.patch 474 BLAKE2B cacf4f42af93bc656558873f732734bac70f6732325686b8c4f4e38c9f9fb39e6fcfc3b189da29b27b155c55249717c546d408d27ba488682e364e794caba2d9 SHA512 cc5cd78e7ed6499c91f16695f45d0284ed6430a435364919d320ca80f4c7c25bbb68cdea070b8710535fd327faa6f0d62b6c0dfa605e34555c14a6cd8b4dc36b
+AUX ntopng-5.4-ndpi-linking.patch 1567 BLAKE2B 822c91e973562621665f5385ee5ab831c566f575689bdda84885ce3bac524312e6fad98a51d0de04fb87d1ebb55616ac6ca26c54661b1c839b93f3ebf573aa80 SHA512 5315da87516c40ec8440bbf82df1acedd3978433d63d70744a5f8cb234e81a7ea01a876c035c42e3b4541672e4bbe0ed2fc10ab821c8fad39fb818e387b4cb04
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
+DIST ntopng-5.4.tar.gz 42662921 BLAKE2B 67a44291671821a94ed0a849467e85030e57fff07b49e61c299f3c09efcad1a7dac5b835f4fc51a2554f7e7d7ae60ae0bd135adba7afa71e505a40d4e9243462 SHA512 3a7d84f64127779780c580c198dfc90bc0a4957e9fb68493babb5381d9127451c506a06d134a488d869840e2b10e7d87a09ec590fd3a5d782e426cab640632cb
+DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
 EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352
+EBUILD ntopng-5.4.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b
+EBUILD ntopng-5.6.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b
 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f
diff --git a/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch
new file mode 100644
index 000000000000..8a50b7cb1a10
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch
@@ -0,0 +1,49 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -231,31 +231,8 @@ NDPI_LIB=
+ NDPI_LIB_DEP=
+ 
+ AC_MSG_CHECKING(for nDPI source)
+-      if test -d "./nDPI" ; then :
+-         NDPI_HOME=./nDPI
+-      elif test -d "../nDPI" ; then :
+-         NDPI_HOME=../nDPI
+-      elif test -d "$HOME/nDPI" ; then :
+-         NDPI_HOME=$HOME/nDPI
+-      fi
+-
+-      if test ! -z "$NDPI_HOME" ; then :
+-         AC_MSG_RESULT(found in $NDPI_HOME)
+-         NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
+-         AC_MSG_CHECKING(for $NDPI_LIB)
+-         if test -r $NDPI_LIB ; then :
+-            AC_MSG_RESULT(found $NDPI_LIB)
+-         else
+-            AC_MSG_RESULT(not found $NDPI_LIB: compiling)
+-            cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd -
+-         fi
+-         NDPI_INC="-I$NDPI_HOME/src/include -I$NDPI_HOME/src/lib/third_party/include"
+-         NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
+-         NDPI_LIB_DEP=$NDPI_LIB
+-      else
+-         AC_MSG_RESULT(not found)
+-      fi
+-
++      NDPI_LIB="-lndpi"
++      NDPI_LIB_DEP=$NDPI_LIB
+ 
+ if test ! -z "$NDPI_CUST_INC" ; then :
+   NDPI_INC=$NDPI_CUST_INC
+diff --git a/configure.ac.in b/configure.ac.in
+index ed906b1..3e70bec 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then :
+   NDPI_LIB=$NDPI_CUST_LIB
+ fi
+ 
+-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then :
++if test -z "$NDPI_LIB" ; then :
+   echo "Could not find nDPI"
+   echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng"
+   echo "and try again"
diff --git a/net-analyzer/ntopng/ntopng-5.4.ebuild b/net-analyzer/ntopng/ntopng-5.4.ebuild
new file mode 100644
index 000000000000..57a01e79f4ab
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-db/sqlite:3
+	dev-libs/hiredis:=
+	dev-libs/json-c:=
+	dev-libs/libmaxminddb
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	>=net-libs/nDPI-4.6:=
+	<net-libs/nDPI-4.8:=
+	>=net-libs/zeromq-3:=
+	net-misc/curl
+	sys-libs/libcap
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	acct-user/ntopng
+	acct-group/ntopng
+	dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
+	"${FILESDIR}"/${PN}-5.4-ndpi-linking.patch
+)
+
+src_prepare() {
+	default
+
+	# Follows upstream's autogen.sh
+	sed \
+		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@SHORT_VERSION@/${PV}/g" \
+		-e "s/@GIT_DATE@/$(date)/g" \
+		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
+		> "${S}/configure.ac" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	# configure.ac.in at least has some bashisms(?) which get lost(?)
+	# in conversion to configure.ac (like [ -> nothing?) so just force
+	# bash for now. It's still not quite right but at least upstream will be
+	# testing with it. TODO: fix this!
+	CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	insinto "${SHARE_NTOPNG_DIR}"
+	doins -r httpdocs
+	doins -r scripts
+
+	insinto "${SHARE_NTOPNG_DIR}/third-party"
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe "${PN}"
+	doman "${PN}.8"
+
+	newinitd "${FILESDIR}"/ntopng.init.d ntopng
+	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
+
+	keepdir /var/lib/ntopng
+	fowners ntopng /var/lib/ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/ntopng/ntopng-5.6.ebuild b/net-analyzer/ntopng/ntopng-5.6.ebuild
new file mode 100644
index 000000000000..57a01e79f4ab
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-db/sqlite:3
+	dev-libs/hiredis:=
+	dev-libs/json-c:=
+	dev-libs/libmaxminddb
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	>=net-libs/nDPI-4.6:=
+	<net-libs/nDPI-4.8:=
+	>=net-libs/zeromq-3:=
+	net-misc/curl
+	sys-libs/libcap
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	acct-user/ntopng
+	acct-group/ntopng
+	dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
+	"${FILESDIR}"/${PN}-5.4-ndpi-linking.patch
+)
+
+src_prepare() {
+	default
+
+	# Follows upstream's autogen.sh
+	sed \
+		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@SHORT_VERSION@/${PV}/g" \
+		-e "s/@GIT_DATE@/$(date)/g" \
+		-e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
+		> "${S}/configure.ac" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	# configure.ac.in at least has some bashisms(?) which get lost(?)
+	# in conversion to configure.ac (like [ -> nothing?) so just force
+	# bash for now. It's still not quite right but at least upstream will be
+	# testing with it. TODO: fix this!
+	CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	insinto "${SHARE_NTOPNG_DIR}"
+	doins -r httpdocs
+	doins -r scripts
+
+	insinto "${SHARE_NTOPNG_DIR}/third-party"
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe "${PN}"
+	doman "${PN}.8"
+
+	newinitd "${FILESDIR}"/ntopng.init.d ntopng
+	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
+
+	keepdir /var/lib/ntopng
+	fowners ntopng /var/lib/ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index ac3b5cf75108..2d381b4d5e30 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index deef04ef7a29..e28737c14479 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,7 +1,7 @@
 DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5
 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95
 DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
-EBUILD bind-tools-9.16.33.ebuild 3778 BLAKE2B 15e88193b61a9774a10ea5b83128ac47f7ad22af9a9b0c4f65db572da3d94f910d20bf42add3056f3d0853ef5e164130d0b69c2e5913bf8a128ce529084be395 SHA512 7fd826b96f4d0f2da4bfbde48b9d05de269d467ef45b704bd181c0b446b6ae60f03ab8b9f53c51b7fc87d88cecdeea5f0dad6604ade50cedbc4bab05bc8abab9
-EBUILD bind-tools-9.16.36.ebuild 3780 BLAKE2B b94514352c176eab0417d9dc4101fd99752bc7dd48c35fb9428d4ded0aa53b2310e6b9a32be782dd5a52c2c30f7c78c0afb5705e512c739db0bbdee307358091 SHA512 c786800cc615fc82959b9b949f61f476953995ab8f862a51186ec6c18fbce69b53ae4ccc9135142fb70bf908d7723b649b8234bb3fc943850fe29b64dd114c67
-EBUILD bind-tools-9.16.37.ebuild 3785 BLAKE2B d7a779a80cfe3b57a1c7098455f4b5479b5e4ce6534a50cd75a20f57b3d4a4f354507ac8f83d1e8ab01dfcb56e003bab356d6ec21d7b7be834e2ae5dd2767e71 SHA512 7644eddc5bbefe976b58ff86c353085e1e49f244ed113b427c5f7ed09dd086c4d703e8cf1346d1ef7a480206717473fb018233d1736a1360adee813e1ad38751
+EBUILD bind-tools-9.16.33-r1.ebuild 3981 BLAKE2B b4f0d7145d60a8259efd98cec7ef7ad23bcd9cdd69e47bb8853c6b5044ba76d6f85ae61b544ce418a0e6f2be2a15b4849df45422aa948ed29c8e44334619c1d3 SHA512 f553f33fbff4c2a93791122799cc7d499645a6580a28c070a229b997888781b8e1baf7aa06f8263949151e73d89d04c88a08dcc5155b2f98a9b5e7d105e48f7c
+EBUILD bind-tools-9.16.36-r1.ebuild 3983 BLAKE2B 08d8868998c93dad4267d3e63f03b6a03dedbac461994b2625ab9dafcdf82e6ef8e63a4caa418c850b28c92686417397a15b19cdb3c06bb2d8adfec323b0ee95 SHA512 21ac1730a22f8213c012d2a00881384d50e5745d3fe66edb4a74b341dd82e56ce9f525bbfabd35a44cbdbed3ede7c1b5ec87d91b986f04527d23825910b7a3ce
+EBUILD bind-tools-9.16.37-r1.ebuild 3988 BLAKE2B 9aa2780ddf3f184c28384974c6f88491e4018a4b09d71b2ca24f595363e7d13c10b0c2aa78bc2481e876476bb3bd29736386b49e39f60bb3fa52aa182f3441b8 SHA512 375f593422d742f4af432ffbe1c679609b4d9289a2a82eb7ace8e50d09f232d3fefa8b31b6c44dee0716ea12790c0e6ad32c79455fa2b5146cf46cda42bdcc54
 MISC metadata.xml 316 BLAKE2B d3d5b29fadc8120581e31e73a19d580b6648056b96f24e6a17710a010143e18c473397b7ab1e37a0e4286502e828ca7def0a588fb2cc9e55b53d08abd6ba89d2 SHA512 ea847ab00b8d94429509aa83bc00daaae1403c16785d60eeb6c1d3e8e731ce9761ede3206b7e6bfc92a33b07ebdb107622f6511dd6bae994a65dfacc666a70f3
diff --git a/net-dns/bind-tools/bind-tools-9.16.33.ebuild b/net-dns/bind-tools/bind-tools-9.16.33-r1.ebuild
index 9fac2b5c984e..a0e03ab0062c 100644
--- a/net-dns/bind-tools/bind-tools-9.16.33.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,8 +21,11 @@ IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
 
+# libuv lower bound should be the highest value seen at
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
+# to avoid issues with matching stable/testing, etc
 COMMON_DEPEND="
-	dev-libs/libuv:=
+	>=dev-libs/libuv-1.42.0:=
 	dev-libs/openssl:=
 	caps? ( sys-libs/libcap )
 	xml? ( dev-libs/libxml2 )
diff --git a/net-dns/bind-tools/bind-tools-9.16.36.ebuild b/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild
index 4e991c95960e..632173751156 100644
--- a/net-dns/bind-tools/bind-tools-9.16.36.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild
@@ -21,8 +21,11 @@ IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
 
+# libuv lower bound should be the highest value seen at
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
+# to avoid issues with matching stable/testing, etc
 COMMON_DEPEND="
-	dev-libs/libuv:=
+	>=dev-libs/libuv-1.42.0:=
 	dev-libs/openssl:=
 	caps? ( sys-libs/libcap )
 	xml? ( dev-libs/libxml2 )
diff --git a/net-dns/bind-tools/bind-tools-9.16.37.ebuild b/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
index 8c70c6e06ed8..da4c92eb0df6 100644
--- a/net-dns/bind-tools/bind-tools-9.16.37.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
@@ -21,8 +21,11 @@ IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
 
+# libuv lower bound should be the highest value seen at
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244
+# to avoid issues with matching stable/testing, etc
 COMMON_DEPEND="
-	dev-libs/libuv:=
+	>=dev-libs/libuv-1.42.0:=
 	dev-libs/openssl:=
 	caps? ( sys-libs/libcap )
 	xml? ( dev-libs/libxml2 )
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 1824c46813da..af4a57d7d524 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,7 +12,7 @@ DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfa
 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95
 DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.33.ebuild 11174 BLAKE2B 101f9c7aa64213edd1cfe3005af418a10a4364a6ee715bbdec1947749f19a3a3c418cb3610e6b1a08d2ba37df7678ff408a541158bb01116065f844468b3666a SHA512 2a12e8c111932241a18558c6a89104ad291a793650b57b4ba93c416c685668cc41beeba4ab6d21cb007c8acccbd2f65d38988f6421cbe98354b71ddbcb802cb7
+EBUILD bind-9.16.33.ebuild 11173 BLAKE2B 0b6f58ae69c6e9d4a318b38e6a1d0b5ccc61e081270db96e1e81d0055f1eef4f5d56c20895547c51b766238c422d73991a55ca4961bf945b30d2a4e22a95fd43 SHA512 7e75d079efcd77357be11b584a0d77dcb3ff8b4718427f4203222631d239f05f3ebceb093ec45260a358b571094f83dc89cc5de33ad60024bf924e3ec051d23f
 EBUILD bind-9.16.36.ebuild 11176 BLAKE2B 59b1ab32fe4104e2c6169dea50185c8b0c12c29a54cc1c6c0687df9179b0868fdb393c73c48f2fe75b70766478490c0acbbc487df45324f3dc98a8227a7faf23 SHA512 a2bab0dfc57c1570c2e5f487a308e66b643f8bf3969eb2250db8920b4911b877d4afe541b18add08e70b5accaa2f6730a9d976cdb8308330a82fa791bb998a35
 EBUILD bind-9.16.37.ebuild 11180 BLAKE2B e580b6821b312bd7c5f5c10f7da514c02c3148075560ea1c28888b7122f40183910d8bedc2d2055e7ac54b75e28d54f0f1bf258ebe03f17f19b4da93c83efb6e SHA512 bec24d57abc732ca61166095674fc71625d66f1df83b2f09c2bed11e1d98475aa2fba94584f6f464c683cfe8f817fd69e9d68df4f0d9066947fcf7174562a4d6
 MISC metadata.xml 866 BLAKE2B 672d411e2fef8ac9003d975fff049d1c17da75984efccc30bd98812a4b3e1be74ebf408f6c650813deff5f326a9858dca3755383e9573059f3c8b5c290497fcf SHA512 fd16dda7b0f54faeec5429a8763fb9075da4eb8c358c88891e388b3e3c76e062e7f585cf0134b99648cfcbae07da7b786c3c16920aed329864ba2cf7c29d93c8
diff --git a/net-dns/bind/bind-9.16.33.ebuild b/net-dns/bind/bind-9.16.33.ebuild
index abd5a0911662..fc26a58a3c40 100644
--- a/net-dns/bind/bind-9.16.33.ebuild
+++ b/net-dns/bind/bind-9.16.33.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${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 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -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"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ce175d2af640..dd1313b76fb5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 1822be569cc1..3dd2b2c950fd 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,8 @@
 DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
 DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468
+DIST nDPI-4.6.tar.gz 29705235 BLAKE2B 65efdfee7af83093b08897fb726a07cf804a3ff901e7373cdc4b3d4564bbfba6ce9b498ab90172f437568c8275685dc51617e991216e38d515b3b5341760b964 SHA512 12dd50eeaae0aa5c2e3c89cb53cdb9989036759bd900312d3875eaba296646c2e42be31dc2b003cbc2401ccef8fbf8d2e460b9a604d7bece360f17f937d60cad
 EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
 EBUILD nDPI-4.4.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
-EBUILD nDPI-9999.ebuild 1064 BLAKE2B 7213d3f78b517c244e17c9e65c41a9778972e3bf357118a2fcf9fbd7b4578499eda79bd51e96849d939246cba20f7e67ce6b535db67707a7885d8f34e61a5435 SHA512 de52ec43dafc2ae6d6882d32167ac26b903397a022287ebf0e7acd685079596707492303df8977f325c44e95f458706ac4b2867eda53b364ad53d8c5b314cf33
+EBUILD nDPI-4.6.ebuild 1196 BLAKE2B 198fe05fa511a35d30215ddf9a0b0d0322b0dbe7eb306b42c0d245d58ede9f28d05520bf1ac82d916eaa6894323dc00e1072d4c1b17bdc2bf66e12ec05e8e796 SHA512 659e18741e04296c6bb780cecb2568a6ffc99207a4b13e0cf723229fc42e049e558dffa0f4e79d88a74835b6bcff03984f3ba2a7cd627a3e8584d06ea2aca398
+EBUILD nDPI-9999.ebuild 1196 BLAKE2B 198fe05fa511a35d30215ddf9a0b0d0322b0dbe7eb306b42c0d245d58ede9f28d05520bf1ac82d916eaa6894323dc00e1072d4c1b17bdc2bf66e12ec05e8e796 SHA512 659e18741e04296c6bb780cecb2568a6ffc99207a4b13e0cf723229fc42e049e558dffa0f4e79d88a74835b6bcff03984f3ba2a7cd627a3e8584d06ea2aca398
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.6.ebuild b/net-libs/nDPI/nDPI-4.6.ebuild
new file mode 100644
index 000000000000..704e7b7703e2
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# "local" here means "local to the system", and hence means
+	# system copy, not the bundled one.
+	econf --with-local-libgcrypt
+}
+
+src_test() {
+	pushd tests || die
+
+	edo ./do.sh
+	edo ./do-unit.sh
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	# Makefile logic is broken in 4.6, let's wait a bit given history and
+	# go with hack for now.
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die
+	mv "${ED}"/usr/usr/* "${ED}"/usr || die
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+	rm -rf "${ED}"/usr/usr || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index e2efa26265f9..704e7b7703e2 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,10 +27,6 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
 	eautoreconf
 }
 
@@ -52,5 +48,10 @@ src_test() {
 src_install() {
 	default
 
+	# Makefile logic is broken in 4.6, let's wait a bit given history and
+	# go with hack for now.
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die
+	mv "${ED}"/usr/usr/* "${ED}"/usr || die
 	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+	rm -rf "${ED}"/usr/usr || die
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 220d8c94da59..655d0688b444 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,10 +2,14 @@ AUX 2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch 914 BLAKE2B 44525071
 AUX 2.38.3-gcc-13.patch 775 BLAKE2B 53d5c23f612ec6d9cb96f5c6d33e1a029120a2ca82d5e3833f910cf637cfe9cda0404f8bfd06601bbb04c36fefd77a1017ec764adba12b3fda0b3f6eed36168e SHA512 c83a769456c02991309c97cb9cb88e0e6335a22cf2c0fd30c3565740c9de316bb5c0e44768485193e28ec692ba3f0f0c0bb01c0e5ab62167a0540c8b1b1e8916
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
+DIST webkitgtk-2.38.4.tar.xz 32534100 BLAKE2B 766c9d94a283605076f416fb0777a70f8dfc7ed31c5e46ae03a521b2cfcf91dc0713cfd0e527530c441c8c224e81ef663eccbf6bdb95e9ef4fa7c0aad646cc36 SHA512 1d0418d14d3852172cfa7a4c97964b547d17eba17ff5c94b124e21ae85bcebb1dda67338ceb3ba12531a01f8cfe15c21132fd16747bf17df9e726296723b9d82
 EBUILD webkit-gtk-2.38.2-r410.ebuild 8020 BLAKE2B d501f292c09fd153433f2615b18ee131d9a908f303ead46ccd23a6bcd12269b6d8d5e7c52bbb44fa8637033b4a0aa46ec2e1cc6458a02d3cefed252f4916a0b1 SHA512 ae2d1981acb5c2b64965cdaa6f25f5633876386163750b4f5f5bbbcb7e10efcaf757227b322c7165b4387f85d3eabd4545e87a784154a062d54c5c3660f24799
 EBUILD webkit-gtk-2.38.2-r500.ebuild 7980 BLAKE2B 898a237303d51a90b6d66b5653f1a511670fa54d541ba9c35aa242032171beedec849b0974a722791b7a83bff8ffb3c8c85acb5ae5ff3bd8a4bfc5ee72078ed9 SHA512 573e4ea279ecd661feb14d277061be9e8dc5a0043219be756214a7200cc7f105fc8c5aaa482ec831d7e43b045372061471a5cc9a1c352f43d376f493bcdde8f7
 EBUILD webkit-gtk-2.38.2.ebuild 7746 BLAKE2B 94ead8f00223620396a055c829142fab906fe3f8c37134672374da48c5767c2a337548c0894df52aec7f264752dd6e95195d4293b073e17b1061ff2a88b7902f SHA512 900752472fa63f9927705e9a8a1ec3a88229ff9560255fae0dd507007e771a9b55020a126e675692e9ee41066141728dd1007dc666905c04fe11111f6397051b
 EBUILD webkit-gtk-2.38.3-r410.ebuild 8064 BLAKE2B c905387b8f4011844752a2c127382c36899c908853f30635157c4f5fcca6816e1fc8d1032282202ed55c3b78f5ddc722e5cf1e94b8275024cc6d75ec8f044e29 SHA512 7bd2badb03b744268c1c5b46f7eb36ce00d77ac9002ffb35ea4b578486a1c5ccf94cbba4b5cdb146fdd4b522fb2b6aa474cabaf5511c85dc5df32d9dee7cd0ec
 EBUILD webkit-gtk-2.38.3-r500.ebuild 8023 BLAKE2B 44664a7be0d791ec3d32ddb60b0d2b04571f26d4858165a7cac0880ca55bfa1ed7e55adefa24fcb62ad444932170fa95b354aa092033a418be202bf210ed400a SHA512 f403e9bc2c6c6fcfe3401648e290e17327694abda3d29533610cfc02681980aba57d33faee0bc608c116c861a3339992b12546d8b0eda4132de12da518610c65
 EBUILD webkit-gtk-2.38.3.ebuild 7790 BLAKE2B b6219de3e314fc3384992a6550b1c59d883943d72d429925fb8d8e41b7f93bccdf861265a670f9fcdbe6207fd5407bd98a39fd541affb136c4bdde3e77857e73 SHA512 e96ad2a9be547c3f7aea05e5755454f66a32209144e1430ac1e4203c3420fe655d6758864d17716839b957f2c9b301604cc1f3cef761f50ece23f50dc590aad8
+EBUILD webkit-gtk-2.38.4-r410.ebuild 8068 BLAKE2B 3ade4ee7198042166a27620ec2dda28df9dc7de8772ba83faa40d1888f8547effe66b591213d9e157436c65d2351976c4a3f3008d78fc3dd7f5265c5eea4626a SHA512 535d1349d6a87ee637444e5aa2334ef0394ba05a0301c58dee33027bfaada2ac3e27690fdf5e8f29c40db2cfb6c320202578be4ec1c540196d1b67981d8c8705
+EBUILD webkit-gtk-2.38.4-r500.ebuild 7948 BLAKE2B e7f8f3d52962072870cf18ec2e3d4bc08eb926400077dafc048cd9ac1b51acd23470bb05d5bd38fc3db72a4e424bca1fbb342a665c406934011b07b06a59741d SHA512 a170f03f6ae823878f10ce397b9420182de01cdb0c83e6d5141f723d30ba61d5ac27187b3cab6e73ba836f9f3f86750a09a5062f1ab34d91732ab9aeef33c949
+EBUILD webkit-gtk-2.38.4.ebuild 7794 BLAKE2B d24b0f03e0821777eb2e2f20e15aac81b84f6e9cc548e1e1fcaeb71e2c4d4e6f018d1892ef9c638e8ecf26e50b16252826eb78c4aed0bfe881d63047f74f986c SHA512 d396154d3d1ec44d9b5fbd59a5f6eb4e38d27b16289c68fd9534b89c8ea562852aa1feb38d249d39b5c45c2ccc82f8bb04689c3f403f5b234ec85c1f606f716e
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
new file mode 100644
index 000000000000..4439d16a0952
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+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-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	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
+	)
+
+	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 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+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
+	|| ( >=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
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
new file mode 100644
index 000000000000..172cdf123333
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+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?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	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
+	)
+
+	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 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+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
+	|| ( >=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
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
new file mode 100644
index 000000000000..34ce19042566
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	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
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/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
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3697433124a8..503be79c49bc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 8e8074a53073..6a9847453e66 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -3,6 +3,6 @@ DIST iputils-20221126-docs.tar.xz 13000 BLAKE2B 8a9dae136f6555ed933f97d26be82a7d
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20211215.ebuild 4754 BLAKE2B f5e6b11dcf1642695fb3fe8be537a5df04359d397c28f7a86fff5b11c8dc37743597df22721d41bdd8c45f3f06f76325c236e3159602b15bc8cd1200d3389c41 SHA512 aa0565d5645f4acba4bfa3ca6d425e2538922ec9f3405ba1f4542941e7f21f5399e8709b71d76292a927109911226cdaa2be56ad63b62006e59a759556747bd5
-EBUILD iputils-20221126.ebuild 4431 BLAKE2B 65d0a7ffabe59086b5206794f63135cedbf15ee0893867fe34164c033297d2c2cb1183e818d5c2d05dceccab7097d63f051692c16e5aaf19f20ade21a9d8afb4 SHA512 c9b8f1a9d1a0168d9bd7683bac4a768941e41221f138597cd3aa37a34f22b9ea28e68eeb8455ec218af76bebf385252d5f3c58dce70aad5348dbc6b947dc3fa2
+EBUILD iputils-20221126.ebuild 4430 BLAKE2B d9c7e626c6215fe2c2a5fd7bb29268baef9427c6c87434c549a3db82f09f422e075e93163f840194a87b987019e1a877c1d2b4cc5e83dee2f0ab7cd81ca2c2f2 SHA512 3ddbbbb538fa357a9846c96fb93687f7ec93c7d8eaff02f5d33df97d5e39f50874a0037d14bd03de48b8a81aaa2fb6f1efa923d7e6db5137c552261484cd5756
 EBUILD iputils-99999999.ebuild 4438 BLAKE2B b253fc86cf35107dbe8e164e2ef224ee07f1299c54d8ac8e38ede449e87214da2dd5eda26f3a73fcbade1a142bf457bf55bd253cf205be4bb9590264ab48fb01 SHA512 9f4f7ef308d09bdb1fb9f0e6733eeb2580864dcf4dc0b16f5843f8c49e6eabdcd4f6f33689d8401b16c9eb3397631651e87fd5d2478386237a158b0af830b737
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/iputils-20221126.ebuild b/net-misc/iputils/iputils-20221126.ebuild
index 66edc59df9a7..67616acd2ae3 100644
--- a/net-misc/iputils/iputils-20221126.ebuild
+++ b/net-misc/iputils/iputils-20221126.ebuild
@@ -22,7 +22,7 @@ else
 		https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.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
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index 3ffa9c65c5c4..2b5621a26ad6 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,3 @@
 DIST pssh-2.3.4.tar.gz 51859 BLAKE2B 788f5239cd35e240cc1961e73b532c60e5221ede9de48878f9636339b18235dc67109948eeb4f64871985bb24e1a7f823b1718da3dbe2ea893af58fd45495c61 SHA512 7abf327ca53dda2402465254e447eb837babdd2b4d865abb5b52a1135bd234694b84c1148cb3e4ed0198271ed29333fc1b5d0d01dc653fcf6d3e5b9f170b9d4e
-EBUILD pssh-2.3.4-r1.ebuild 744 BLAKE2B 66b9d6521a6f9fbadf32aa6b658bcac2760b37a8d9e9133b083955b494d2d99ba3aa9681e430efad6d32822c5394ac7a164b5d102cc9700fc4491d8a2b82559e SHA512 79e265d4908c0de2c73779623f5e57301eccdfa91a0ae9ee82244e4b2ae732bd8050970c54f74205d25cc0e8b95c03bf8f396dcda3eb11bf51260bea14ed3981
+EBUILD pssh-2.3.4-r2.ebuild 725 BLAKE2B 4f23897773a38711d92ff7f78b099e05c9939786986baf4011e8bef45df30669089308c4b0171098e0181fadd5e1d801447639fff1daf6eb2114f0221ffeeee1 SHA512 e35472cd4a3d1da32c7f4d301e736761789f501c4389c0a9cc57a27fa4f2befa7619e143038d1809cbd580aa57d07a121f5c089a5e49899adebf3ac166bb31b1
 MISC metadata.xml 415 BLAKE2B 86f4588a2dc1da92bbe426b844de02c18a87ff1b8f4566c63f48854e8b38ed014530e4d63b96a44feb6d1f41477ff9317a1b434eb74c83dc995f24ef2d7cfab3 SHA512 113cc042c12d46038f0a9f441cb9fd40f91d3c7b668bc9949786eb755754a45f17fcb478948fb21e7f669617a393939566c187ca06342e10017718384873bb04
diff --git a/net-misc/pssh/pssh-2.3.4-r1.ebuild b/net-misc/pssh/pssh-2.3.4-r2.ebuild
index 7a23ad7b74d7..68c5f74fd4b4 100644
--- a/net-misc/pssh/pssh-2.3.4-r1.ebuild
+++ b/net-misc/pssh/pssh-2.3.4-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
 DISTUTILS_SINGLE_IMPL=1
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
@@ -15,19 +15,16 @@ SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND="net-misc/openssh
-		!net-misc/putty"
+RDEPEND="
+	!net-misc/putty
+	net-misc/openssh
+"
 DEPEND="${RDEPEND}"
 
 # Requires ssh access to run.
 RESTRICT="test"
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 python_prepare_all() {
 	sed -i -e "s|man/man1'|share/&|g" setup.py || die
 	distutils-r1_python_prepare_all
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e7a3972784b9..4203328a58f8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 533a419c5daf..ec0e883f65d0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,41 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# Uses unmaintained dev-python/future.  No reverse dependencies.
+# Removal on 2023-03-05.  Bug #888283.
+dev-python/textX
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# Hacky build system that does not work via PEP517 build backend.
+# No reverse dependencies.
+# Removal on 2023-03-05.  Bug #890321.
+dev-python/pyFFTW
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# Dead upstream, no active maintainer, no reverse dependencies.
+# Removal on 2023-03-05.  Bug #892916.
+x11-themes/echo-icon-theme
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# Dead upstream, no active maintainer, no reverse dependencies,
+# build issues.
+# Removal on 2023-03-05.  Bug #892918.
+x11-themes/gtk-engines-nodoka
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# The package has been archived upstream.  It is broken with all Python
+# versions supported by Gentoo, and it is broken with django-2.
+# The other listed packages are its reverse dependencies.
+# Removal on 2023-03-05.  Bug #718972.
+app-misc/gcalcli
+app-misc/goobook
+dev-python/gcs-oauth2-boto-plugin
+dev-python/google-apitools
+dev-python/google-reauth-python
+dev-python/oauth2client
+net-misc/gsutil
+
 # Marek Szuba <marecki@gentoo.org> (2023-02-03)
 # New major version with breaking changes, mask until 2023-03-03
 # for revdep testing and porting. Bug #893006.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cc6cad85386a..8966c123acf1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 5a92dc91d74d..6f61e9530bb5 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,7 @@
 AUX kmod-30-configure-clang16.patch 948 BLAKE2B 35403640d79e60d1600abd676be818331ea975f139136bd60cd06df183768d78e11427505e7eda56d501a964420bff07eebff61e414655a7b043076e082ab143 SHA512 5f1b765ba51e224d464814247aa343649d1677f619dcca99d0a00ca244580443cc7615bf5291773062aa03cdeb42c7475d40da749c39d79907ae4ba0c9ed9c29
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
-EBUILD kmod-30-r1.ebuild 5466 BLAKE2B d4acfd95df6b6b45cb5af1aa1380961ecf1258998cf9af5a48e2b315b854a31e140bf8737ce6ebe4ecd8dcfe60a84f464137ca2b1fe86e5805c36e1cc6a9a25d SHA512 cd4a38562b4de7a5a8d76ce9f1d536c38c74595833d820e7f9fc14d7319b82f0fedf60d7ffddba59eb8762c91ecf1c44d0b3b57f7d18263f9236d656a71751c0
+EBUILD kmod-30-r1.ebuild 6142 BLAKE2B 4c6890d1c39df76feab8a5002de83fb8ca3c337c3e31fc7371753c83bd79c7831fc14ca29869e5bc1de5b924ba42783eac260744b6eab93b5f56586fc01c983a SHA512 c9cfa7a0fe01c925c60565b995883156b5e0b9f7bdc290d917d4a6e2dcd7de7b7fd1a23e9c65b2e984e49b6c94c1d519c66ea967ed77f2df6b256338a6c08e33
 EBUILD kmod-30.ebuild 5286 BLAKE2B abb956a6d6b60f47941bc754c7b4b902776b85b85a9d447994991fc8cb72b3bad2e6ce9ab50f8d4effc51500a340bac62200415110725fb40f40c3df2f176d3c SHA512 859b05e77b9c2acd45810442de38cceb244b4fd23b9410de890b544a39478db2b3ecc9c113d05bad2b742f5110af44966f898e921bd6f54cdea484b74ed1d7a1
-EBUILD kmod-9999.ebuild 5291 BLAKE2B 68c5805179c21c745991c8056d50114dbf07c8111e9e9349d878b067f63576f1c641e6d5aa87dcd0d483f0729b7a4c39355d35698fca7ea939e4ef075739a898 SHA512 6662392cc0d385d5c27ea118b6457622b3e05b653954ef35d1cbd50f969db230bb7b4cd6a38f34d64e0d41e2ba4252a46104f797a4e62901c7b60a83093096cc
+EBUILD kmod-9999.ebuild 5970 BLAKE2B 85950b5aba18c4050c8db2f63e8d513f9490d886541523e007890aff8cce52819a76506b8332a84dc052519095237b29de0b2ecbe193cb6e969d2326e184496c SHA512 149e16f86841f272f700633b39eafbe179d35efc4db7b06a51fe06562b210ecdb1e2fc0fac8fc5c644335a07f22dca03f8ae312eadc0c5d394da44a89b2e1cae
 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild
index 9cb6a84d3e0b..18c0daa0974a 100644
--- a/sys-apps/kmod/kmod-30-r1.ebuild
+++ b/sys-apps/kmod/kmod-30-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools libtool bash-completion-r1 python-r1
 
@@ -26,7 +26,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
 # I was also told that the test suite is intended for kmod developers.
 # So we have to restrict it.
 # See bug #408915.
-RESTRICT="test"
+#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
@@ -139,6 +139,25 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	python_test() {
+		mkdir "${T}/test-${EPYTHON}" || die
+		emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \
+                                VPATH="${native_builddir}:${S}" \
+                                install-pkgpyexecLTLIBRARIES \
+                                install-dist_pkgpyexecPYTHON
+
+		# Smoke test based on https://bugs.gentoo.org/891975#c5
+		local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}"
+		${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die
+		rm -r "${T}/test-${EPYTHON}" || die
+	}
+
+	if use python; then
+		python_foreach_impl python_test
+	fi
+}
+
 src_install() {
 	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 872dcbbc2737..50b51480db27 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools libtool bash-completion-r1 python-r1
 
@@ -26,7 +26,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
 # I was also told that the test suite is intended for kmod developers.
 # So we have to restrict it.
 # See bug #408915.
-RESTRICT="test"
+#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
@@ -60,7 +60,7 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DOCS=( NEWS README TODO )
+DOCS=( NEWS README.md TODO )
 
 src_prepare() {
 	default
@@ -132,6 +132,25 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	python_test() {
+		mkdir "${T}/test-${EPYTHON}" || die
+		emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \
+                                VPATH="${native_builddir}:${S}" \
+                                install-pkgpyexecLTLIBRARIES \
+                                install-dist_pkgpyexecPYTHON
+
+		# Smoke test based on https://bugs.gentoo.org/891975#c5
+		local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}"
+		${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die
+		rm -r "${T}/test-${EPYTHON}" || die
+	}
+
+	if use python; then
+		python_foreach_impl python_test
+	fi
+}
+
 src_install() {
 	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e8ee405332ce..1af486a586e3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index cd21528e750a..c99ec9db286c 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -7,7 +7,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kube-apiserver-1.23.15.ebuild 991 BLAKE2B bb3c113feb47d485aea4a430d91bb49a6de635a79d9d6313f1c0e4c6ccdd1136854ca631057352ad222c882d7f03ce0a3870875ea5b88379819b57b0712cb806 SHA512 d63508cd414eaf712aeb1e6ffae629289bf8a27b533faa547260ab6060a100f62bb6370d8ffdaa3f40bb680d137185b78ff49d20c023f37f95720c980f8c2849
 EBUILD kube-apiserver-1.23.16.ebuild 991 BLAKE2B bb3c113feb47d485aea4a430d91bb49a6de635a79d9d6313f1c0e4c6ccdd1136854ca631057352ad222c882d7f03ce0a3870875ea5b88379819b57b0712cb806 SHA512 d63508cd414eaf712aeb1e6ffae629289bf8a27b533faa547260ab6060a100f62bb6370d8ffdaa3f40bb680d137185b78ff49d20c023f37f95720c980f8c2849
@@ -15,6 +14,5 @@ EBUILD kube-apiserver-1.24.10.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f24
 EBUILD kube-apiserver-1.24.9.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f2406542f8bf35a7eb04cf70fa65717d3bc8f570ee4e5d1591209a2dcd71898060f2a18e63eba5edcda2cfeb141c92c86aac SHA512 745d5ffff353ff250f13a86e903a262ec8585353354664135cd3bf60f52b6bc79b66e61d918b98d6e4a6d6d7ca797dba90ca645e47b35b6181bf9c1d08404d76
 EBUILD kube-apiserver-1.25.5.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.25.6.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
-EBUILD kube-apiserver-1.26.0.ebuild 992 BLAKE2B b30918ad020cf26fb16d4a528e860370101cbf1086cc02c843a87b91fe5d85c8ae4adfdc35eb4001f680679ee9c63a6ebcf9dda01641add837ce84da66eebd34 SHA512 0459c3a30a6633a367fd69c421e7566080994cbade440ee438b91f628c4acc7b68c00c273a027eb01850df32a80cfa33cad678559661e06893b08098ee1cb726
 EBUILD kube-apiserver-1.26.1.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.26.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.26.0.ebuild
deleted file mode 100644
index 467da4d39d0b..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.26.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 2316d5f9f894..081dd6303c12 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -7,7 +7,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kube-controller-manager-1.23.15.ebuild 988 BLAKE2B d78d11bccea71b741539d4b4a0d97378f86b3db26dae9a768db40488f4c8b72d72057c8f165b62a536c2240f9a432f1d0fd0f98ab35883810a22358b210ddc66 SHA512 9a0e44f6fdc267eb3c7a1d9f0ea0ca7374d677a3f96a8e155c10a50b99ea4f5991b51b6479acbf7c47e4bbcd1fd118f20c30bdad9886e398cc8dbaf3b0f460b6
 EBUILD kube-controller-manager-1.23.16.ebuild 988 BLAKE2B d78d11bccea71b741539d4b4a0d97378f86b3db26dae9a768db40488f4c8b72d72057c8f165b62a536c2240f9a432f1d0fd0f98ab35883810a22358b210ddc66 SHA512 9a0e44f6fdc267eb3c7a1d9f0ea0ca7374d677a3f96a8e155c10a50b99ea4f5991b51b6479acbf7c47e4bbcd1fd118f20c30bdad9886e398cc8dbaf3b0f460b6
@@ -15,6 +14,5 @@ EBUILD kube-controller-manager-1.24.10.ebuild 990 BLAKE2B 92eed848da224757f008ce
 EBUILD kube-controller-manager-1.24.9.ebuild 990 BLAKE2B 92eed848da224757f008ce11565aba6967fbc82d5fcc5b3354db6f2bb6e75f3f4150b7ba352f4b3e8ff52100d81973ae417a89c58dbb5b8b8cb4dbe4fccb4a80 SHA512 51603722a1ad80474366a31c81f2ab9f4e4c679e1dafa9e64442f9de0c004e3f10e5f1f980e7ee2ed95308dc6f37425689d9e3daf14b79eab9469e4d63743f57
 EBUILD kube-controller-manager-1.25.5.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.25.6.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
-EBUILD kube-controller-manager-1.26.0.ebuild 989 BLAKE2B 7000dabd11b273b370c7f0b6b607962579e796d3de369f251df983f8b30a4db21e2e84fed99de11ff5530d1b58a5ef9d89fcf6040556adda9cb91bb230368067 SHA512 81a3f57b5495aedbb4f305dc476b15685461347393441d2c99f59759e24655dcd615299eb8ac7af87d46887f1c7a46a072350d1e0cfdbbedd0ea2677424c0e8d
 EBUILD kube-controller-manager-1.26.1.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.0.ebuild
deleted file mode 100644
index c4863b6e8840..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index d2f13c6d9d19..5f78a657c415 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -7,7 +7,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kube-proxy-1.23.15.ebuild 903 BLAKE2B f323a3ea9643d938ada5cc32708db2afe505a41b22b2b4cdf50ae1c8857fc1bbbdc94c8f76a8b74bb215f9ea78c05786fd29826e2bfc841af209c75026ec095a SHA512 6db32a0169b384b05a4034473d3d1a5e46cb3edaa1cc06359b6a8b262384944e667dd970062dd923541fc3d7f4015fa84243a16510f690fc0824406139141f1f
 EBUILD kube-proxy-1.23.16.ebuild 903 BLAKE2B f323a3ea9643d938ada5cc32708db2afe505a41b22b2b4cdf50ae1c8857fc1bbbdc94c8f76a8b74bb215f9ea78c05786fd29826e2bfc841af209c75026ec095a SHA512 6db32a0169b384b05a4034473d3d1a5e46cb3edaa1cc06359b6a8b262384944e667dd970062dd923541fc3d7f4015fa84243a16510f690fc0824406139141f1f
@@ -15,6 +14,5 @@ EBUILD kube-proxy-1.24.10.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d2
 EBUILD kube-proxy-1.24.9.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d280ffbedfb295e5d280f623f26a0eaf8f29a68d1828c76c933e51c7e333ef10193612a0300bbc752be72d624161ca9 SHA512 19bb1f3e56b65de0345656c3cc82092f8f0fc97bcfa80acbdfc8fa830790b0df55d8c862e2ed41471042560a81bad7b6323d87fce631d4f3f58d8f7b54a9be7e
 EBUILD kube-proxy-1.25.5.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.25.6.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
-EBUILD kube-proxy-1.26.0.ebuild 904 BLAKE2B abb12e72e4582a9d56311cfa78e81df9abce2ba772cd4f20465f18b66c0c1d1a0531fec677f06467342a5c20725f0f9fe3e5f83ef736893f15cd5bc3af85fc31 SHA512 6dba638ed80bbc7454392f06b79c056c2edbb12ed94dd46883942ecd448ad53c0e13faf56c6ea5d9be4cbf35ab935f0e062657edbe2bc2da0b2582b28dda8867
 EBUILD kube-proxy-1.26.1.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.26.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.26.0.ebuild
deleted file mode 100644
index c2bf8bb7da7f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.26.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 203d254e7578..8100585fb657 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -7,7 +7,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kube-scheduler-1.23.15.ebuild 961 BLAKE2B 4737ab433f0f13b64b59dd9f28aa8aa52d4902faa40e73dea042bcc205317247e74919c89af7137a250c95577d5c46a878c420801e9cb3b2074c730c44e3b722 SHA512 e45033e454248fc5f75634dfe6ae2fb851c20fe1f0ca8df8dd592bbb5e26b32ac35ea3a9cd17d6f9d0149d9900a30151b0ad3e144c41524f117a26411f2e7c89
 EBUILD kube-scheduler-1.23.16.ebuild 961 BLAKE2B 4737ab433f0f13b64b59dd9f28aa8aa52d4902faa40e73dea042bcc205317247e74919c89af7137a250c95577d5c46a878c420801e9cb3b2074c730c44e3b722 SHA512 e45033e454248fc5f75634dfe6ae2fb851c20fe1f0ca8df8dd592bbb5e26b32ac35ea3a9cd17d6f9d0149d9900a30151b0ad3e144c41524f117a26411f2e7c89
@@ -15,6 +14,5 @@ EBUILD kube-scheduler-1.24.10.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3
 EBUILD kube-scheduler-1.24.9.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3daaeb4931e24eeb90b054ba734ad0d0709c984a9705ac3582e0b2b94120dca7da6ce237c2e4dcef90e95dcc39350c9867 SHA512 d1ff91ec5189ca994d09074cd0bb8208bb704ed595fcf9d7ee4a1d3a2d8176c184dab79afdbd902728949f0ef98acde2f0c2b2de548c671bd077bbfdf1545b0f
 EBUILD kube-scheduler-1.25.5.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 EBUILD kube-scheduler-1.25.6.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
-EBUILD kube-scheduler-1.26.0.ebuild 962 BLAKE2B a2e246d283872bb91cf2db3ed38d5758d244a6b48fb2815b732659dc9132a04920d3349bda2828dd508ac00770e15655494e2e35c837ee890a1b124e238b2216 SHA512 8550424b4a34bcd3207de78e045b6c63b6859d8910b578a84f01b0d1b1c40c5fec79f770ee92685e660807422380bfdaf25c25310e9a3af24c45f46bbba3a1ef
 EBUILD kube-scheduler-1.26.1.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.26.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.26.0.ebuild
deleted file mode 100644
index b9b95df178b2..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.26.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 6f3ea3ce1d9b..d06f41e46af9 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -4,14 +4,12 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kubeadm-1.23.15.ebuild 938 BLAKE2B 155e43bf9093e5c2525cbed34062d9baab16fa1c871ac1a7de8d588cbf7260c130fac43672869ea84982165b71d93ed57b617833f59db8be5a1d9b6879fbadf4 SHA512 83fda72b2e331524c9019f6b98a9df1ff7f6c7d238eeab5f03e95abf0dfc7ff393e4b54529769ad781ed9df379d96bb2c72dd033f91bfdbd2bbf9354c0a8394e
-EBUILD kubeadm-1.23.16.ebuild 957 BLAKE2B c452e93c48730bbfe236bf6bb200902e62e3c315b8198dc3e33b3377323394dee2fc60fda09f77c22c0ae7cf25b09dde6b7f1bb94e62cf4962a3856d502fedd1 SHA512 36da0e31e0e0754cfa055e77503b0120974ba98d303ef6ba7c2275fb8695aa019a4a9ac33cfdc5fa217733e3ba3ffdc4eb417a8a5d20975f7e2a9dc7a05da393
-EBUILD kubeadm-1.24.10.ebuild 959 BLAKE2B 7b91a547c9d2cff3a5eeeb7e2ec8ebf589527473b4a363d0b2d27b3d601c02c5cab768d94944bc5d8c42a1585cc3948b0b9ebb0cdec811ce3934124f9cef4b35 SHA512 0e5a6cb8afee2ee9da7e1211c8ae5135681f87bda6900486e3d3317c9e22270e2fe754a0fb31cc1176141a528c14e64422430b7058b7e236f191212b2a94b3f0
+EBUILD kubeadm-1.23.16.ebuild 964 BLAKE2B b561fc8ed08d0d6858cbd26f3b2e8bd1ca1d4d8ca516ed2355252a645eb5d8a908be16cdbc3c1db6320b1e659d905f6ef34862368d6d6eb4c1d58f10c36667ed SHA512 6523aa8b36f424e9d5ed78eb138266248198d88509ea8f4a79adbbf8ac191429d3315c3e1e54a52b01b40cc40d2a4c34cb099f4c3c236310a27dc716dd4f88b3
+EBUILD kubeadm-1.24.10.ebuild 966 BLAKE2B db15d79a99cda7d4af9bc1e0ddbf91e17d2f94db50e62e60f45ed4b15ae70ccb8efee7df7b1f2aacce9a5bc7a60f58b852300b2eb80d44a5d28985a4bd223916 SHA512 58f98a1dd45ede91842e09d53d5f8c9c1c98f11e531b22db61abe3abfba4c2b005f255cf0fae6963546caf582dcaee7c9c0afc1ac585025c9cbe46d0a7337bc8
 EBUILD kubeadm-1.24.9.ebuild 940 BLAKE2B 13344c6ce122da92c287dc1d5c3de4b31abbb44a7f89cc6735f787d268fb6b069e1a5be3282244ad4a0bdfe65b49f4f9a5756e0ce5d22036c71cba94c15fcb4a SHA512 365e548eb3a76f7fed0b878e062d986ee117ad665569b726f7ef43f6eb9bea1119e6fdb12a49beb1855d22f576479913bab642c0a88f86d4ec40ef5f2cc9b494
 EBUILD kubeadm-1.25.5.ebuild 938 BLAKE2B 98ce4859f8557761fda9baa67f83400c4137c8f31568b79eb590c94ca4709366e3ad5ca6596ae0a9035e0c6aa9c5169be85000a8be0b466aed3d24a489706424 SHA512 f1b4e8f8948556d8cc69df167abf12c71af2ea30175dc2701dfe9cc857c2d1515f0d51d0c89330c77800dfcdebcebf003de665c8a837cbe31fc1efde9e27689d
-EBUILD kubeadm-1.25.6.ebuild 957 BLAKE2B 7348632f3e81352a92b60fe8f09af0d5c2b20e03c8a0670731342748bf82259df40a9280bf06df2dd73a446ec5d28cf3f0f32e67d3225451073277530525d234 SHA512 c7bdb2d325af3662a9022b6fa8c08dc09d2a3b670f0570bb570ebc731d537e129ecf75fbd0c5370fb03ce63516c9e766efe02a5b9438f0637942a8b40097cb19
-EBUILD kubeadm-1.26.0.ebuild 939 BLAKE2B 95e79218d9afedeb72b38c46e0fb44e8ea3516f259100f7c92e5acc43721e3ff8f78ce830b767684a27fe315db2d70a39fb95f979339a7495a6f7ba6fd6078c7 SHA512 335486956f2fe458d4fb5f19407be642ef88e89247c3d40040b91df36ec3ce8179aa4c2705199ed973dee4602c227547ada5dd6a90081bff59869431ed1dd5b2
+EBUILD kubeadm-1.25.6.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.26.1.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.16.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.16.ebuild
index ea9e33755a79..b72eb2dd6391 100644
--- a/sys-cluster/kubeadm/kubeadm-1.23.16.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.23.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.10.ebuild
index 628d0de43d89..75b9826b1578 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.10.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubeadm/kubeadm-1.25.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.25.6.ebuild
index b36b656b30ac..c428b054727b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.25.6.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.25.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubeadm/kubeadm-1.26.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.26.0.ebuild
deleted file mode 100644
index 797289e10101..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.26.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 6cf914adda6e..3a98817e5c99 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -4,7 +4,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kubectl-1.23.15.ebuild 873 BLAKE2B bdf194ecbbefd3bb2ca9d14f09bce834fef192cfd798874b515a2b62970cc52ec4b48b2f33de47226df23f51d14c62a3dea5993cade3832df6911873519b9289 SHA512 534c63d9c75e81335cdd24335e68ba85bb59fa6acf6fc952e5b5671905bd37a68158a0b2a41c11d962698ac26e0cfce2882bceaf48bd04c85c08bcc2420bd928
 EBUILD kubectl-1.23.16.ebuild 873 BLAKE2B bdf194ecbbefd3bb2ca9d14f09bce834fef192cfd798874b515a2b62970cc52ec4b48b2f33de47226df23f51d14c62a3dea5993cade3832df6911873519b9289 SHA512 534c63d9c75e81335cdd24335e68ba85bb59fa6acf6fc952e5b5671905bd37a68158a0b2a41c11d962698ac26e0cfce2882bceaf48bd04c85c08bcc2420bd928
@@ -12,6 +11,5 @@ EBUILD kubectl-1.24.10.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2
 EBUILD kubectl-1.24.9.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2f19906fa58c9a8898d286cecd402fd71148453583603f58c4bd534111bd492234090d1539ec4c4340b3c42092b SHA512 8e0c708f7fa34b4d4ce68af1f1c88e53fdd54875aca71b79c7af9c00a08f2b29ddb302a3159ee5b6975400b7fc4f51ac3b9e33b3e34fdce66f9f36e1b4ae7e30
 EBUILD kubectl-1.25.5.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.25.6.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
-EBUILD kubectl-1.26.0.ebuild 874 BLAKE2B eadc263a13607118043c218d4d69d8e2c6a01c19719358af019dfe15ca396b2bc8e1be4e49855ffbc6f4cd9eb43f5bd7c9d8e60ed45d85ade7c833e04008e30d SHA512 8d82593d7820ae864a3db4f64b139ffac451793a51eb8939901acdaf20f3c0c72b712314fc12c52cfe29556fbf98efc77c5f3a5dfcd09415bbd7152f01f0e923
 EBUILD kubectl-1.26.1.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.26.0.ebuild b/sys-cluster/kubectl/kubectl-1.26.0.ebuild
deleted file mode 100644
index 0a6d3b7c65b8..000000000000
--- a/sys-cluster/kubectl/kubectl-1.26.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 400e4d2806c7..fa7f17c34c60 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -9,7 +9,6 @@ DIST kubernetes-1.24.10.tar.gz 37847249 BLAKE2B 7f95f4ac29b5898033a8c19dc838eeae
 DIST kubernetes-1.24.9.tar.gz 37831367 BLAKE2B 695c5680dbcf40723be7075c71bef598d154aa7633b8309ebd6387e7c2d26ed82a37606427d5e7318eba8fa564a9c7832e459a2be27831d6d61bfb2c46fb273c SHA512 ad81acacb79ef55422280479307ae6134370ee0af7f8a2392cad87dbfcdecf57a96a0c4da732336b023ac7ed19aadf307b652d4c30fb29ae2f8c984183049c44
 DIST kubernetes-1.25.5.tar.gz 38145275 BLAKE2B fe152017f00e6c9760a122447ee6ac8053e3d6804a2d30a1ced3fa476e6ced110c3dd30f9040ebf320832fd696f268df2bf9463f349d4924c3d465322c8c2ed4 SHA512 6786dc02f7d14c3a974511542068649c6ffdba20c6d56fcb7df497c387f37841badf851ea01a3e6c9ca02732ea5e0201947a0221a9552c0c9340ff6410703b5a
 DIST kubernetes-1.25.6.tar.gz 38158861 BLAKE2B af116c78d216477ab757523f66b3332ef982b49384145a69d1b5641b0929b7179171814f89bbba1950b0ab69476e9e48722e8b9b04f0e77610d7dc602d4bac65 SHA512 47e0f736ee7efc614a2e8ed08acd95b64ee78484ac735ca515a03607634a9a94e2d7f3989db300f130506390a93eebb32fba4e54fe2869e3c782932f9b9a033b
-DIST kubernetes-1.26.0.tar.gz 40269668 BLAKE2B ebfa202d834d2560b3d1c3cced997796e1c1617b9975e47db0dcc8350541cf38781aa4e82c3fcb87476e84949058f9e603dd4040927773f04b35156b5df856ac SHA512 2737007c1525fc618b9843a15405024c1b4735be05bff7190f041e5ae43b2439d195430ef93f5b2ffb26d6d5394bdfc0bf2d03e0f104ddfe96d682b952cb001c
 DIST kubernetes-1.26.1.tar.gz 38162001 BLAKE2B e3589eb702da49786b3363c16a2a405721c2130fe9814c41af94c5d466e7946732c05da46ccecce915e3d80ea122c3a60d1c5b00a86cfed8b7238bd74daa041e SHA512 8794322c1e943ca47a059e6866bda9dee04acc8a202a984efe5c82403e394c4f5aa2c0218fb43582016c7276e17e837f64c39fc3af0c633461bf026aaacc97ae
 EBUILD kubelet-1.23.15.ebuild 1030 BLAKE2B 2f095479576a6107be2e30997068dea5a578d867463af5e046900d639256a1dfc5a586f8b6b8ccc122a7fec975b8857588c7cbce18fec688e5b388571afe6112 SHA512 0883f415ca5dafb5287c2f0a98b1eaab87d869a39ee335162a3655bd80393ecae0d81b676d8f6b0e32f77d6a821d774316eecd5bca57ba2fb0b1aec0e655f7f8
 EBUILD kubelet-1.23.16.ebuild 1030 BLAKE2B 2f095479576a6107be2e30997068dea5a578d867463af5e046900d639256a1dfc5a586f8b6b8ccc122a7fec975b8857588c7cbce18fec688e5b388571afe6112 SHA512 0883f415ca5dafb5287c2f0a98b1eaab87d869a39ee335162a3655bd80393ecae0d81b676d8f6b0e32f77d6a821d774316eecd5bca57ba2fb0b1aec0e655f7f8
@@ -17,6 +16,5 @@ EBUILD kubelet-1.24.10.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588
 EBUILD kubelet-1.24.9.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588dec6174f6f8c9ef3d7a060437e8903ba06cb0e494e5d7e976705c9900bda126a22799e7e243158d142ee32d3383 SHA512 cdb13abfd4a4bd0787ee8e54a1f03cf002d5aecafda79294e5789be3704b04561111cd4dfecb2b90c036202dc9e65faf85014fc67e8e5f3cee555bfae2a80423
 EBUILD kubelet-1.25.5.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 EBUILD kubelet-1.25.6.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
-EBUILD kubelet-1.26.0.ebuild 1031 BLAKE2B 81a7dec1302b00fbd5be0fc2233fccd5af6186c06dafaf423d26bb21b9c5c5c19a9152d0fc8f4765820f6d60ea8833d1eae21e1cf1cc81a9fd2315990592b665 SHA512 c81bbb12cce15e01cfba4f219c4578bf2a4deb8f775cf8b07b1763c1552cf05191bc5358453d1d9f381d13a63c999b5c6ac082e51e0fef6b82309e4d44656e93
 EBUILD kubelet-1.26.1.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.26.0.ebuild b/sys-cluster/kubelet/kubelet-1.26.0.ebuild
deleted file mode 100644
index ea082c4400a5..000000000000
--- a/sys-cluster/kubelet/kubelet-1.26.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f3ec9c05ae8f..39d5e3afe208 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index dd65e595bbcc..2ec04388c851 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -6,6 +6,6 @@ DIST hugo-0.108.0-vendor.tar.xz 5759708 BLAKE2B 6b3f93b0f29cb57afcb5a2e05ec2dc5b
 DIST hugo-0.108.0.tar.gz 29048088 BLAKE2B dd9654985fe0221ddb6b5f74c4d7f3259e587ee71522d6304d102849e63d2abd926987699fd7bac35c1a3bd5c6a195b4308249039d1a86cadae6dad641b75085 SHA512 450030bd657468bcf62de9d60def0c4f977ed4ba4b8ff830eae146622f678fedf656e3637bbdb44ac4289f857f5a1259ea0cfa66a45a14ea92860eee86dbf9fa
 DIST hugo-0.110.0-vendor.tar.xz 5792924 BLAKE2B a70283d9b5764c3340591e40d6472c0f14b029e5bed086c4f294951e00a45041a869868884328ea39b75caccf8e2089250a98502a3ec38c730989a77e55c976b SHA512 c6a0cd262934b6434eac7122a0ec257ca4eec1611b938585e6ee22d56991632fd5e52c061d552772e0e8bd10e13c23aecc461d52c23dff009e8e522b651642da
 DIST hugo-0.110.0.tar.gz 29055652 BLAKE2B d8c9e04c3141f02eeea1a951ba92c552148b604817e60041a3b944ccea37565ab8a6c3a47300877f5497d4575df4cdf598627d8dea65a1c935073b7bd8e99b70 SHA512 b64a6fa50201c0d95bf49fd0193138123163e0dad077491cc4c3e0d851de03ed2cd2e81482c1e6291d9a10d2d99f89c9dbbcfaafcd17f702906901dc6f28b3de
-EBUILD hugo-0.108.0.ebuild 2066 BLAKE2B 5ed9ba41c545ba7b2e1235d99f5b14e489c7717b636f2bd34ddb425065f399635257d67b60436d1b664890a1e113983a6d12f2b79c57375265d96545c5beb8ab SHA512 9f1856f332850eb40ac7e41553564a560ae962f8095b4c5a88b6ac41f0b0b526146d8cc625c7b5be3c122c87b953dd2b65a53c318693db632345460b208c609a
-EBUILD hugo-0.110.0.ebuild 2239 BLAKE2B 120ff878117345d308875305af81d9b3ddb409cbcfb1aa1064883360187494f76e8f96d55ee91eb4c6937b302dffdddb146dbae095636b560badac6672e9bcef SHA512 aee9480213491ed2de3bb6eb69aac94f74b70eb60e94b2ba4987df9e59109d25a703b03cf1800dc7a7f9a95766f1a0522a9672def3c45119851ad337cf6d00be
+EBUILD hugo-0.108.0.ebuild 2047 BLAKE2B 9058b679049b52ed6c3f1b5fa03d9e04f2b69bb856c876f676aa09c67fb1e480c1c9d186a84d738b217f095ded0776efb52e827a7bb1192a097d5bdad697eb54 SHA512 47f31fb83f172bf3d7fc080fa0ff9090fb267ac84763f144aabc49883ffd3ceb3c1dc5aba385b749ca603508ffc2ac081cb5b70953824db1226cd59459285158
+EBUILD hugo-0.110.0.ebuild 2220 BLAKE2B a2a6042fe55a4364ab4698c25e206c821358f856abd49a38644b2249ae1037cd7dc5754f2e95f3b2d5f41f783598515313ea31f83760a7d29029a464125e759e SHA512 51319354d6232377269a194a821923b6ee37dd2e9af304678fa1e88051b8f97f2218b2fb597e9f29f2f5ac0ed013b812016800d3ac325032e00b3adff6d29701
 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/hugo-0.108.0.ebuild b/www-apps/hugo/hugo-0.108.0.ebuild
index d755ec533746..8985198b2e7d 100644
--- a/www-apps/hugo/hugo-0.108.0.ebuild
+++ b/www-apps/hugo/hugo-0.108.0.ebuild
@@ -22,7 +22,6 @@ IUSE="doc +sass test"
 
 BDEPEND="
 	>=dev-lang/go-1.18
-	<dev-lang/go-1.20
 	test? (
 		dev-python/docutils
 		dev-ruby/asciidoctor
diff --git a/www-apps/hugo/hugo-0.110.0.ebuild b/www-apps/hugo/hugo-0.110.0.ebuild
index 36046e888d40..18b6e28bfd59 100644
--- a/www-apps/hugo/hugo-0.110.0.ebuild
+++ b/www-apps/hugo/hugo-0.110.0.ebuild
@@ -22,7 +22,6 @@ IUSE="doc +sass test"
 
 BDEPEND="
 	>=dev-lang/go-1.18
-	<dev-lang/go-1.20
 	test? (
 		dev-python/docutils
 		dev-ruby/asciidoctor
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
index 86acacaf584e..7e969108a19c 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -3,10 +3,10 @@ AUX miniflux.conf 809 BLAKE2B 4465c338fa13d3465731fcb98616d08d4fbcfdad6e10eb3f08
 AUX miniflux.confd 171 BLAKE2B 2d38a12678c7873ac31473a2160d1416d168e384c519fe48feebf4ea3d4e6c734ff198e652df8b0af7da5c3543eff5321a02b6991de131d746b89e3b5fb7db08 SHA512 13b43595e7a5bca01b9fbff9fc6979d408b32109bafc23cfae29a9470b5333a244ee1f1bc94ba436d93e2d2c55640690202ac1201884f9ea5499fa0161af059a
 AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28ad5d41c90f526c80849222f9255032fdf9fc4c4ba45d4989d0967498a5e32b326a6d966abaa4c84 SHA512 d58233009fd6c69f1095aa5cc62d08a910edaa0d16db3af663398d723873f2354e0d60c75ca746a281546d1f40ad0a8db1fc275ee31ed9e6958410b0b5f12afb
 AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
-DIST miniflux-2.0.40-deps.tar.xz 38331272 BLAKE2B 6fac5ba8bd6a8a6c2e7f14d9127be871f74aa5b170f2884f98326a6c362f690fd217498dd55c954459268bde4f17371335e832f474ff59ed6b00aaa080484594 SHA512 2e9104bbe32c5592fe88e5fc4f9c3f379b790ead74d6762b2aa4e933e0dce752788ff3ace8a4787fb3933730aea42fb8819af4e34c68474e388ad9c4e4aa8a22
-DIST miniflux-2.0.40.tar.gz 575047 BLAKE2B 343277ad0b89155d8fecdebcb77db4890646c04985d05479a47c5f9002185239f2a7707e5dc38fde1e733a613611cc66088b6481b599e5e6ce05aed43b261cb1 SHA512 e0f498da052256d202ba16b1f34022afb31db6d2f49236279a639e2c870e6e7f0e82b2995be6bc5ef2f6adeba3e2adf797b59ede376a0853da988eea7814512d
 DIST miniflux-2.0.41-deps.tar.xz 38330216 BLAKE2B 8be2a3b08de3dc56d384080268bb42c9a2cbb3304e387794e35530722ef8a0d13b765051c5e75577f6305953761124042844e5d13261d9b7ddcaf2a980196fd8 SHA512 de7dc72d18d75df8dd027eeb4c3517e02f9bbf8e1f321ea2661629514ba7671cb1d9f4c565d241d09d9e01ecfa7b3395080b47054ba4200f6cb4cda738430f79
 DIST miniflux-2.0.41.tar.gz 575768 BLAKE2B 8ba7207da6e627def71830c182ee7c95ed979873dae012dea4f76ac5ac10e036c0ef7ba1290af871b294f813fc8ddd978f169179b93e6b938d319b4b4102e41c SHA512 eb1be19d04f29e12a0aef3eca2f8494d46742bea5679b09dfcd43d10e4dc00bc4408fa0e52c71a744afcfb5fb22cf8f7fe2d352ab26c3a16fb2ffbdd0f4f9fb4
-EBUILD miniflux-2.0.40.ebuild 2598 BLAKE2B 5c888bbdddaf2fee5a64423bf460ab6fb1310c580c35d1a97cb8aa47674d488d20dd14a5d587f931fb193cb0c00b3c85d7de51df3a1edc81d5394cf9d13aeade SHA512 c2103b18e35670190133ce107b89c2a995ca1a3d3f4d35e5eb5f4c69edb528a1d21343e4f8933899d18fb23a86f3508a60df32301170fa54d91bd14dc60f8f66
+DIST miniflux-2.0.42-deps.tar.xz 38701596 BLAKE2B e73cdadd9c3b507d2bf3c361317d7cae5913865e5548d85e01746e49c5f17e87b1a1e688aee651711f6cd586ffe071b203f65a625842e7139f83d50c595c90f3 SHA512 a6299ccdf1192097150e366cf1bb9a5374ed980822d1ff124ae85defa7c017cb66e7c9f2d4a8ebcf28ac3c72ad36db133f85936471392450446457520346cb22
+DIST miniflux-2.0.42.tar.gz 577188 BLAKE2B 48f361fecc0d6e540c3987362bce6704d5eb83ad8cc4886a700b9eedf60e5b0b6f45494406ecf54675edd7778c1c4ed660bc5eb54b118eb05c19a006130cdd2b SHA512 8e3cee177e737d6777b37c632239e7100beb961e82842735b495eda1d39104c642047bd12806c110ff0d9cd76f1bb3475740063a34211a75d94fafd0e9cc9926
 EBUILD miniflux-2.0.41.ebuild 2598 BLAKE2B 5c888bbdddaf2fee5a64423bf460ab6fb1310c580c35d1a97cb8aa47674d488d20dd14a5d587f931fb193cb0c00b3c85d7de51df3a1edc81d5394cf9d13aeade SHA512 c2103b18e35670190133ce107b89c2a995ca1a3d3f4d35e5eb5f4c69edb528a1d21343e4f8933899d18fb23a86f3508a60df32301170fa54d91bd14dc60f8f66
+EBUILD miniflux-2.0.42.ebuild 2598 BLAKE2B 494e03ce855ad0684c86db000a45ee0d25ab0c8b5abfafa14562395715913424e9bfd8b26fc5de8302148fb9b9d201ff55cc17557094ca6c13de3fdc85de8d86 SHA512 f3cef801f145515ebc9d9a740b6a97467f4613c4235e7606f29b77c06ab3931e910d5b9be1082d3bf0f935319790f205378d8926249360dd5b6582cef86b11b7
 MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/miniflux-2.0.40.ebuild b/www-apps/miniflux/miniflux-2.0.42.ebuild
index fe9311206360..185b89d61eca 100644
--- a/www-apps/miniflux/miniflux-2.0.40.ebuild
+++ b/www-apps/miniflux/miniflux-2.0.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 58aba752f7be..07940385d0b7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 0c5c56bb3bda..f1ea128de583 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -4,7 +4,6 @@ AUX nvidia-470.conf 1272 BLAKE2B 842aff5a34a6f6e62a914ac42a5e11c9f620e580303c470
 AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef2b37317606bec1c108dbc56653898cfa9318de6e47df21e5b38943212caf13bc6412f2427fad7c534491d868d03399091e2146daaa SHA512 1349c1c715b2f09e64a5e91412aceabc80041d070a6bbacfdf7038872f1f4a798bbc63277d47a25d1a5b28b573b3d5bd6295dadbbdbf245f5cfb0241879a3bc4
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
-AUX nvidia-drivers-525.23-clang15.patch 3677 BLAKE2B bac9a6d47508f58bc6c83fe092ac3878806e541f3b1a5fe52e230693f07e5337ca2bb3efd58ff5d958de8e4db61782a502f9a77c5e805fcbae9e53220c43c0d3 SHA512 9aebbbd31d2b95e2ebaf590c06c221d6704c446fb30268b117a3a9e8eef2506d6bb0ce169b3cb83bf6c1819b2b8677297e105042291b4ba4926fb7fbf7212ca0
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-kernel-module-source-515.86.01-raw-ldflags.patch 628 BLAKE2B da490e4af1c898958df0ef656914e8bba3f7236fb1d2f94420a42d895d7f47ddc9cc173ef3b4b29f80ac880266767d54e76613dfc3defb1d4fe3f2b48377a71b SHA512 0a972c4efd219ddc8e814753c7c2bdea8fd0f0f3d2255bd0f9a4baab2a96319c8238cc027f602e399be9521467e110cffb1e0ee6b90f38867df49cd4c3b11c5d
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
@@ -22,7 +21,7 @@ DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb9049
 DIST NVIDIA-Linux-x86_64-470.161.03.run 272397700 BLAKE2B eaa94b7398b3aaadf30c33c95c95b167094ca56114e2e3032978b0959264ac8b8663181485eb1af0282a59b43f912c0ecd48e5eadcb06b6fda601b357ac49bc7 SHA512 26b1640f9427847b68233ffacf5c4a07e75ed9923429dfc9e5de3d7e5c1f109dfaf0fe0a0639cbd47f056784ed3e00e2e741d5c84532df79590a0c9ffa5ba625
 DIST NVIDIA-Linux-x86_64-510.108.03.run 329603898 BLAKE2B ec7327628cc0d5929f91fa7dcf09d741341b15a509169d8de187f66a99a9196077362bd9a370ba5e294fd644a3aee1bd3abfc45f20c9cb5b05660d299c9e0479 SHA512 70fbd91b0dc5db119acf20654854c417bb14889e84145e2675dc893e7247a9c34f90820cddb8202cf5c3219abc286c7014b247a2ce94bdb5681a1bca96f41a29
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
-DIST NVIDIA-Linux-x86_64-525.47.06.run 415511798 BLAKE2B 8b35774fc2689c0e51159fbe23ffe084ca670209906ca106fc7364c6fe631080f0a0dcaa2d99d34da084e0e72a41ac6741a7e7df828eb07e47729631a456b864 SHA512 7efe2ef0ee26e788e0e8c09da3f6ee7b56dcaffdffd611f6a6c0228181d618a0dea65a174b5a233cbfba497790f771f8948c11c7b957aa0863fba76781d16548
+DIST NVIDIA-Linux-x86_64-525.47.07.run 413838999 BLAKE2B 6921e903f45d49eadec8a690d8c86fefd0bc534a4412fa1a076db4b5cd2840c0c2c4076ab4ec0b562b9888bd4f0061f7d260c1e14b88653e912b17079e85d17b SHA512 51417a35a10a165f64751ce6bc7da2ab182d467bf3e6d3fac876c009fa413e044e16a1f32abbcca71209f8f29c2184c358aa9f88eddfb4ee80cea6817e1ee725
 DIST NVIDIA-Linux-x86_64-525.85.05.run 415131239 BLAKE2B 38bdcce884011cfc0a1b5d08807c0a163ac7807621f3ec69feabbdf27af9e0409491db893912776b05a45f8f56c06f281a84074ab8ff21a71774b890bdff2cf8 SHA512 db30b9186cdcf22b2dde267c08a10cadfc3d37190c57a26a71e282b0f661b187b5b28764418eacf8b2344ebfa8feb7480ae1de31b3bc3026feaf9482a3b51741
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
 DIST NVIDIA-kernel-module-source-525.85.05.tar.xz 10081192 BLAKE2B b80f1893fe18dcb62ad2d1daaa7c1642e8699c7acda0bf55a104e10824ece908e45e8202949262fce5459b3bebe3582fa52aa506333989388eea94d65e26da11 SHA512 1ed3e69d959d68a351541483cbf552730ec1748faee3bacf1b9f0099650bc3244ed11a4aee84e51187321f59fbedaa92d24a66439265c9f2e436db82a6876ee0
@@ -51,11 +50,11 @@ DIST nvidia-xconfig-470.161.03.tar.bz2 108669 BLAKE2B 6c12e38759ce64c5637d6301e2
 DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044daa1f2f2ed9b897b77f0453f67c7b03200cc09689b628f88a87c0f4c8ae149f11cbe6364eda34c2636cc1e1fce33b799d8225138 SHA512 17462e7826225804685eaea4dba05252dce138f95c72285abe607ee1b2a6269d2f4e5c0833802037d29350d1218ed9982053871b0b08c4f5f329d497da299fab
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
 DIST nvidia-xconfig-525.85.05.tar.bz2 110595 BLAKE2B 249263ad84c72c5682836bc3717774b95238197319a88b35adb9174e6023c385c49bf95ed1bf89a6d4fef0ba445a9802e437324358bddbe999f61849ea68afc0 SHA512 b2cad5f509e817e1e9f43bfce279a512d5899dbbb3dae212161b1ce7237ac3598e335779fbb7abb8b77327827838d7d310522f0b0a014498cff26f4ed5824841
-DIST open-gpu-kernel-modules-525.47.06.tar.gz 10299729 BLAKE2B 945adf90945a0935bcd3bc9eecb93a45b307b5a042baa474ee27bd1f0f404df71e1c3adb3c3544236d8742572d8dbd8864c9a6bb88ff4cdc6573837841967a2a SHA512 b92316d2a35215786bd0a645d9c2560e5c7db4acaf7ee000d591dfe95aac87cb56843f731b710308e86d8d1bdf0add12fe1d494d5750f2b0e23430bf2c50a201
+DIST open-gpu-kernel-modules-525.47.07.tar.gz 10306658 BLAKE2B 87243cffb77cd797eca51cf844c87bc9269f394635445043eaed1e554cf79341ba061aaab10018763baf1457c0ca54f1dd9cbdeab648cdf7273a2cd187fe5cfd SHA512 32948a8980e7240ee3d66185f2378e483b0a0b22513856fb22e09f91b020d3e6f4278c2b214c29a6c153cb375c3dcb6f5c73e5d22a00cbfc4bdd2e92f36ce94f
 EBUILD nvidia-drivers-390.157.ebuild 18429 BLAKE2B 1e2ea98beb53cf973c0318c5cbd30789c5a2533f3f82f1c7d0a33332379950b638f39e30c3f702aca8270e10950984c00a4e95f09ae25805d990084bc38d7e03 SHA512 388c84c2cd76a3eb85651a5f567105130250be78451e5e9ef872dba756bb1f9f3d0d93563838fa5c20afc8077a75aa30ceff409578bbcb5f7299e9df06a2c4a8
 EBUILD nvidia-drivers-470.161.03.ebuild 19402 BLAKE2B 9591b049c7a6f632f155e6f9e750d09c273b0e283bf97192fcdff873af8a6bf3db6a1dce2ebea46b7f5f08735ae72a8b297d1cfdb11e995193db6196d4f05edb SHA512 b47f60737f76cc7c24565868ca2c8a0e765e31643b200fb29ea181a73f563a64d660aeb2902586b7d618abe1b816cfa66d3aea9954df04a8af43708334df7873
 EBUILD nvidia-drivers-510.108.03.ebuild 19732 BLAKE2B eee07dcd758004f84dc0313194801bd3320dc75fba60b82125a8cdca46848ceec9d4873e91dd68b22f4400358883c83756895d2bf58abd4837e70f73132468e3 SHA512 4e626ffefa96437e924e3d93b59a73e4f2ce8f82696232de19c365c66f5cfb7a40722caf1d1a8c86bc32f832199dbef31f8187cc2d6adb5de5c66c7c5f2a6599
 EBUILD nvidia-drivers-515.86.01.ebuild 21987 BLAKE2B a62fd126b0d9cf4529a686121993cd2d79058956be5a70a90fbb7ba3d11fa5b4e44a3d204253d96b0d9e99a0a41a57a1953cc0c102e58fb98222e7174281d4cf SHA512 619c3cd6e12c025ff80c1c48a7f41b6271b89ea804fe1a0cf414af0623bda7fdca70bd5af494205f370e225d2307ce7e4f6c1a0857e1737d86d4ef9fbe267c03
-EBUILD nvidia-drivers-525.47.06.ebuild 21795 BLAKE2B 9d97d47df6484700db1ea2c926a7381205e730fc1c5c3e51e47e8bc2040acc1845e8b09b945232bcc1ce261a1aedfa8d9fd996117e8ce7a35772392393ba5d9f SHA512 9e4acf2290ccf19c04f0ba10df517fc775f0554c479d6a4d1d5c5d2ee8b70217cad5ca5915fc98dc6ec10dfd8906034a7fa0f7060be83196caaad8975b4583f2
+EBUILD nvidia-drivers-525.47.07.ebuild 21632 BLAKE2B c77d8a0ff9d893200ea787a1d54a082740fabbd09ab6f0001198a1bfc54300caa0977e978528a3be540cb280635122c532118a83641b31d1bd97b4dc084cd7c9 SHA512 69b4def463f5c9ba77fa1fbee7fd848c42ab5ce348b24884ad043eec86484c65c25dd4bcf5150099888bea271f5bcb8d97bb8681ea4c7c70ab5c104077b2ec1e
 EBUILD nvidia-drivers-525.85.05.ebuild 21620 BLAKE2B 673b6b64cdc4ad869ea576a2a9bdc0ee249e6eb5768cff5efb916787d4326af3120d4e26b116bd66230db0371b04b0437c96728b299d4d21d1cf4a167b9d1ccb SHA512 f141b6e88923f412f48c75d9f50215c04f8539d6008d7171bfa2448cfe0ea0ff390830b8deb296c2811ecc0360979966130cc36eb332f73c056832089f7c1d63
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch
deleted file mode 100644
index 74d022947992..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.23-clang15.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Kernel's makefiles pass -Werror=strict-prototypes which
-can trigger errors depending on compiler defaults.
-https://bugs.gentoo.org/870238
-https://github.com/NVIDIA/open-gpu-kernel-modules/issues/377
---- a/kernel/nvidia/nvlink_linux.c
-+++ b/kernel/nvidia/nvlink_linux.c
-@@ -560 +560 @@
--void * nvlink_allocLock()
-+void * nvlink_allocLock(void)
---- a/kernel/nvidia/os-interface.c
-+++ b/kernel/nvidia/os-interface.c
-@@ -1169 +1169 @@
--NvU32 NV_API_CALL os_get_cpu_number()
-+NvU32 NV_API_CALL os_get_cpu_number(void)
-@@ -1176 +1176 @@
--NvU32 NV_API_CALL os_get_cpu_count()
-+NvU32 NV_API_CALL os_get_cpu_count(void)
-@@ -1256 +1256 @@
--void NV_API_CALL os_dump_stack()
-+void NV_API_CALL os_dump_stack(void)
---- a/kernel/nvidia-uvm/uvm_common.c
-+++ b/kernel/nvidia-uvm/uvm_common.c
-@@ -37 +37 @@
--bool uvm_debug_prints_enabled()
-+bool uvm_debug_prints_enabled(void)
---- a/kernel/nvidia-uvm/uvm_gpu_access_counters.c
-+++ b/kernel/nvidia-uvm/uvm_gpu_access_counters.c
-@@ -1721 +1721 @@
--NV_STATUS uvm_perf_access_counters_init()
-+NV_STATUS uvm_perf_access_counters_init(void)
-@@ -1732 +1732 @@
--void uvm_perf_access_counters_exit()
-+void uvm_perf_access_counters_exit(void)
---- a/kernel/nvidia-uvm/uvm_lock.c
-+++ b/kernel/nvidia-uvm/uvm_lock.c
-@@ -337 +337 @@
--bool __uvm_thread_check_all_unlocked()
-+bool __uvm_thread_check_all_unlocked(void)
---- a/kernel/nvidia-uvm/uvm_migrate.c
-+++ b/kernel/nvidia-uvm/uvm_migrate.c
-@@ -798 +798 @@
--NV_STATUS uvm_migrate_init()
-+NV_STATUS uvm_migrate_init(void)
-@@ -824 +824 @@
--void uvm_migrate_exit()
-+void uvm_migrate_exit(void)
---- a/kernel/nvidia-uvm/uvm_migrate_pageable.c
-+++ b/kernel/nvidia-uvm/uvm_migrate_pageable.c
-@@ -1004 +1004 @@
--NV_STATUS uvm_migrate_pageable_init()
-+NV_STATUS uvm_migrate_pageable_init(void)
-@@ -1013 +1013 @@
--void uvm_migrate_pageable_exit()
-+void uvm_migrate_pageable_exit(void)
---- a/kernel/nvidia-uvm/uvm_perf_heuristics.c
-+++ b/kernel/nvidia-uvm/uvm_perf_heuristics.c
-@@ -31 +31 @@
--NV_STATUS uvm_perf_heuristics_init()
-+NV_STATUS uvm_perf_heuristics_init(void)
-@@ -50 +50 @@
--void uvm_perf_heuristics_exit()
-+void uvm_perf_heuristics_exit(void)
---- a/kernel/nvidia-uvm/uvm_perf_prefetch.c
-+++ b/kernel/nvidia-uvm/uvm_perf_prefetch.c
-@@ -428 +428 @@
--NV_STATUS uvm_perf_prefetch_init()
-+NV_STATUS uvm_perf_prefetch_init(void)
---- a/kernel/nvidia-uvm/uvm_perf_thrashing.c
-+++ b/kernel/nvidia-uvm/uvm_perf_thrashing.c
-@@ -1946 +1946 @@
--NV_STATUS uvm_perf_thrashing_init()
-+NV_STATUS uvm_perf_thrashing_init(void)
-@@ -2005 +2005 @@
--void uvm_perf_thrashing_exit()
-+void uvm_perf_thrashing_exit(void)
---- a/kernel/nvidia-uvm/uvm_procfs.c
-+++ b/kernel/nvidia-uvm/uvm_procfs.c
-@@ -49 +49 @@
--NV_STATUS uvm_procfs_init()
-+NV_STATUS uvm_procfs_init(void)
-@@ -69 +69 @@
--void uvm_procfs_exit()
-+void uvm_procfs_exit(void)
-@@ -74 +74 @@
--struct proc_dir_entry *uvm_procfs_get_gpu_base_dir()
-+struct proc_dir_entry *uvm_procfs_get_gpu_base_dir(void)
-@@ -79 +79 @@
--struct proc_dir_entry *uvm_procfs_get_cpu_base_dir()
-+struct proc_dir_entry *uvm_procfs_get_cpu_base_dir(void)
---- a/kernel/nvidia-uvm/uvm_push.c
-+++ b/kernel/nvidia-uvm/uvm_push.c
-@@ -292 +292 @@
--bool uvm_push_info_is_tracking_descriptions()
-+bool uvm_push_info_is_tracking_descriptions(void)
-@@ -297 +297 @@
--bool uvm_push_info_is_tracking_acquires()
-+bool uvm_push_info_is_tracking_acquires(void)
---- a/kernel/nvidia-uvm/uvm_thread_context.c
-+++ b/kernel/nvidia-uvm/uvm_thread_context.c
-@@ -104 +104 @@
--bool uvm_thread_context_wrapper_is_used()
-+bool uvm_thread_context_wrapper_is_used(void)
---- a/kernel/nvidia-uvm/uvm_tools.c
-+++ b/kernel/nvidia-uvm/uvm_tools.c
-@@ -2207 +2207 @@
--void uvm_tools_flush_events()
-+void uvm_tools_flush_events(void)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
index b11dac8478a7..cb22915a48a9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-525.23-clang15.patch
 	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
@@ -268,9 +267,6 @@ src_prepare() {
 	rm nvidia-xconfig && mv nvidia-xconfig{-${NV_PIN},} || die
 	mv open-gpu-kernel-modules-${PV} kernel-module-source || die
 
-	eapply --directory=kernel-module-source/kernel-open \
-		-p2 "${FILESDIR}"/nvidia-drivers-525.23-clang15.patch
-
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 0c2bb46f39ba..87c73bfdcdbf 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index f4b5d6c4fdc6..ef6994c12772 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -4,5 +4,5 @@ DIST exo-4.17.4.tar.bz2 895388 BLAKE2B a48f2c7f1509a41d74b924c428fd57b4801b9e45d
 DIST exo-4.18.0.tar.bz2 896849 BLAKE2B 99cd22b9f2c806907449afdd640abd85be2ec37269d0436a20300ac88ee4fbe39807e39ba51ae8fe82d621c478d65d1f452209779e7d48caee899305b40f3a27 SHA512 32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce
 EBUILD exo-4.16.4.ebuild 1169 BLAKE2B f10c409f2ecb2e12bcc5988fb75cfe4d9249a3db144af8a87e0458faf05e5e6ae273b36ffa042b0a2411b80bb83888b667282e830a63266418bfc8f5e85c388e SHA512 fa48fdf48cad6eb613d6047f4911b4eb4a347b0dfe2c8afd8738061438eeee61af99d5a2dc96b2f63446da785141ed91cc8fe998e40994f3f4c04e204921e43f
 EBUILD exo-4.17.4.ebuild 993 BLAKE2B 99f04c30d161263723a3785970bf1bb3043e854c3449fd44d899429469e9272c9b4c1bf0ece34c9a3ba3935ba9528077f724039dc033c2b11f9be7174b4317dc SHA512 c1034ad4bf41180a353d002d0c13ad9f97783b54d06f98d91808e99c428eb2f5b3b69a76ed4e1aeeaf29fa53d3aa75a3b2ea725c83fce9b3f92cdaf777d3c49f
-EBUILD exo-4.18.0.ebuild 993 BLAKE2B a366e84d9cdde22dedc23d2fdc5d5155e5e44755820d04458c98e6ec260a745eeb815f2282fd59e2510c5eb389c586d7afc3b39c6e045a3b3e6d7cda4bf68893 SHA512 ad0212f73423de60d7f0753590dfde799885a979b103997528e4fc5191d652f591414a876154dcee41520732cdebeffaf85f2563dc74452d605cd2b2883aee09
+EBUILD exo-4.18.0.ebuild 992 BLAKE2B d6929a14311f3b202c626d802e75fc38fb24b42480dc70d0877c11aff7acdcb120f658608bcbc61449adda96b0c9ad45b50c265a129a1b4d0827addf367f1bbe SHA512 bb0b945739536fa19314722ee79602183eef425c491e4c62d20c6f6ffa5a15371fbdc508968264c63bda365b52152509b137afebd8b7de6668a1c47edf496ec9
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.18.0.ebuild b/xfce-base/exo/exo-4.18.0.ebuild
index 8aeecdf83d25..1d0c03fb0242 100644
--- a/xfce-base/exo/exo-4.18.0.ebuild
+++ b/xfce-base/exo/exo-4.18.0.ebuild
@@ -14,7 +14,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 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index ecd8ca88a6c8..e3ae6737351b 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -3,5 +3,5 @@ DIST garcon-4.17.3.tar.bz2 550490 BLAKE2B 78b7f0770cdb6a6dd1e08b7732e8c31f13a9b4
 DIST garcon-4.18.0.tar.bz2 550674 BLAKE2B 93bc218c4455c61109ee7086a8cb822aaa154aaebd082c10ae9fd551019bce0fe68a117552c05fbe3a97c671036b5306703ba3c320d9b886715a83fb038c95b0 SHA512 c4b49ba47ac33823199a68ef9bdcba3acfcedde62a96a8a8b3af2bb1f28b3a5fe3e960ee93bdb964fbc01b039047d77f58fbe5b1f9fbd2ccd3d3f968e416a55c
 EBUILD garcon-0.8.0.ebuild 1154 BLAKE2B ee97767e67f83e9f34b56ee6e7d0190a9dc3a25741f46c2c05089a00ee69d45960dca30a3aaf639c1c93b397b943d16d307c97a785f8720f2298fdebff885d6f SHA512 faafa8105c8e31b8c8e11689f87b894262c39b4c825c990b49ea0f136634bcb75b2954512d4cb92e463f3e9ec14617ce0f9bfb14642f6d28fba1edfc57978eb7
 EBUILD garcon-4.17.3.ebuild 1232 BLAKE2B 872d11883a83dbfb004a498eca4700ecbb9536f3dfc61dfbb093a8dc4807cd33181ac85a996aa38fce1ba66c623563447e5bf0b5e424abcf6cf5aed6712502b4 SHA512 f95c14b59034a88f1a6b21ad98ef71ce30f405cdc12240a3ee9b962cd0c50babd272f0ba654a8ef0529a9dc00d77df8ae565a88954d176573f03c9fa20438cb1
-EBUILD garcon-4.18.0.ebuild 1231 BLAKE2B 369429a08d677da7c7a96fec062b1045a9f38875d8b6d3c78d51abea15d37de480f9bb25770214d1592e4ad51ec3e2b9303bcb41169158cb0aa19b4dd574f078 SHA512 007f2e41f5f7bdab0a8a4a3e9de2d99f756a14284a2462e41aefc4d880560597e22d701f8a27ea8dad85928855bb05df2485a0ad7ac372abe4e630f83b63fb65
+EBUILD garcon-4.18.0.ebuild 1230 BLAKE2B 8c860029b38381a22cdb3e0e59677a4b5401e5218fe88f87df3b1112de78c7895cb232f597aa63b0c5dd21c95a1ecfdac802ac248d7719127d358707a0b0527b SHA512 cce0a9dea70f2d9138c92567e20c2f61f7a43da2a61d6216b072bbadee6c9e45cc69ad1528b328a45d6b2d480e0b69fb424989e51a14aecb493ee7a72e07f5be
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-4.18.0.ebuild b/xfce-base/garcon/garcon-4.18.0.ebuild
index b4bff5e860c7..ed199fd9c3f8 100644
--- a/xfce-base/garcon/garcon-4.18.0.ebuild
+++ b/xfce-base/garcon/garcon-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="introspection"
 
 DEPEND="
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index df4201393541..a9873cac53f7 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -5,5 +5,5 @@ DIST libxfce4ui-4.18.1.tar.bz2 910047 BLAKE2B 196ded69668b27fd10d99042789e1b2b38
 EBUILD libxfce4ui-4.16.1.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
 EBUILD libxfce4ui-4.17.9.ebuild 1743 BLAKE2B 846c003a7e3f0c607d3e3e131428eef3ffb3daf7e2cc77b60c452fc8bc70b277d472f067700bd058f7726d134f84c17fc92beca08a8799c91d069fb8e74f451f SHA512 534f94650b3b8e308928432f379611cd8088fcc247ceaa1dbaf8f91517d46b00f2c3a774d0c664e42517651464234930becae8f0e3ad0d2eaded39c8b923580b
 EBUILD libxfce4ui-4.18.0.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
-EBUILD libxfce4ui-4.18.1.ebuild 1736 BLAKE2B 69909f9ed94d8e30ca0949dc19b6906e85854b44d97a346089592deeb1091d4e313c072525fd1c5e47a64dd0feda29e6fb0a5281a09e0c0ecbc519aed78b81ff SHA512 3dc435e5096bd43ce7c4491db72c107d903f22e0f9416b5c2b9df92fdd9aaf88aae2ab92bfcb51804ae6e8eb0fbf50f4ebefa405b5c14189f34483cabdddb10e
+EBUILD libxfce4ui-4.18.1.ebuild 1735 BLAKE2B aa04e06afc6fb9647c98646a8fd53cc0655eb228504a7e4ec272e1d9828e9c71de7629433c1de7fd2099ff97eae5b4b8bb29c9677672f2b5ddaef33cc13ca01f SHA512 42fcb12bfb162d2bb5e0fc6a3ee63350c17536642f905f790f06060b7b893f146186d8d67f1e04565855202966dc685bf7cfeb1055e6f609c00057e6be4c3dea
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
index 00eeb8e20873..18835d156ade 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 211d55688553..a94b5398f99b 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -5,5 +5,5 @@ DIST libxfce4util-4.18.1.tar.bz2 527167 BLAKE2B b5d16b4e6ce541a7de559eb2801cf800
 EBUILD libxfce4util-4.16.0.ebuild 1094 BLAKE2B 5c6da62a80dd1d3d2aaa77b771eea7b3c372d1b60ac1585cd6b40c6c0b36a176ea697522cc9bbbc179d566985b23156497a765871962f3a8dfe14f2e0eabc1d6 SHA512 8ddb4aff9b6c055e2defcb8375a7434db9ca0129ffc9590d937f2d2213f808e8e7ac21a9542888058108c0e237b6e23998de8426b5229549be8eeeffdb80f646
 EBUILD libxfce4util-4.17.4.ebuild 1056 BLAKE2B 034def2d188f4c372f961153a1f85892a7e7949181fed62ccf657bf1faa89dab92d2ad0757ded89a594b6f1f25c0e45ef0b9c50a4c5579f357aeffd3e409ccb7 SHA512 ed0f8c9475e597b60a2a2f2913ab6de100c1c9c6035529a2c0e48f512b76626ec3a2fb648a07eaa607fe556a2faccbd08addd93d72c2255619c52241a7a58129
 EBUILD libxfce4util-4.18.0.ebuild 1061 BLAKE2B 4950dd5229e5e12040e017e93316765a9126aad23bbaf12e0efd57adcd49f20cf31aa8fadd060ed38e00606724d2d3bb8f57e121d47cb8cd71c6ea61c289c084 SHA512 3d347a7b5190cad217225edd6d815f9cf3c72948e7046a1c83018565121b3a973812b623f3ccfebf4faec03144d7c89a95e92bb9f41a15c2606cbf7714e9d966
-EBUILD libxfce4util-4.18.1.ebuild 1058 BLAKE2B 8628c9a8995d0e549907d3a772a88b0cdf76f450941d367806965ca953eee03b2adc6d6493bd5faca341a32aae6c00d145390ec9fdbdae46646ac71f2dfbfb2c SHA512 6e658da2302b409a019b0fc374fbdea45b92c6f21b3862386dd11ba13f2a01a86d42f95e58ed459b59a938212dd1c24ea2dff3d65cfe916a6d7b82a8998b5e40
+EBUILD libxfce4util-4.18.1.ebuild 1057 BLAKE2B 875dd1d27b71a0270e6d394d873b173d86f168a3ea290138a6af464a8d6c06ce7741cc209ca7d7375634611ffb45475c908b130cc2f091d265a99a7c46699a8c SHA512 d21ebd78d95165280b69a66c79f162b117f7e180193bcc4a6476b95ff7f3df32513891aa3cc399ecb7381bc5d7b1f9c0a2e984bde0d478ac8a21872361855839
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
index d8775d671028..f11e2f6b0175 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar-volman/Manifest b/xfce-base/thunar-volman/Manifest
index a333709d09fe..7bd87d37f52e 100644
--- a/xfce-base/thunar-volman/Manifest
+++ b/xfce-base/thunar-volman/Manifest
@@ -3,5 +3,5 @@ DIST thunar-volman-4.17.1.tar.bz2 510275 BLAKE2B 16501dddec85811263d22b0757fe9f1
 DIST thunar-volman-4.18.0.tar.bz2 510289 BLAKE2B 6da7042d85fbdb57b811d1a08c1bdc0b0449b0c37013a37a8a19f15901135cea544f469c68de7880ca10110c9418426ecd0747fd00725077b6e171ec4a0cccf9 SHA512 29681ede6274e999377e2aae2b157ed355d9e471416db2d4beb4432f84c60008f8c5008c87392c20da51d58fc3bd8f097d6f21764903baf1a301fb00e6166420
 EBUILD thunar-volman-4.16.0.ebuild 1046 BLAKE2B 8976f7e52bc6766e18748e5058cfdc5b8a65e7371aa0e78e0ad78c426e78c5ac4b7978ac50e759527c7706e71cc09a6611edb7190f168d7b51ed8dec9d71f450 SHA512 a803c7ce7ef1b5c7c17b9e3577afcd6c66321faff3927ec3eb48c8cc6eb7305a02957ce230495cab2471cd311bbf0c4188ad0164ac4b3c027c16bfa25645764a
 EBUILD thunar-volman-4.17.1.ebuild 1092 BLAKE2B 1359509a4b3a23460b18a5c209fdcef56892e34f53030b3c55bc1d9c8088b14eb9cfd06dabba8987d11df0f5fdf2160abaf6c0b7d297935a2348a6311d8d5c20 SHA512 5cce78acda3980c49e223feb0ad9b7f7063a81ab0789b843fb29d523f690e86c4b05a7421846fdfd91cb3a0f8805586a2f879d7a7a6d7a425574c6159ab93f86
-EBUILD thunar-volman-4.18.0.ebuild 1093 BLAKE2B bd647c09ea58cec3665f35a33820cce3effdd525675ef94ae66928c4075d7ec89b5a1e05e3a0a999a288415fb2914166261d71c5af45430d98e03a17b3a5a803 SHA512 5192bf47087f15800ed35d55601663a61bcae257c7306b6bf64d636dacd412a4fe7e729ec561ef22732d9376799a77d92ff5b432e5c53f3d717077eaaa407eb5
+EBUILD thunar-volman-4.18.0.ebuild 1092 BLAKE2B 033c4ab735457a0d112083ffe10177fb41cf262acb321a80acce5b7e32131577006e8cbe6e1fa2fabdd79f0e488d210cebeeda932542f0ef0772180193677099 SHA512 bc3c7142093976a53ca2d2df80a6baeedc2194dc74f5baa10126c801f19207d106f858913089f10c8fcf4754031eb94a5f4212374d028b7b41f082edd7d370e0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
index 3a0cfa103936..abd4bf919327 100644
--- a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
+++ b/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 # CC for tvm-burn-cd.svg
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index a5a347b574fe..dd94aebe3bfa 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -9,5 +9,5 @@ EBUILD thunar-4.17.12.ebuild 2102 BLAKE2B ca9be20d00776fecd52e0e8845e5502fb9c653
 EBUILD thunar-4.18.0.ebuild 2108 BLAKE2B f75fbf9ca53a3c06655557851f8e16517a2707620dad3dc4d2e98210f7b2cdcfd961ad51b0c77aa4cb4fed917740111b8d7b79dc30025d2f960e9d29d677ad9f SHA512 9b44c57fcd98b854c0ffe0ea737147b9cd64c32b009237b78c74463d9450c81a1ee05288e8df4c1b8841d2bafe558583822b5b866bdf49887c83bc9427bfc9a8
 EBUILD thunar-4.18.1.ebuild 2108 BLAKE2B f75fbf9ca53a3c06655557851f8e16517a2707620dad3dc4d2e98210f7b2cdcfd961ad51b0c77aa4cb4fed917740111b8d7b79dc30025d2f960e9d29d677ad9f SHA512 9b44c57fcd98b854c0ffe0ea737147b9cd64c32b009237b78c74463d9450c81a1ee05288e8df4c1b8841d2bafe558583822b5b866bdf49887c83bc9427bfc9a8
 EBUILD thunar-4.18.2.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
-EBUILD thunar-4.18.3.ebuild 2105 BLAKE2B 4fee31d81ab8251627f83c18c3f64a6699a63744f5372357390446a1e68af6f795e2f2e91d748af0189d29b343e7bbb43abc8a83b04122ff8549d50e81d35cf6 SHA512 719c516da7835c4d1d3e8599c4398b085841dac828b1bf7bb9be67543dcddc972cfeba3cface478280d053f8e111e462fcfc0f04d0848e7c01a21dfc5344234d
+EBUILD thunar-4.18.3.ebuild 2104 BLAKE2B ceb905035e9a761440d8e879f95c257bfce381b7e304398ac6cc4a0768a19959bda09dadd6664ed428cfaf19c1fd665b8744454c59064c68a62ddb10f9f0823e SHA512 84b8c23fbbbd84df3e976747480c9d0cb4636e14f7141be77a971cd3f6f02a5d9df67d8302e2353d5c82c9723bc810016d63115f64b6899061b3985db60f4852
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.18.3.ebuild b/xfce-base/thunar/thunar-4.18.3.ebuild
index e5714204a8e1..d43d1ffa1534 100644
--- a/xfce-base/thunar/thunar-4.18.3.ebuild
+++ b/xfce-base/thunar/thunar-4.18.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
index eb85090c12c8..9c46bef8e4f3 100644
--- a/xfce-base/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
@@ -3,5 +3,5 @@ DIST tumbler-4.17.3.tar.bz2 609521 BLAKE2B 294adfb4e7179362d5d72aac2021c2eabf762
 DIST tumbler-4.18.0.tar.bz2 609664 BLAKE2B f18c8786b0dee452526b1fda34c6a1d442655d8c252cb68cb1593c121fb2daaee520cc7958936e6ba0492b2eddacb7722fde937092bdde91ca34d4ca3ab42667 SHA512 60f0621ab1a7a00909ea04181c7dfb733dfbb33219991b2f81f991c289428e026993639ee1ffa5b46dd6f35866e0a3ad76fadbd11eec5fa926fba0da2278b99f
 EBUILD tumbler-4.16.1.ebuild 1710 BLAKE2B 2ab8236976693463dd76429a5e95d460ee12251465fb464863003ca363586bef8c73be29e5efe309678edf9b536192f9180d7cc398eedeb45c6d56e078b5b3d3 SHA512 b2a116a3fb5a770ada139c6934034bd56a914655877209a270b66e580953252345775f45b169fe8ba1cd8eecc51796c8bee922d00211b900e04d8e7e905afb85
 EBUILD tumbler-4.17.3.ebuild 1803 BLAKE2B bd508e3e71eb61ea0e2a2abfca0930c061315107887f1a495441cd881b61dec35fb75416c2f522220eae03b98c75b56731b3360b757aa9ae5f008775a5da6f68 SHA512 bba90c42f2f405bb9767f25383e1fdcdc0e49bafd8f09b5497c42af666763a15298f3222d522f45f0df0c3e4aafb6bef37705f1465a7790f7e5464447280675c
-EBUILD tumbler-4.18.0.ebuild 1798 BLAKE2B a23ad087dd27f64ad7baa5d9469aee2c170efedc7439aa2a2c49d4148a52272481e61052077dbf8945ea406de9048b4c108fd30ad7464473314ac8dc0d77895f SHA512 28fde406f36841d16586967e37939e6eeefca620e38882c9a3f73d1414d2bf825b9ebcd4ec1f9551d9b6381baecb3dc10459196a6ff6ba270908aa6e755d764a
+EBUILD tumbler-4.18.0.ebuild 1797 BLAKE2B ff466a86591e90d329cdc0d3eb4b5e6b5398777aae432e2f4ec22154e196c4a9d14ff0dfba129b19ad2c1106f52d9be0fc333f98f4d372b098280234cca64dda SHA512 c9a5bc9806f51e1c67e430fc264a9262ee7ab9bd9fd4f4aa9bf164fdee8b2b30328b4c3d35a1a908981328db5bccc884200f3e52e2035a62be3b9c73643d904d
 MISC metadata.xml 470 BLAKE2B 0fe0650488303d2daadac810327d41b97e1b3b1a42d928865b854f5e74451d428f4b5e56abada30be41024916c8469fe7cd3da31da638343388082e38388f654 SHA512 3728ab31403249dc4c5e92b93ab0cd9afd82de2acacba5076d08c7c11cbdc426e5ff114ad2bc156731c24395fec80b0154274f18c4c0cea0d276941dc998b27d
diff --git a/xfce-base/tumbler/tumbler-4.18.0.ebuild b/xfce-base/tumbler/tumbler-4.18.0.ebuild
index 9286afa9b212..f577b91202c3 100644
--- a/xfce-base/tumbler/tumbler-4.18.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index c027293771fa..276d896dcd47 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-appfinder-4.17.2.tar.bz2 561844 BLAKE2B ae0f78d18cad4df6b21b05dcbc75a
 DIST xfce4-appfinder-4.18.0.tar.bz2 562219 BLAKE2B 05aeedcfe6b00509f7c87affbd9ee12d72ad2298168497fa957a0ec189f18348606ff29c177f4c3c5b3e9b7c937d67727828b97b786038ebfd03259f473fae0d SHA512 e33144910bb4391beb6ca88e312c592593ce50a40e10487c5b72eca492dd2f7c3ab7324ce62413ad6f3df0025de29ece96b5d0a566eecbc87bd1d0e62c9156ad
 EBUILD xfce4-appfinder-4.16.1.ebuild 871 BLAKE2B b54ed024531179a16ecfdf9b77be75a7b6fca66bb67ab00f0315dbcf0ca5b8831c5edbd6ab54f5eb24a2b07d49840644244dd5af28618c9dd1f2231a17fe3eb1 SHA512 8f8b6da5ef3a027bb42ef9a67f10111be66a5c9aa162b2336dc23d97eb9c7c7310b8c5919be2721f34ccca6d0cf5e82563fa7c6ac82dc332eeb42bce3e76fa55
 EBUILD xfce4-appfinder-4.17.2.ebuild 917 BLAKE2B c06d2b9bad384edc8328dfd0a36b9ba71d40956fe7e6672d60179f05a11edffd86e3925cde36544de2bf4fcd1dbf85ebd20d70d266b3cbd07cc0c76ed2e421b0 SHA512 0e21df5b096c3450644f40461fc43d55ac99c2650c48b892d27472aa01a2055078193723af87863abde3f432b746a7d6bda2cdb13efac60a4242b98f00d5aa13
-EBUILD xfce4-appfinder-4.18.0.ebuild 918 BLAKE2B 010eb61a7bd375cc7932210a7bc3d44f1d4d3a13fe372b17d916983b696492ea55068add3db4f379708489bed5f008c4eac40c64d2dab23f6160c78646025438 SHA512 e7ec3be16d67268b746435735c25d9410646d69fb7e72464fdab3ccb5aa9c1d9951a16b9b3906802b924a2787a264529fe797a44390daf6bb69b7c965a965270
+EBUILD xfce4-appfinder-4.18.0.ebuild 917 BLAKE2B 1662bc99c0caeb2c0ccefd30201d9caad81ab16853d3d2def0bb10fd0728922eca3b7277c170c37f850dcbadfa93ce80894869eb6761666c3e572b2cde0d0bee SHA512 e12d9c183474b1bdb6f2f9ef381a27e6327ac65026007634756d6c7f966a3e4f915fd43d8bf36055964ff78dc965dc5989ef87fbf28e74a873c531ee110e37e7
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
index 686f107c8c82..911ed9b1b0c6 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index 7f412d2bee36..ee6c1bf506f8 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD xfce4-meta-4.16-r2.ebuild 1020 BLAKE2B 3d3b13ab5a44455c3487e56a6a201373f86af0d9b0527287474dceb487f5d4be56a4a89112e809ee56056c3cda752d0e3c68845954548634a063516c4d0af556 SHA512 7682b09d986b9d9c34c46c367915aae397af1cc795f5c1ef68081b2f784460997335a2d58a0d13b1c3589baa5d53ad5d46bce721f5c2bd2024f1c8b4db502b4c
-EBUILD xfce4-meta-4.18.ebuild 1042 BLAKE2B a3a9eca694da23660b8456dc377fd26685ca1b7dfee26d22b5bd1970d6a4cd1156552bda108d6284aa26b90247c4e2f88d6aa25fd45da48090c938996d6c9463 SHA512 8cea035bd9d0f6c3835530ade239658eeda18e7961f54dd0784d87171bd7a32467e19997f2366c2eaf4fb1883d7845bf26f9f61a07186874da7303e6936f4766
+EBUILD xfce4-meta-4.18.ebuild 1041 BLAKE2B 7b9b8c33973d2f61ce932163714f0dc143ac5d6947ff69191816eeabded351e794fd280de2d3456693b9bb95be938fa82fce4d2fd096da88a729eea3793e7d39 SHA512 09f4c53faff43171f52f1df30212f4ebbe92623c337cd100f4cc767da3d6d9576d442a493fcb499c9c156427132c3e30fce97f027e96ff70e8230d6ce3b3e024
 EBUILD xfce4-meta-4.18_pre2.ebuild 1046 BLAKE2B 791b8dcd5ed51648e9adc16f2aaa77249be01c85e1279afd434cec51c857625b7dfc17c63fff524d42480a42a60b0892dd9808f94e78c2e68525361a1f90c029 SHA512 63b7561f7b76d3a9f796f5c9fca5990e3e9adc50d3c1a714d60b6c124a559d20ab12c887419d6bd0f71094edca66ba4a34ba388d3416bb2eb3508de6070faac0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
index d8e7c80c8216..80500ff20b60 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.xfce.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="minimal pulseaudio +svg upower"
 
 RDEPEND="
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index fec1c5557a6c..0dfe42e4e6f4 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -6,6 +6,6 @@ DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254
 EBUILD xfce4-panel-4.16.5.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
 EBUILD xfce4-panel-4.16.6.ebuild 1511 BLAKE2B f3e24b8299e0e84c1553445c8b825058cb44923286befac2b5520df5c81b3acfabc418f116820caff0df2301ce64c79cc67eb77113e070157da1bfa7a81fd39b SHA512 106664e1351aefcc902717c0b60fcd090bfb65b791dbd9e8e12fc3326002a0444ee4baed03a141187567741ab859901e8adad7f676a1fee3aaffd1d2f6926210
 EBUILD xfce4-panel-4.18.0.ebuild 1596 BLAKE2B 6c2a566c4e4725f05d56fd15e6fdf13899b56f465f6d2430a2fd5efd7d904240027b8385dfbe93445e68a4a541adf987f23c95ee731fa773b4c56955b3691f7c SHA512 a6f20cd9f93f89265d41f512e22868390009e0cd636dd0c6736177b2382c9ad9d0b931dce571d742a72aefdea9437119b3dc139a113bc437044c29a449d13164
-EBUILD xfce4-panel-4.18.1.ebuild 1593 BLAKE2B 604fc20ce63c83ad16560c03d3fcf8653eec8e39fd4fd64040d2c6966561ff8412644eae8ae03bfd269989747d7e8ebd246bbb9845769158bcda7ec232228a04 SHA512 15ed62bd61525022518910b4b26d9c4778d8e8ff88ffe1f90e0570f50ceb38dd48958314e63499a6dd2b2e6b03bb7a26793edc646b76afa14f984be0ada98ff8
+EBUILD xfce4-panel-4.18.1.ebuild 1592 BLAKE2B 884d225894ef9b0c1ef1264fad2ea3b075db9feb60cb6fc05e7d234fdc67e5b0fe03eb95e814312b4feba015d6c126b28bde9dc02c0d1fe0e923439e0f757184 SHA512 20cc51221cc641110738234caff57f1dbf9845b964f863743f631e2d6125f54c244d817f3c05786e039aab00a3aa05fdc8c040a8f3312e659bbb20cca3f98498
 EBUILD xfce4-panel-4.19.0.ebuild 1821 BLAKE2B eb4a2619a747ad7fb4570700dfaf2a15c44f8d2309d65ec11daea44ccbe7dba5598a1b47bcc5b98f11330d532b2a8fc7a4d2cb273a00019dfedb657d957f879b SHA512 9972686996e17cd907e7cc03c56b6ba4ac3c4908893cf4ecc845bbcb7bc33bd77db97928022c6d5995bf9a92b67265a09fc33f254953be23182825057084a4dd
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
index ab7cd82e3c01..575b36815628 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
@@ -14,7 +14,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 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 339f1a3cd4d3..043ed37d0376 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-power-manager-4.17.1.tar.bz2 1239323 BLAKE2B 204068b3762859147d68b5cd
 DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 EBUILD xfce4-power-manager-4.16.0.ebuild 1561 BLAKE2B 767541c3ec06bfa8e4f74774e5c14fb1aaf666577253744ce7bd843c97d57e64c8aa4999cd25ffe1c43df043c3968e7ab35623ae34716800de763b3c8dc95a8f SHA512 11d6f3460d3385fe853800e27f43ff565f98e48ec2941ad63c6e6468c92c136fd5fa915c2c9d9a1607d8b55eb471936d4437ea8b2130f1c3b72de70764c6ee3d
 EBUILD xfce4-power-manager-4.17.1.ebuild 1616 BLAKE2B 1350e058fb119325a6825c8e92f7dab6934f9689cb827a171981e1afa9debc7442211f35a314525406c8ff212bd5d6bc0c0692a4b3c340c6ccca8594992d9d9a SHA512 a990377807b36ff69119b3d32d2e41699543bc3c577d6f80b7707195a80c0eed1f0c331e5115a25bd47cb098f4ef8133ef7221e7547e98f9a6ff7b489f6899ee
-EBUILD xfce4-power-manager-4.18.0.ebuild 1617 BLAKE2B 9a4f52142a8d0df80c5483d92c37e405c2c2ebe2726d7a639c9ea254911b1adc2bc2c1c96dec95ffac0c4d3acbd4722e43cf4dc2fc2b1187a2e22fdda7be383c SHA512 c839266ce31d5dbbaa464dd7c770f3bdd37792626babdb350508490a0a55d034220fe0576b0bfa4deb81265a9e2a5fee6a5135931b488002b10842cad69132db
+EBUILD xfce4-power-manager-4.18.0.ebuild 1616 BLAKE2B f19eb8036cc515f02c0e1c515ecb5db7b912e0b144f99bf3e90ff7d235f2335c3131b3555bb0c0d873260104e77bd32056e489cd36c1b4c8fcd2d0cd2f14eb9c SHA512 0112d2577bbb1fb8044bf9b9b12edc415894ca8e85fe9008047f94f82417b0a91585c741d6044a026c365b726da10ae975475c62c33063b229028e7b77931398
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
index d91f2406f9d5..c07f032b2d59 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 03099e82c989..f014b0833e76 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,5 +4,5 @@ DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B be74ee215d687b2f01c39e73ece4645
 DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
 EBUILD xfce4-session-4.16.0.ebuild 1757 BLAKE2B 56eb10e1e704543a9469aba7bb7f294855a7d844433723736fa7d3fb99e8d4eefd893d45ea29a731cc0315fdefb03f08144dffa1af931c6cab155d7c72a836b3 SHA512 3f8346a8b9cad7f20f19e13ec25ad3621abdfe540a76c6c2b347bd9524acb59fb6a6d7b8503af24ab75d76901c868b60ff25dfaa595fee378100cb320efe71ae
 EBUILD xfce4-session-4.17.2.ebuild 1513 BLAKE2B ab88ee446fd99e8dd2e67da5a65e23dd4640fce3a35e3156ec2c6470be2e06c7d24a54cbbb588380957e9e9f1761c8fd626236365ca37bd203d4767840ca8101 SHA512 ac94ef2d3299d48bb7fce89edfaa8f88bf96120ef4ec1f3b990d805fa893017771d12ce4438d1ae5148487c91f12a7fe31b5a56591a5c1fd0a445981079f6152
-EBUILD xfce4-session-4.18.0.ebuild 1514 BLAKE2B 75c73f7e01cc407042681efd1e2954448f6a266ae422c45eaf0014a98344e46216d6fd4ff8af968739ad0c5e7cddf069c0276eb7fc4ff6819a68d3234c92e896 SHA512 31ee859f0c2d5275c69fa1ec507924d16f180035d8ad457fc9d2db1106ca6c86366398d2e6e0c03b2da3002b14af9f1547cb572143d107e8f7cac074d7b24c15
+EBUILD xfce4-session-4.18.0.ebuild 1513 BLAKE2B 5e28ae725ec70a17ae20806ff9c93a8b225a6d4928353ce479b204e44ef29237ab9e7f03c8e5c4b5d14f05033bb5a295917d4b5932434d10ce9e1a38bbdb51fa SHA512 807bd2daf5d53eab5b1dc25d8f755a7d5555b0f0789cf71721415eac72960c21cd522753c14a61857785b085d094b5b285eb5c4aa296756c075857459a5f6a3f
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
index 885639b0585f..663c4ae006a1 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index df8a18f7511a..82256dd8021d 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -5,5 +5,5 @@ DIST xfce4-settings-4.18.1.tar.bz2 1513041 BLAKE2B 83b47dbe138bd809391833a4525d0
 EBUILD xfce4-settings-4.16.5.ebuild 1761 BLAKE2B 70022b27ddf95652b89e0fac59547ce8e1c77fb53b2a470645938ffaf3d55de57aa0b3fd8371553558faffc93b3ed485be7e20aeea74fcd599c3822f57f0fe37 SHA512 d1a8117fe70dd793cf9780e767a7633a8f18923a9df622848814650a9559a87b2bbd317f0acc54b17f6db70d4096b6d0cfa7d34db861e1434c86e2be74ed51c4
 EBUILD xfce4-settings-4.17.3.ebuild 1816 BLAKE2B b9749632f84e4184516f8530c6e41e0cc239b704ffec9fd23cc849f3528607d82c179460a01a408f428cb84bc90aab232d0462b790c455f70434b99d70c5effc SHA512 53def1ec0d3d9ffae0ec7f7308be93be7a8df4096594b780ff5d8f33eda8bd860de7aa44acd70186bcae8452c6bf0c81e00eef5755ce0f697458fe3c05389bf7
 EBUILD xfce4-settings-4.18.0.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
-EBUILD xfce4-settings-4.18.1.ebuild 1817 BLAKE2B b79ae2dbb1f1e9a17e8f80408580b8f4410e872406f0b1a045fd42fefdeb69dedf9083063f61bfee9e314b665150713b392059b83714874aba57738ce9510673 SHA512 75d8a127c7b8bd6bfaf059946077f35eb57a13b1bec2555c628ec1b0742c1a373056094c9e5ec49a93735a273cfab277631dd03532973d3a8a1a8df6d63a5657
+EBUILD xfce4-settings-4.18.1.ebuild 1816 BLAKE2B f32ed15d5a39986a0f0a4b86c90a7b2203825a4c8fb858b1787b7ec36e314252663ff8ae933ff43992e432c4f043641a2d96483c564a3a57e9511d5c4d6ebb62 SHA512 423682bf72bed5d767dbf33955e855356ac9bdf50d8d44c2baa7faba8ea4b0c99085666ecd6ebf15131a356ce2aac2d94e9c6184c59039fb8940ad5a0c6e742d
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
index 4439ae74586e..3a858cf8b299 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index bd08b917785f..7faf74dfea0e 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -3,5 +3,5 @@ DIST xfconf-4.17.2.tar.bz2 625124 BLAKE2B 173f50ab3b0ded6b62bb421006588be6624289
 DIST xfconf-4.18.0.tar.bz2 625755 BLAKE2B dac7ccd7052818436f45e6c257cc6076221d9f5d7c2d836d909be0d9479abd88f6c17748cf0aa65be79a0642c7bb7ebb01b6cd5a22bb22d514fc3ed57be5d4af SHA512 49ac3070e44e0c699c157e6c029bf14d932bc1e60b01bc3b4f7451acf403d451ac52e2dfb14fc97298cc774c7a0895616788cdbfc189976805669fcdb7aa47b6
 EBUILD xfconf-4.16.0.ebuild 1777 BLAKE2B 8e67eafffe8f5d85accd4973385a8ed234e7d363f89cbaed42bc3df5df233f422f2226396f2cb6d80d93f52775ba616362eb79d7484735aea60971ba9b803bb5 SHA512 9d11ecdca867cc4b9c1f16bd382eedec0ca1c5209040a7e3771ef77f56f407fcf2fb363b5f3e171cee856020fd47fb8df476c1aea74b8d482a0536e27befe38b
 EBUILD xfconf-4.17.2.ebuild 1722 BLAKE2B 0e519d0736a5f1e0993b341260cfca7c98c8c12d3b912e7d5f76d3acf03aa3d7b983a1a2a0de221adb37bc63aa1717686b8786f7df6caed5cb9b67f064ad9a7a SHA512 620b12741a74915f4921e6824066f1bd5dde191691c60a5e75ff7053564c8d16910e47b1e7baa23ada45731cf0262c9f115ef9ca3343f3ea95b97511c8c26ef6
-EBUILD xfconf-4.18.0.ebuild 1721 BLAKE2B ffa34f1d5d19a201c80f1260199297fd9b700ae4c809543e80a14ed52780aeb73d97fa33c29c81f1592af2b4cc94ee64658e09fa1dd783080288b8a4439c81ed SHA512 8b007f0ba7ed39f3eea3003ce7bbd835819033d6b5697a4a95fb5770933459e8b72f275a027ed39d100891104c3f4fed58ad4e4ee3b933c21561e3c192d65025
+EBUILD xfconf-4.18.0.ebuild 1720 BLAKE2B c3195f6136dd5c3c4e2646ddaeff30ff48ea9b220512edc1a1f4425179aa2948d9126194a48d0dbc3ff7121d4facab0dc3ac4dfecdcaa169df22370dbe62f39c SHA512 dee4222dc8e9656749467480f0a73e36b4d5552fcd5c407bf7d10c95194ad7198ddfb5a5a35e7799144c82fe91f2516aafa3c84309d788e8d38aabb7be9accfb
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfconf/xfconf-4.18.0.ebuild b/xfce-base/xfconf/xfconf-4.18.0.ebuild
index 0c8983358a81..2ee9f0c60e13 100644
--- a/xfce-base/xfconf/xfconf-4.18.0.ebuild
+++ b/xfce-base/xfconf/xfconf-4.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index c37fad57fbb3..e0db0b13b31d 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,6 +4,6 @@ DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b
 DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
 EBUILD xfdesktop-4.16.1.ebuild 1177 BLAKE2B d4d5846b53a75b05f07e762e2e8f1f05517c873443de32f529f95dd5c7768748019fb26f19bec1c32510b45e00af1966df660925eca6ad4e2af21808466bb75f SHA512 c5e7d0e6c532aaa980f3477a2e6a7e7e2f2e69c0c76d088905a37b9303c251cc44597a7339f472321edcef54f8b001e6eb377b2b333defde76f65d8a7d614ae8
 EBUILD xfdesktop-4.18.0.ebuild 1248 BLAKE2B 81a722121173ba40b2da39129eaa9dafb48d0e3674dbdd1d7f90f2f41ab55e5189a586098373ae26242c10f2337dca42bd3385a681582b9f836bcff36266aebb SHA512 1a059a651021f931b9c4ba423113efa7cea3951e85f7453f9f71dc58260fb909076af812b72abbd34bcd3b28cac2c8592a4c3854dd761841b9289bbc01bb5222
-EBUILD xfdesktop-4.18.1.ebuild 1245 BLAKE2B bbc0a27f76f26e8ff90660f6fadbb883da4a3ba8e701f5aae9f43065f8855248bff1e5b86cfa24f2446ee46f69f37f7c40fa12df38b532655729d685af386b5b SHA512 7eb8e433daf1c1a87190ff317a23a3b38fedb2f3d769ff09acd9a61755e55337e72650e165b134f69440443036fa8ef05ad3a93aaa613a1bf2a5ab7fa90e0152
+EBUILD xfdesktop-4.18.1.ebuild 1244 BLAKE2B b0a89198e6bf65a8753316bb80dd832e080fca928ca5391a85202c869e891ea59eb7222eea0e38aedb98a6995e25c5a3d29f26cc354910ab9718975077cf7fe2 SHA512 a8beae8b39215be8919215756f17e57ce1b8a770cddd4e55d276a03721cfc24cf232bb58311709a8de4b86215310c686bde223c51d38fe7702310e78fefd6a59
 EBUILD xfdesktop-4.19.0.ebuild 1373 BLAKE2B cdc7637b6904754889ca3f560f53f19d4d7bc49d773933fe6a12fd0d22383ec4fa8d6a5f2aee8bf2c0dbe889e113d7bdeef679858baf50f00567fbb245f1fb1a SHA512 82ce457d4be3828a17f1b959d0ebb1c1a9582e7cf36f3a7e16abde90adbcd492500e144eae5c5f39488cfc3d0e20b4217057788c76b13c6185aa4f57e1bdcfc7
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
index 1100c1d3e7da..08654f324ff9 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="libnotify +thunar"
 
 DEPEND="
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index b04add28fdaa..20b71f957f38 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -4,5 +4,5 @@ DIST xfwm4-4.17.2.tar.bz2 1220699 BLAKE2B 4bc011f17ee7fb662e4bb0c656056c45bfb2a0
 DIST xfwm4-4.18.0.tar.bz2 1220901 BLAKE2B 3a3db6368063b94fa46407fbf2173021a91efff04ed3d11c757d3e785de5e70289ae03e138e95979b3801a781c05d5f84b86b29727171796e1b80f874865bb36 SHA512 1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d
 EBUILD xfwm4-4.16.1-r1.ebuild 1710 BLAKE2B ab3b17a6e1e5b4ce63b4f88de63be547b6846d98fddfe42e699becf94da853d062f1c0f6e98e19aacd651c1315a26f8fc62740f736dc613a9ba4397cf0b0be30 SHA512 49c7772e05611ce483653a1708c6a2420806e0c6c47ad7f9e71d96ded4f9534db62791c7c7861d9d0dae97e0cdf9f55454f0121b42d21630351c9df59765e9fc
 EBUILD xfwm4-4.17.2.ebuild 1548 BLAKE2B 06931b5759a4d5823874144871f6af978f7adb350ac7069badffd2c591b9eb63fa17bdaf6e8f7830f60c77b2c37f32c18600f25cdc23bfc6f4d4ddd4dc90df9d SHA512 1cc9db2172711cc333812a180f22b4a8415b04bb42d0df60b33c7694a91571bff1a75f89712c8d8f8dcf0c3f860bcb7207237c1d73528312d611414dc1a4e8ad
-EBUILD xfwm4-4.18.0.ebuild 1540 BLAKE2B 50f146003b68516612da2054ae30c749286b38b472bbbdc7621c219f91f6c764cf1dbe81418f5c38183d5800e963b284ec8b170e5561eb9c8cf1665ce878baa5 SHA512 9131dfbdfef6d2f6b4c1c1a7716dcf7b602934c5714b59183fe6704d3b216d12ace02ff0480f2a21c7150c8b92caccb7dcd162e7ac2b87933401310a7e37606b
+EBUILD xfwm4-4.18.0.ebuild 1539 BLAKE2B 53396ebba7b7c5cc45b1185d44603c9b809dedb574219d5eb7e47bac44448252411c80d47301dabfc8f0e3db2b374815c8921b8dc324c465efb57563c7b8a20b SHA512 613bd13c4b31cb3b02a0249733785fd819e25fded4cade478ebfbf3f257dd45eccb9516eb149429ccccc0901d5f226f108da2afad1c3cfcf35c1789785506759
 MISC metadata.xml 337 BLAKE2B e51dd05bbb1b2959c65a70a2d16fb8cf627045ab1abcae5838b013d7edb4d5bd5f79a70f3ae31ebd5c326c13ac2e48909621676af8b38e05df8e6f2e0e80e4fc SHA512 cd7a8c5cf84729ca130cee2f33b5358f8f7edd99ca321b7331f43a5e4e5016b2f664ba88230b7dbbddd2298b2ac846c144df87baa43b88426849d55a8f9a7dca
diff --git a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild b/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
index 92707fe53e77..cd0bb9ecd43a 100644
--- a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 DEPEND="
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 50472c982bad..61ce6d0d4e35 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 13b570e8e9c7..fca37aa2093a 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.2.7.tar.bz2 446055 BLAKE2B bedcf4ece6f1696a13144b0dd9d28a9dfdda255ed72f3b7aa7d572fd33b718a01850aaac90887b79ca57e4a7a9e4a6b234ac880e3a180a459e54c8377da3a9b9 SHA512 6bb7f5790d3ba9756afcb47cde40420453afe191fa111e390f2ad9780f3ab51ac2c6a69586303e9a5d1fb7d1af3eda3dad93f10df072f9ae59e47fc2216db434
 DIST xfce4-cpufreq-plugin-1.2.8.tar.bz2 431599 BLAKE2B f08d27b2461e3ac387dc139231a8febb6239fe8e5132ef89a6d4a8f9009fb7a3dd011ead97f27872fbb4857fc563e65fc2dd6e0f652d8d7299d3c9966d6f8b57 SHA512 482912920703b61ccba59b1a95a4153d06a7c897a59d7c2e5f84f6ea1cac17be2bade72d9187fc62279112f41cd2dd3f3157df31fae165eb2a104b74fec310da
 EBUILD xfce4-cpufreq-plugin-1.2.7.ebuild 842 BLAKE2B bbd2ed78612ae4532c362e240e859bb9e5c31f4673d259f6e48a23b372c2390333028245deb0b42cd539715342b4da9e620767a0e32a8c70ebf9c35f739e5143 SHA512 41341b7c379eb47511dfffbda052ab0786f391b4ea71b2dc6a81c7295ea43cac4b22e57758bcf95305d2cf1af1b18ec2f08d1c486f88bf551266d2d419a2a40c
-EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 908 BLAKE2B df33efd092240bdacb72337328e9584eddf31fb00d326eefb2e04004402ba2f5a8e97b98896d5a524da65f4e9bf0b06baa28adc17e800c344a64cf5ba596f857 SHA512 1afc87c190be38dfb9f1c7fc613b69b323d27b313fd3a7188581f8e6081965836f3c7d128847abbed04bb32db2887c0962156b1b78e75d42b76d1bf7ab6f5b00
+EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 907 BLAKE2B 683299045f3534b020073bde50ede03c3f642f2cee8359c53a6b54016123a0ed57a52eb3e7b4103d28c8bd59ae8099046616f666fea6c473a5ca2ac43b519d21 SHA512 340d011fad6fa522c68f71259f83a75aace99d1562fe57726d34e9855418c55fd3f0cc5cca8add815517b703cfe6135e230cccd03debaa7eb524ff28911cf139
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
index f86f6341d112..5b756e8a0652 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 4f9df4d56fc9..d6e0728afb14 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpugraph-plugin-1.2.6.tar.bz2 458058 BLAKE2B 4cd7c9734a52b39d0606f25d5ae559230819e5672b6fe8fb4f19ed5afcf9a446790fe38753ef294ae99767bf06ae9ae08ebd85d66a83dcfb675d945ae2771d00 SHA512 6205a0a7616b0dc5de3cdeb79a5148ee775b426a16b52c491129f74104ab224ec3b29b042a3c8ee05b77cc8775c83d75a8312b96a71504cde50dc257e8354857
 DIST xfce4-cpugraph-plugin-1.2.7.tar.bz2 438674 BLAKE2B d4ca7c850410aeaad7d5eb0156c4feea4a01a0be0d77a62c0165ead9158d2c7e41220ca8ca38e82db69600991f5578f85c1793d1bc94954e9f9cb85cb147316a SHA512 a89f5d9f986717a78a2cbd31db378c1b220cabfc83bf1c85f2533ecccd17b4ed70a3de9321f2e06fcbca2b77d3b02e5a8541e2adf936567a426e1d7221faaa3b
 EBUILD xfce4-cpugraph-plugin-1.2.6.ebuild 855 BLAKE2B 90b3e7f676a101b3708f65e9f83a044360fb222cf8685875cc5a6555557b67c1132a5fe2c19a0568ba0ed208e0a341f7654ec88cefa22e5e81b04aa8f830d97b SHA512 84b5529933e2fb5a2c6a4dd5cdf13a404f09e7dc098e55e504f3d3db61c3056de782ee30079e5b377d4befedfaf7cb1c4d7c8282e46c9f4b9e2b7df3fc422923
-EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 933 BLAKE2B 205f073b43b63fd398304b77df778379b1ef29c7a802b8e7b884f735f4693cf131b76ed0d48ddb628938d6bf317a449e50eed02434abb201b82ff58fb3813028 SHA512 b3ef361ffa11709e68ae246a9163a53a8ed561cf236a8d02df9ddf943ed722efd5b75a755af8cf463e136554c78521734344dfbeb43a13829c3f42781dd1cc4a
+EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 932 BLAKE2B 6292d103b7142ba3325cfdad6316fbc3bf01bcfb49a1bf0a457dbedf218b1ae8cf8810bbab26acb0ff31a99acc06e7adea9405b82d1c0f11e2b394776e20e774 SHA512 8e5bfa31fe164d637a7c7d8c89213a29e87133fccbe93bab6889a646c7bf63014399329e6eba08f94286f13e4a1ce3a2b1536fe33bf08aa26c6fb08d81d2a59b
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
index 0d87304ff867..d14d3767c5ac 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=x11-libs/gtk+-3.22:3
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index b7238413f85c..b1616717f94c 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-screenshooter-1.10.1.tar.bz2 596568 BLAKE2B dc43dd73f2bec42cf0bfc3e579653f947feef42006c9441c6748373ecf417248566f1c02da4be95da368ca77b0b57cbbea014f47a029215031316c52ef7b8fa8 SHA512 1e39bc89c0ec35e88834568a42e20d8f48dc141e045865623d387a91a9c7f7d96457db10e34d7ba6c5d8171673bb3b41f4d91d6cc53d1a841042acaa0cec202b
-DIST xfce4-screenshooter-1.10.2.tar.bz2 601856 BLAKE2B bccb37c44137faad63bd4f7bac84830f82c6f9cb60474dc774ddc0a428f9a515a938351d1f7317f4bc7ade5808c357a318e725e6adaa264d40d5ce2728bbd1e3 SHA512 f737d8cf071bf12ab3f2443e4b6f89b64bb243ee339fb88d1150347ae90119f657ab8ae655f06e8fbc4061894f89f7fdc7316aee280d6864efa6f8444bab3878
 DIST xfce4-screenshooter-1.10.3.tar.bz2 601717 BLAKE2B 825e939e56e8c11b42454fd14240209dd157b183525349c51979890ad544d69c9dd95264ffddb4956a0829598ebabd119ff01c0b9cd95115491b79cdd6168212 SHA512 c5bb43c7cbd15cdf276ff5dd16e0e102862b974cf32b725bbc0d33fa60c713e1891706f3a6e38150e76e9c876e5d0b1be277d3031a3ae47696056182ccac78f8
-EBUILD xfce4-screenshooter-1.10.1.ebuild 1249 BLAKE2B c29a42a35a16b2aca35eeb533fb80bf297b32388b86c8d8a7540d5d7bad6fa6a55e5fa4ec7891f1e139b3e4583afaa51bdea2b571797fa5be7a7a9172fef51bc SHA512 568073860d719d85cfb546119b0a84b3562d9e187705033141d82c1fee01ac935a766204007a17d70712f760ebd626c121f993c225862e12cc4b8d06e8fdb270
-EBUILD xfce4-screenshooter-1.10.2.ebuild 1254 BLAKE2B f3d7346290d0d7d79e5248d9e8a4293e19023a2efe79ad02d02dcf1805c48d93cb901f6f36bd9249b221597942c827e37c3cfebe7544653bfb5cc380c56f30fe SHA512 2ccb42a81046b2425def238726160c4ec62f9a0627fefbc77bf46aa244e720fa099e2e6db40dfef82dbbcf2c1ea0cf43844aa3afd1c2fc183ac79e2018da2cac
 EBUILD xfce4-screenshooter-1.10.3.ebuild 1249 BLAKE2B d221ded378807c008fc3a1f287859068ab3b57b120d291a867431cdf0e584f149627a8fe2344d7f8cac5301da43d5b9685727ed8125419906051754d29874028 SHA512 cd6f86df686e6ad3702a97259962384f08002cabedb85452dcf1671eaaa918a867cc56e7cd3ff8f4fb6166ed9aa23df2d22420aaed4fe60c132b86910e17caf2
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild
deleted file mode 100644
index 7ba9a41b409f..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.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
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfce4-screenshooter/start
-	https://gitlab.xfce.org/apps/xfce4-screenshooter/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=net-libs/libsoup-3.0.0:3.0
-	>=x11-libs/gdk-pixbuf-2.16
-	>=x11-libs/gtk+-3.22.0:3
-	>=x11-libs/pango-1.44.0
-	dev-libs/libxml2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.7.8
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.16.0:=
-	>=xfce-base/libxfce4util-4.16.0:=
-	>=xfce-base/libxfce4ui-4.16.0:=
-	>=xfce-base/xfconf-4.16.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.2.ebuild
deleted file mode 100644
index 3f880504fd4f..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfce4-screenshooter/start
-	https://gitlab.xfce.org/apps/xfce4-screenshooter/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gdk-pixbuf-2.16
-	>=x11-libs/gtk+-3.24.0:3
-	>=x11-libs/pango-1.44.0
-	dev-libs/libxml2
-	>=net-libs/libsoup-3.0.0:3.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.7.8
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.18.0:=
-	>=xfce-base/libxfce4util-4.18.0:=
-	>=xfce-base/libxfce4ui-4.18.0:=
-	>=xfce-base/xfconf-4.18.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 8336e86335d9..41d6e16295fa 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-sensors-plugin-1.4.3.tar.bz2 508993 BLAKE2B 4e857c2b31b6dc1d9e1f5adeb0b34c1f68c0e3386c7211533c5ffdfddddfc307fd16b0a55b6f8697aab87c62e143f3e8795c1a7ba36c3cfd18e92b56e316c7f0 SHA512 2cb91afaf740db5bbbb8451cfa0540ee979671e6a1a640ad61dfeb41328c057bc16fa668e9d536595ef460bfbd41617e8b3d27f63e02324e9764543fa6a0b2b5
 DIST xfce4-sensors-plugin-1.4.4.tar.bz2 472187 BLAKE2B ab59dea6dd2252c23ee7a74567c16ab040152bbe0012349078d306dcad2c699d6e55b32f7d084c6cdf26f51ff324bcac817ea6f01e3957c74cd7799bddd0a147 SHA512 45a5df383cc950f05f33d3d658b4847890e4136d6c72708a4218f1460a27d44a07a3f726d6c509bc706b963041a5dab3259dd94127636fb196d47ab9a0d6f702
 EBUILD xfce4-sensors-plugin-1.4.3.ebuild 1520 BLAKE2B 2161c5fe4f7c8980be116be529c77d144cce0575c48cb3e1d0f42b8429ecc3181013310e6a65578df33b8836c4dc5d0358016295c92afeddf030cc1fa1987524 SHA512 5f5ff024ac8cb53c99d51decc5a6832ede2cad93a985a6a12358f74e92e06c12a0dd3e4c2396879a7b6527b4371c2553583c79533f8f72e94e9882c07ed1d8f7
-EBUILD xfce4-sensors-plugin-1.4.4.ebuild 1587 BLAKE2B d056a76183f8b1a7481a2827ca3de49d108a0654f1a31ceaf3c58e96bca92a4e236e61a753901c7abc03a54f9f917f9e292e75205b76d4b5eb09c1a10568a477 SHA512 37bdebc3944bb99745eab3d1a3fe6a219746fe12e032ea185b8231be8b74aedda533ca809c1f3b2e5ee0bf231f65344ef110d8025e86ea0a8ffc8222b23779ad
+EBUILD xfce4-sensors-plugin-1.4.4.ebuild 1586 BLAKE2B 674f2f8c3e5c1352a7e036953d4c8cde2d1556b3fffee11b8d8a9ebe3962bb95c93263dd2a1dce2201e1f9922f2e2ced8ede22a83c8d1b7d1584d70c5974c12c SHA512 60da215d4140606d248d6c7b333cc52c18711eef8010792f2f08121f7a5a3ed5bc7a72a186f31c7485d0952883a3e9fc9b5124eca6009f9cde05a7de04f8d8d8
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
index 6de78b078b96..90df5f270fc1 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
 
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index d71907db982b..0293849c80a7 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-systemload-plugin-1.3.1.tar.bz2 417959 BLAKE2B c9255349cb4f20a8d8165fbf5a124dbffcb4ca3633c32ca7b2cbbebc4770a50a24909158cd3fcaad9f8bab4b756b98b5329b60a1fbbd0ac0be13251bb950d542 SHA512 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876
 DIST xfce4-systemload-plugin-1.3.2.tar.bz2 409767 BLAKE2B 1213c007431318628f4f81026ccdbca2e5b9d34462d66354a1c37999aadc0ef9ed84246bc7f185fd633898364dc0440297dde18288f8beea1d5c7bf6663a6a04 SHA512 f432988f439e5fd7ada16b3e6eaa42b3351531ba3e2b63e2570387bf4d7e605ff9d5a97fde3f5f5eb323ff08aaf3c050f161a5768392b80aa99fabaabda82431
 EBUILD xfce4-systemload-plugin-1.3.1.ebuild 1024 BLAKE2B 083b795561b3a767a621129df90d2eb3faae1198ea46cb320469352acdb56ea2589d8a98992f1785b150d02c6ef752b1ea154697f6d00871d21a4d792da17266 SHA512 1c2ab2f8aa8f4783b4f42cdf845995b35ae6fd8c6d4cbb54941b04d1c359d351df29dc64e7f7b4accfabf6a9784487fbd208cbac6849e77cf06633f04b4bb6b9
-EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1130 BLAKE2B 4627c8a072e32813489ec7497493a5a08eaecdf5cf4dd2c0b4a5a073cf572ce1345f7d71f9b020a19a008761f60844b551bac748cddd50980c6263cd286fe562 SHA512 f8eddd2dab1b6f0f1202d898c6b248194a10b9f5cfd3842f65a6102957e1019f007bf2d72b77eadca492c08035807f0843b5ea94a3abd75d01afde56cc9132e6
+EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1129 BLAKE2B 94e0ba3cfa803735682a551bca67c0610e757dfa7f7fb032a21fca7bcc7cbda0203b55d077e3983ad99719fd06c63b0561808f10cd46d5d505d569c663c7b496 SHA512 151f0b4363c458dbae2290afebff7b0b1401f9ee18d117a74f6d70f5bf39860e6f0b0171503c2a5ee3906b831d410e013c8f5cc665ceafea7852971a24c6a448
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
index 1ad60f4d5d33..923752849f8d 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="upower"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 799b8dcd9d69..976c2b98283e 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-taskmanager-1.5.4.tar.bz2 413196 BLAKE2B 76d44eb904ce78781268d47faffe504d50d84cbd3be5505a7a815d05cb38aa5e3547594477632bb057f291cfa7faeea7a04d41c79c80f3df16331a0f974eab58 SHA512 a1b4c0b8bd51cdf35cd7a03bab60e703b364646b77eb978dcc1ad9f2e56692bc24aea2e368c99b362037854ae1b326c6d51a92fefb8c511a332adce51fa6e73b
 DIST xfce4-taskmanager-1.5.5.tar.bz2 435581 BLAKE2B 914bd0b717950f4e41dffef87d18f171ac66e24dabdb5435f3b4b44ed7fae01a0fe76344ee93310399cac89c826120098720ced0cb15b08a5fe634079d53a30b SHA512 492d3cc466fdda5a51aae5d3ccaab13feed5ae9a4796a9588c5bdb44a794945c3b8d6d8c475065948d4391c26ac12b556673d57faf27a2ca320022f06599bafa
-EBUILD xfce4-taskmanager-1.5.4.ebuild 778 BLAKE2B 407ef57bc78207e9dd7ab7d8612695f41da5fcbb62e93debc03f61c2fc5a94deb6b51109e1657a4616c4cde9bb2e6cbb1f08d583431f234b206a20ec9c40c4da SHA512 662a1914206e9622ce4d22892ab38dd6454cba16197c4c4552e774ac65aa1a949f2baddb3ae02a59f4c600b79f206e5e21f8b521405d0e3512131f4dd7f619bc
 EBUILD xfce4-taskmanager-1.5.5.ebuild 778 BLAKE2B 20d523f1090275c9e022274bd1538c709b97e163428dae74fb52a636063eb6b5656f0104b0a62558937ec1f3d25980218fa3b1e28c0ce45eeb87360f78622dcd SHA512 eddd78ed13218674b31ca1d99b69be9a0742f48b9722a6a03dda145d84dd177e2c46d7f0707147e2c3a92c5a272514cfb0e44f2eb7f4d3daf5ca8a6a3f7983cf
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild
deleted file mode 100644
index 222d056a1ada..000000000000
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Easy to use task manager"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libwnck:3
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/xfconf-4.14:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}