gentoo auto-resync : 23:03:2024 - 13:01:09

801 files changed, 4773 insertions, 14544 deletions

diff --git a/Manifest b/Manifest
index 3d3a0d484bfa..684155dab90c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29782 BLAKE2B 5cbacfeb1a368160312a87b4d3c74190caa499c0459c7e6ddbbd26be20f6f764b260f04491fd2370d477ebe98fe581a8a9a728e22fe7eabb8d0dda8646e04f42 SHA512 4e6c0d369503a113ff51cc854f472b3ea3a35747987ba839f30d337b3593ec4c05bb14d4f8aa5999ece1aa32bda5d4ed15488d562bb68a7ce798e7b0a7ebab42
-TIMESTAMP 2024-03-23T06:10:11Z
+MANIFEST Manifest.files.gz 29779 BLAKE2B a5a1c440fee7f112210f0cea4bcda1b7c060b88c9b4119359291181224a43837308d2b9a003c45fc375c7581cf4eda54ee6dc5d9084676a9ace832febb6c7e7d SHA512 a1bca12ddfa795b4b81ff7e423d19d06682b55b06e4d0c173828691af1f736a38403f665885e5f797c4621f515617e9007f84792a9afa4347bf2727202f11e4e
+TIMESTAMP 2024-03-23T12:10:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+ckNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+xqVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDRXg/+I7lHBQHkdEVGAIlrfjJV2+Po7KpnewOkqHdKINQnJOCW4ADQSo2HGKAT
-3dDkQdgEBCS4XPBnReDCDmsby+MXNMtHBOiQheGqNtXMS0DaFzILKDvsyGbQkJlS
-k0fHXdiNd1mJcLgzlVwbK12QuYZeG91PzpnVy3zwKka1nPnoU4JPi8pEaOPveRk+
-cAFcn0R3uVX9RUT1cOY+Qgk/cXhD34cIwGRvCOGUSAfGgB5eY2TWl28qIOW355Q3
-caUNIYHp/v/4aWEiqv9P612ceIjdV4wH+D0oZKf8R15fxqyFKFh0IbP+08mxnTHo
-JjEX73SOZJ5O8Jhklnlo2ryjDTMoiNVFSvR3TgP96QI84dvRRcbhvSn3VsLfimOx
-ZkEcdkEhLBRaCXQxFFW+bwrM7P4BHVw+vOR0f3c1ud+SZpfoObxZY5tlAT4qocp/
-gnrjA9cScpLjOW1isQ8S26lTeFqTmjoIWfSZ6rAT/4bMyVzj50XrpTpuwHkqHCrK
-yJH505OvJlLem0aGGuFGXxG0fzhJfjy3fPTyoIad2tj8Bra+BWpQVomH2RkXo3Rx
-XwYk0qTm+NPo+iH3HLJ+OxzppQ5wy4QxNjJHVye/TuwiWbNWhaxjFRpn9fMuelfc
-ckKOA0yq69pzWb5UEuR+TG/j5/MTY1wBwYU+4DkRhjo3w4Kd2W4=
-=I6LI
+klB4kQ//RZ14Zbi9uK1O7aWRX1BuoHNys3g3Ed3pF9jRVaULjfjFlhWNI777Z80x
+UVFOnFwMO/hgigwNSiUX00oUihzNzJNekgWPmph3c5fDhI6ZRWeakPUaSjTClRKi
+whyJFYC/Js9wO0heOQ8dglF32uY9K5oO+qZLkMgNual54sMf8x8GNmdmIp5LTveG
+LP3vnABnxdPUv3T9qWoAVZJLJCuAT2OBS9341s4ANNuSNQbStEFc0FlQfCjEsYhQ
+NBEX1Ba4KbJPXNopFkz6KVqZZfcU4L9PjiY8hnrsZBfIazadWH1Nru54+Axp3eVc
+TF6ZKFNiJIbUjEz22KDmLS5B7+xq0WM0a6a2UdLmc7F7SSikSdqBLB69lh30vAN1
+Mib2DvOVY1x2Xubcl7DjCAOtM/btHQrUBZBl73RU5Vz51rHWblZShK5/1y6B6x7c
+psqOrTXoIy5jkSc4KHi0R9g85u+fLLf+XigPos86/9SRl4XYGk+A5h/q2joPwazq
+zvugsGryzyG8vVwjIXud73JNM9nONDJgg4I6yzhIpwVCg6CMrUq16tKhx1oYGyNh
+JihI88NWenfgSdmNI+7DCV5BwxDjTq6FCRqJ3vNVx4YY5afuGU0KK56WKLrVFa2E
+fyTGD04VmNTsAHllbhHnsP3zDV1DaN/b2mNroRqN5+CW1v/ocnY=
+=34uW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2047c2708d92..16e5ceafff3e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0b9c626eea3e..1e0e8b6c82d6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0adc8d40ae42..0aaa01632072 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.32.54.gh.tar.gz 2656395 BLAKE2B 7f41ac7bb0b11ef851cbc1793c202dd38045fda6af3694e1d2c29f2aa07047f116c6bceb5aec72e805494647f801b1523dadef5301322ed9c25426aaccc1289e SHA512 29e591d8f06091cd138c3ff10b15cd0344b5f12e6a4452ce1cde3e6439e1b70ded7f1b60c96c53a6ad699a3e6b49591e5d26b0190d7d6268792b77a883faa6fc
 DIST aws-cli-1.32.59.gh.tar.gz 2660092 BLAKE2B 560bd7b69822af18f33e91d7586da20b6bf955070e524b66da2a987a6305298a2e566749cf50ac21907ca6fa97eb4a3f1475625f23bdd27874aab63f5b8f8cf9 SHA512 a4efcec4db472891bf856bbdb2b6a8e98e3b74f0db88c04c284d62d65650339f4c1f37cef92b4a5e8b06b75f8aaa7882d6cfe319cf5c25cd8961a0cac0d0f2b1
 DIST aws-cli-1.32.64.gh.tar.gz 2672156 BLAKE2B 6707984b03e004ed8672b35694c9e4be7d2543c040a64778c0ad43a4e011f07506eb5e3f9791a5b0e23bc5bd222b625daa078f9e42cfbf6d71b7887d675c1a5a SHA512 f39472bb1ad75cbfc4bf775aee9a003a884d7423e10d9ff96f90ebe7dbd97c0db4bbd4d52f1d918372ec880d1dea8f5cf82db31118a7c29973d42149064fd8a3
-DIST aws-cli-1.32.65.gh.tar.gz 2672697 BLAKE2B 209f59887a7b7841ab3e9d502365b47f390516351cb055c8e89e10a1d83e259c9938a0a967d8b436814c637ed88ba853e75813b7ab8d7632d97fe6020392638d SHA512 924bb324ac513d3228d7e287b0a55537a1b0c53615673516edd69f2743d67b7746976c23fe6a455e0b265eee957dceaa750e556ede98f2f530e2a3373713817c
-DIST aws-cli-1.32.66.gh.tar.gz 2674255 BLAKE2B a636728892756c9ae0837f470f74fb9a231302962a3ffe3c68ffeafa082342bbab8f4a32268c45a56ba0a34b3d5ca3e1f2e9ec53687515354b20af7accdae142 SHA512 f46da9511837956ff9584b25fd563f78fd02865b3f165e3d641bf725305bca4ae78865570c9f4ff92cdf36f9c25bd59f2543278781a09d95d07fb343cb9c535f
-DIST aws-cli-1.32.67.gh.tar.gz 2674997 BLAKE2B e852fbb594aad6f3879ffdcbee5135b7cc635a13fc4f12d05f9862cec43bcfe26701171da1baae0e3f8324534cd0bcb8ce7857a9d1add888066a24fc44f8bc02 SHA512 f619e46c75efa684219451a5adb89adcaccc88b149b8c240d3405507887ee734779d7097bb80a4f0e1d973f544f8b3743c6900c7e3f19e4b3cf1793da880748f
-DIST aws-cli-1.32.68.gh.tar.gz 2675098 BLAKE2B 68b4012094bca59166ec7c8d7cd4622b5dcf4787db81322aad1b4d7031f7bf6ad1805dc2c87f6f16da911454a479768e30d55fae8a5fc7b3ffa1851268abe2c7 SHA512 bd99a72a892a854d57f8359bdb7306dbf64e46b309738c9d6ae1b2bb8413080e9d72c3a7e145b8e9eea4b94bf3e08bf62a6fe3db3e552c38e72dca92ba528daa
-EBUILD awscli-1.32.54.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
-EBUILD awscli-1.32.59.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+DIST aws-cli-1.32.69.gh.tar.gz 2675479 BLAKE2B 7a8ec84c029662145aaf49afd1b9194a7a021249ee7bff2f5c5b704703e54ee6f09c94cd0ccf85a968187f3e8e6c85a18fa31592f6bc82dc5c2aac9aaa02a643 SHA512 09f5929fcec0ec263f80b377ee21d256c52547f9f71b8a38382b0a9d39371646d0afcc3650079147f0dc8f6fa11d33cb4a9f3977c023be37851fca761ef6ac56
+EBUILD awscli-1.32.59.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.64.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.65.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.66.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.67.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.68.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.69.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.54.ebuild b/app-admin/awscli/awscli-1.32.54.ebuild
deleted file mode 100644
index b7c9ceb6d88f..000000000000
--- a/app-admin/awscli/awscli-1.32.54.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.32.59.ebuild b/app-admin/awscli/awscli-1.32.59.ebuild
index 4a677affdbc4..b7c9ceb6d88f 100644
--- a/app-admin/awscli/awscli-1.32.59.ebuild
+++ b/app-admin/awscli/awscli-1.32.59.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.32.66.ebuild b/app-admin/awscli/awscli-1.32.66.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.66.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.32.67.ebuild b/app-admin/awscli/awscli-1.32.67.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.67.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.32.68.ebuild b/app-admin/awscli/awscli-1.32.68.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.68.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.32.65.ebuild b/app-admin/awscli/awscli-1.32.69.ebuild
index 4a677affdbc4..4a677affdbc4 100644
--- a/app-admin/awscli/awscli-1.32.65.ebuild
+++ b/app-admin/awscli/awscli-1.32.69.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5ff7e1190d6f..2b9f4c15aa14 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index bfc40a433fbb..30f51324d569 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -2,6 +2,6 @@ DIST lzip-1.24.1.tar.gz 123899 BLAKE2B b387577087af5596ea49af16c44e1dfc11f78cbcc
 DIST lzip-1.24.1.tar.gz.sig 72 BLAKE2B 6b957524cbca62aed7eb1dc35284da24550d8d90c8bf95d0c84063afe5e0cc1fc6f70bd513dece615f286e0d49c1a7dfcf6940a443f293975380c8e3ada2cb2d SHA512 40cfa84a7c7e6b907d76560eae27b22cb11aea79a94a2231e041952fe0f452a4e291355f60965bd6ca712e03f4ebf5381b759409e66a4a12653a005a6a1d8395
 DIST lzip-1.24.tar.gz 123850 BLAKE2B ef6b7b51e7369b7b07ca2d5bbdd57a287f3a96866f50b327237a35ce9a4d19b2e3f7586a099ff4191c3c793de2dfe59120a42b8d744e220c4f7652d049df87f5 SHA512 119de48deaedcbfdc0bf61c57ac54b463a3cf1ec064c70095b36d18784f59e5c80bb07ad69ad0e168443d6e73f7a506a65d80a2eeae111669b3194fa5dd0ca3c
 DIST lzip-1.24.tar.gz.sig 72 BLAKE2B 629c25f2ae80932246657efeca0fcaf57024203d9739db9734e9b2df799809f7b3b9ac70afa4a47eb631865246674a2f269b2fba4fbaf58e0299efa74388c6cb SHA512 c1960f051393c26beb504e95a3e99335c3b700b3e8895bd6c3c733549a1cb56a2e51024f4d7c9655670db1877cb29680418b77642a9fdbe816d59bab1e0f2f72
-EBUILD lzip-1.24.1.ebuild 985 BLAKE2B 22e5a1cdbed07037bf8f01993c2e725e5fb8f56566d3fda4e9667b3d453632b7ba1ca873928416e64125c176feeac76d86a763f6e452009868ee824d999e8bd3 SHA512 aad0d980ab3de2d0b610e29fe02ce62bdd77460c3a74d872f568741acc94ba8279ec555961049e38619610ff37df46765cfdbd088b6230d9ab4cc8fc960ffc05
+EBUILD lzip-1.24.1.ebuild 981 BLAKE2B bbf8532973cffa071da979d1d96181b11d1f686782668d8249df382513c9b2ca65285c9f7b0d53be4ebd807f00db44bc2a75de1368548c8859cecf6a3033af2c SHA512 20f90dfcb7c72cee6d18723f5abe3babbc82c09c88c5d30d33edad3d3858efb9ba47a17dd81798df40265ea01bbb2875412ae0c6fa45c3052a7b6e105c5249e1
 EBUILD lzip-1.24.ebuild 977 BLAKE2B 134c6ff37849099a94706f7dd25397e9944fc8e4b5e9181e82fcc4f3c45ee6b04633477c673a600b8bd3518d99d03a79dc0c717e5ee99421ca2f70e1d236d31a SHA512 b47ce8346c8425120178f8432c50ce410c5cc5051495c741048b85860516f92810666e4f38d01e9360ade9511e74293d0e3fb950fffafb490bb7ba2b95d3e2d8
 MISC metadata.xml 433 BLAKE2B f223f7a52fed40be8267d75a1a16ba3657fde4e5eff20059ac53496fa243a680c415455fc4bfb478cbf98875d8874276c747597ec37847c72f2db7b0caad15b3 SHA512 5ba5e22b1e4291e49bca77cf4c76b10dad22e172329b5f189c345dbca2321c61371908808952faaac7ad26049e8b53124358d5a2705b4213029e23c15f37eb59
diff --git a/app-arch/lzip/lzip-1.24.1.ebuild b/app-arch/lzip/lzip-1.24.1.ebuild
index 0334aa9843a8..0599ed1b35a5 100644
--- a/app-arch/lzip/lzip-1.24.1.ebuild
+++ b/app-arch/lzip/lzip-1.24.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 3348599bf7da..9971816135f9 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 323d315c29a0..02ffc39411cb 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,12 +1,14 @@
 DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9 SHA512 82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
 DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec SHA512 86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
+DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9 SHA512 1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
 DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
-DIST buildah-1.34.1.tar.gz 18838539 BLAKE2B de11f64a54fa24c8aa543dd44e6a3fca9df62eecf39541fa37c22a2dc64560d056f638a6b1f8aa564a09f0594a5e7150ef14fd9ab8cc61390dc6d7d8afa5545b SHA512 2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e
-DIST buildah-1.35.0.tar.gz 19353483 BLAKE2B 806c098d557480b6d6e92e6da61c32e48dfd6c1bfa4926a2871a8f41a3ef5f35d91381e51d33636a892bce930eabfda509e97e9efa60ba5c4feab75781d027ee SHA512 b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4
+DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
+DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B 31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc SHA512 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
 EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
 EBUILD buildah-1.33.6.ebuild 2909 BLAKE2B 028314b5c62013ce5ebd147a45944e5e27f2150ad51f2fc566c5ebe45a64ad78ea068962b41dbb5fb657312bf5a48f06e75a920b0f9a4190a06c0b96f7ce02c8 SHA512 48e37433580225f5dbaccbdb2748d7e9715793692c5a2a570ef7cfafcb1994d72583b1bba46c17d81bc5e53603f9ea8f2ac5d8fdcde7377641dd58d08d1040ac
+EBUILD buildah-1.33.7.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
 EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 005d1365c73b062d304f8cc729af70d27cb7ab8d74d94799ec7d4a5d293bf3cc2a436ec6d05de539f72c8c1af019ed3cc67312d67276ae5e611cb0e9893e1da8 SHA512 f7f3594f3c75db2fe2ea40645d398b64662d804a22510b22f3cc386b9827e3ce51fc4ee89230495454bc7783ae43185ddd576b85bf3433f29db345d04766c7b5
-EBUILD buildah-1.34.1.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
-EBUILD buildah-1.35.0.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
-EBUILD buildah-9999.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-1.34.3.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-1.35.1.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-9999.ebuild 2839 BLAKE2B 79a7a6a23ac0cb736e361deeaeb850bf379baef028f75db6907ba978b7411b5468ada1cfee018a8abddf0604727b02beb6c8d685c6ee53d8a95698d0aaf66134 SHA512 09a1b7d2fbd2daa47ccd8fe6bc6adff24b5c91e98dfbb05f6368392b5a321d54d9d9e42bfd5961df72c1ce15e3f75564d11d0b2c95db79d38c7641e565fb05e0
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.35.0.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild
index 8d0698568fd3..8d0698568fd3 100644
--- a/app-containers/buildah/buildah-1.35.0.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
diff --git a/app-containers/buildah/buildah-1.34.1.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild
index d5fd4e7a796e..8d0698568fd3 100644
--- a/app-containers/buildah/buildah-1.34.1.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -14,12 +14,10 @@ LICENSE="Apache-2.0"
 LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 
 SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
+IUSE="apparmor btrfs +seccomp systemd test"
 RESTRICT="test"
-EXTRA_DOCS=(
+DOCS=(
 	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.md"
 	"troubleshooting.md"
 	"docs/tutorials"
 )
@@ -121,5 +119,4 @@ src_test() {
 src_install() {
 	emake DESTDIR="${ED}" install install.completions
 	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
 }
diff --git a/app-containers/buildah/buildah-1.35.1.ebuild b/app-containers/buildah/buildah-1.35.1.ebuild
new file mode 100644
index 000000000000..8d0698568fd3
--- /dev/null
+++ b/app-containers/buildah/buildah-1.35.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="apparmor btrfs +seccomp systemd test"
+RESTRICT="test"
+DOCS=(
+	"CHANGELOG.md"
+	"troubleshooting.md"
+	"docs/tutorials"
+)
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/buildah.git"
+else
+	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp:= )
+	apparmor? ( sys-libs/libapparmor:= )
+	app-containers/containers-common
+	app-crypt/gpgme:=
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	local CONFIG_CHECK=""
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	check_extra_config
+
+	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
+}
+
+src_prepare() {
+	default
+
+	# ensure all  necessary files are there
+	local file
+	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
+		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
+		[[ -f "${file}" ]] || die
+	done
+
+	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
+	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
+
+	cat <<-EOF > hack/apparmor_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex apparmor 'echo apparmor' echo)
+	EOF
+
+	use seccomp || {
+		cat <<-'EOF' > "${T}/disable_seccomp.patch"
+		 --- a/Makefile
+		 +++ b/Makefile
+		 @@ -5 +5 @@
+		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
+		 +SECURITYTAGS ?= $(APPARMORTAG)
+		EOF
+		eapply "${T}/disable_seccomp.patch" || die
+	}
+
+	cat <<-EOF > hack/systemd_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex systemd 'echo systemd' echo)
+	EOF
+
+	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
+	cat <<-EOF > btrfs_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+	EOF
+
+	use test || {
+		cat <<-'EOF' > "${T}/disable_tests.patch"
+		--- a/Makefile
+		+++ b/Makefile
+		@@ -54 +54 @@
+		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
+		+all: bin/buildah docs
+		EOF
+		eapply "${T}/disable_tests.patch" || die
+	}
+
+}
+
+src_compile() {
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+	default
+}
+
+src_test() {
+	emake test-unit
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install.completions
+	einstalldocs
+}
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index 8d0698568fd3..e8ee0949a819 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp:= )
 	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
+	>=app-containers/containers-common-0.58.0-r1
 	app-crypt/gpgme:=
 	dev-libs/libgpg-error:=
 	dev-libs/libassuan:=
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index a967acbade02..3ea04ab7b4a5 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -6,6 +6,7 @@ DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716
 DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
 EBUILD containers-common-0.57.0.ebuild 1750 BLAKE2B e3146c256b3b613489dc9761702a0dad914f8989669381c5eb222df39adfcb80793d9e15c3b6ec4b9ecbfa3ef1f4ce19c9ae18ab14d86ba7d92c83e14a1d1d6c SHA512 48fec563927b44bf7e25d341f4939dad0a89dac98bcdec8c8340b7c308f1f5f3ca6065a8199eb104fca18f85da2c2c43000f1e6e59717dad970de53d75f9021c
 EBUILD containers-common-0.57.3.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
+EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-0.58.0.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
-EBUILD containers-common-9999.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
+EBUILD containers-common-9999.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.58.0-r1.ebuild b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
new file mode 100644
index 000000000000..4a0427e20df7
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="Common config files and docs for Containers stack"
+HOMEPAGE="https://github.com/containers/common"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/common.git"
+else
+	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	>=app-containers/aardvark-dns-1.10.0
+	>=app-containers/crun-1.14.3
+	>=app-containers/containers-image-5.30.0
+	>=app-containers/containers-storage-1.53.0
+	app-containers/containers-shortnames
+	>=app-containers/netavark-1.10.3
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	>=net-misc/passt-2024.03.20
+	>=sys-fs/fuse-overlayfs-1.13
+"
+
+BDEPEND="
+	>=dev-go/go-md2man-2.0.3
+"
+
+PATCHES=(
+	"${FILESDIR}/examplify-mounts-conf.patch"
+)
+
+DOC_CONTENTS="\n
+For rootless operations, one needs to configure subuid(5) and subgid(5)\n
+See /etc/sub{uid,gid} to check whether rootless user is already configured\n
+If not, quickly configure it with:\n
+usermod --add-subuids 1065536-1131071 <rootless user>\n
+usermod --add-subgids 1065536-1131071 <rootless user>\n
+"
+
+src_prepare() {
+	default
+
+	[[ -f docs/Makefile && -f Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+}
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	readme.gentoo_create_doc
+
+	insinto /usr/share/containers
+	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index c4d53773f1d9..4a0427e20df7 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit readme.gentoo-r1
+
 DESCRIPTION="Common config files and docs for Containers stack"
 HOMEPAGE="https://github.com/containers/common"
 
@@ -19,16 +21,16 @@ LICENSE="Apache-2.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
-	app-containers/containers-image
-	app-containers/containers-storage
+	>=app-containers/aardvark-dns-1.10.0
+	>=app-containers/crun-1.14.3
+	>=app-containers/containers-image-5.30.0
+	>=app-containers/containers-storage-1.53.0
 	app-containers/containers-shortnames
+	>=app-containers/netavark-1.10.3
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
+	>=net-misc/passt-2024.03.20
+	>=sys-fs/fuse-overlayfs-1.13
 "
 
 BDEPEND="
@@ -39,6 +41,14 @@ PATCHES=(
 	"${FILESDIR}/examplify-mounts-conf.patch"
 )
 
+DOC_CONTENTS="\n
+For rootless operations, one needs to configure subuid(5) and subgid(5)\n
+See /etc/sub{uid,gid} to check whether rootless user is already configured\n
+If not, quickly configure it with:\n
+usermod --add-subuids 1065536-1131071 <rootless user>\n
+usermod --add-subgids 1065536-1131071 <rootless user>\n
+"
+
 src_prepare() {
 	default
 
@@ -52,9 +62,14 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" install
+	readme.gentoo_create_doc
 
 	insinto /usr/share/containers
 	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
 
 	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-containers/podman-tui/Manifest b/app-containers/podman-tui/Manifest
index d2d16eeb6102..6b72f1b78fde 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,8 +1,10 @@
 DIST podman-tui-0.14.0.tar.gz 15857429 BLAKE2B c1a6f056b45d4fa9e0cd749570275da1d98d3f8477a1e85a151afd1cecc9506555c55e065b86d9c49acde36a27c3dac960530218022672fc8044dee0d2284c62 SHA512 d79e5b0cabed6873ff90e4e36fec841b74d53b0e876f6449c9b5512c8a92d7d4bcf733e23abc92a6344d6dcd72957929fde48b4e16dcb1cc33cf10f33074171a
 DIST podman-tui-0.17.0.tar.gz 15853215 BLAKE2B bfdaf085837497c8ce1525eccb04fc977472291e45417a3993a3e9bc2a742e132d14bce7580c0126be94262a10999da2b81edd6997b8c377a3de8a4da20c153f SHA512 137740737e4fe5138198923fb5db6dc6ca901ed7739af09c19bcb0a60fdfe0db79d7c2ac83157675ec478ab8e9dc9b1348cd8aa9f0e5298f8d20ff6cf0284afc
 DIST podman-tui-0.18.0.tar.gz 15928626 BLAKE2B 80fd4f826a407b4eeeb664c065f836f12dd85cacab35003ad8fbcabf3eb69b3838bf02fb76269124d18c110370e42556cff8e348caabb100aa88a1994f99d4cc SHA512 77107a9e64b12fd5065698b7065909d5aa45ca49d749056cfb0f76aa2fd0f269708d3d75ecb4cab7939c30571510cdacebcdaac67549979873e3656e1af4db9f
+DIST podman-tui-1.0.0.tar.gz 16208356 BLAKE2B c5ae4274cdc6c4d5abb9f9a18c82949a40a9f2894a9127d8bdf89b8a9445716cc985d8400833c890dec4524fd617babd5791e3062e9e7654ea93d66c34dfe181 SHA512 918b3efb823a543a439ae0f56c59ee2689961ac6e39a40054a7971ddf02056ca50c7c681ca03c45590e9fdfce1822f406bbf90f9b25563a0ef9ae75b88235a8c
 EBUILD podman-tui-0.14.0.ebuild 885 BLAKE2B 9d44c2616057549c8e33ea7b74bab6a48a9908447023d7cdd767c01e2b5850a72017007334d771bfef1835315f7d5d7642971e77c6089e976d92ab871bcf9ac9 SHA512 c654bdbdd43731f4d1b92308d9f2bf454a85a77651fb88f573d7e22c68bbd40d211ed104acc9fd5378744cb2df0b9075213409f93d3f55d57503798da6ad6b71
 EBUILD podman-tui-0.17.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-0.18.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
+EBUILD podman-tui-1.0.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-9999.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 MISC metadata.xml 727 BLAKE2B 61f7988612a085d64584990b9d3b0e91ddda06153e2bf3809d586f15b9d63cdf93ff1ee8e219859e02e54877c037f706c9ebe2a7bb598bc909dd3597661e9979 SHA512 b861ed4983427544169777f39b53ecc7ece16f997448a92bf387e4691d44b9b1cc749cff6132b093c4bd6f0c348ba0e242bb369d2b3bc34da2614d8f4d7556b7
diff --git a/app-containers/podman-tui/podman-tui-1.0.0.ebuild b/app-containers/podman-tui/podman-tui-1.0.0.ebuild
new file mode 100644
index 000000000000..beefef11ab58
--- /dev/null
+++ b/app-containers/podman-tui/podman-tui-1.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+DESCRIPTION="Terminal UI frontend for Podman"
+HOMEPAGE="https://github.com/containers/podman-tui"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman-tui.git"
+else
+	SRC_URI="https://github.com/containers/podman-tui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+RESTRICT="test"
+
+src_compile() {
+	# parse tags from Makefile & make them comma-seperated as space-seperated list is deprecated
+	local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2; }' | sed -e 's| |,|g;')
+	ego build -tags "${BUILDTAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index e2212b54517c..8f767f12b80c 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,6 +1,6 @@
 AUX podman-5.0.0_rc4.confd 323 BLAKE2B 19bb62e91673791a46f7992b79190c8207636a8fe38fb12250e904acb5e86112603dabfeacf878c597e636b489475f113556bc82376d3c54c2f042a50530261a SHA512 9356733d5922d18f135d013470b03e10c1f9834cb59f72bc2bcab2fc8f2d70f242abf7c9f87e22dda0f5cc791218878278f3d7b341fd81a5c9edd5f0f672420c
 AUX podman-5.0.0_rc4.initd 651 BLAKE2B 3a0673f823b1adda553b2453512c29c63f00d42bce0ee6d49227b410e0d74dfa4a941c1220845153c2fa538269658577f13ede74b061d7758171e7ba29d57263 SHA512 25bf6275e49cdc130a21d3f553ba19c5e3913efbb98855497c91a20dc3f43dff6db9796a2791473d44f04faa652230ff0698a7c1e6b091073ea9ca4922e63a26
-AUX podman-auto-update-5.0.0_rc4.cron 170 BLAKE2B 8902d299df68845d79592aebf3da566100b7f80a109aeadef1a3763ffcfd3d5b1dd880c481b52211f0e7e6eb52546cc312c26e9a34f5605daddae1d36c70a7b2 SHA512 4dd50f1807284e0f60239a6df74ceec52d9a6ec02aa4d5e3dc4d0e6d26537e7a18422f5bb2b4d6f6d59e7d13016dc845b41f5917b9979fac5861a86a7e7e45b0
+AUX podman-auto-update-5.0.0.cron 185 BLAKE2B 78553b31c4f2f9fe929780af752cee33db0e95944275853b1ef641416d9d10cd8a12af73b2f14f330d24e5961f17ac06c4dde47b1dc98de38cf3576995bb9607 SHA512 ae34ee8936d5a16dfad92afb4d9830ae4b06bd10ee4f36b4ad642c6690af025a73b169507f68926a14e3274c92fa49d0f9994334fc4ca369aa6137722a5cb8fc
 AUX podman-clean-transient-5.0.0_rc6.confd 235 BLAKE2B 25100f79c09c4ea388be27ed5e2d5f537d790688ad808cc02183d3e1f86d791f69133d3a3d1137179dd48d70aa1769a2b3ada77d17b7f25cf1b3007c2c243bc2 SHA512 f27408326c5b50addfc8b11c6f41df49d03ccaab80d37bb84100d2d238e01117ea436a79833f80c6b1d62b03da01807871396f401bf155d0c08252cc783f7e15
 AUX podman-clean-transient-5.0.0_rc6.initd 669 BLAKE2B db5f35d6918ea12afd2bc6ef1eb9b855faa259a7abe9a49895892e40576558996317ae0189b80d1d2fea978848e35bfbadf1635cef112bd96bfeb75ecf34cdb3 SHA512 95c07cd6bc1bba7ce9bb0e111d74d9625c7f7e88667f709852056206e9483d96283ad2f13710e99bc5c3573bdb1b0c7585a7254760b91b7eec5b5a868d849e61
 AUX podman-restart-5.0.0_rc4.confd 284 BLAKE2B e2e5394428d95e9fa480f32ef3efcddc870394e8f5158fbcfe80434aca6c0a48bc1a4a5b7bdcf91e5313121be7f50f5e924a3a2084767e84d6bf045819121711 SHA512 99818e90a04ebdfa2ca8fbf8b4971025cae27807a0f2288f267c60e875f38cac4d189a72248861507189aa3a1e05f7c81d663f96ddac6a7e11edebf5f18baea1
@@ -9,13 +9,9 @@ AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
-DIST podman-4.8.3.tar.gz 21565162 BLAKE2B 13d2e5800dce96ba8c1671f251c2809dc0166198b807978d44b6f10b4dd2095e909678a12518fed84a0a1b5eee5a71e944170eb55350c3af945a63910f9c8082 SHA512 13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d
 DIST podman-4.9.3.tar.gz 21727849 BLAKE2B 9a67ba4266a8a0e20d165ba2bae00dcf146724ee976838d5e3310b094155ffa89bff526e8ae72864dc100d1e6878d5519d53581dc7e034982a4f2b364e4c8feb SHA512 395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327
-DIST podman-5.0.0_rc5.tar.gz 21856941 BLAKE2B 7800ad4d928bcc19c223a4dc6a84c32b32f8655753a8a77cca57d78b351bac911c7cf72d5425242ad93d165b620b7060e852a9b8816196136767bc500b5881f9 SHA512 a3ccd6eb53d66297be30ec66efa0a5fa5f5050a647c6bc5cdb2fd4cd9dd5638c42328bf1429a2fa3f8dcc84bb7d1ffbdd9c6bf06862993277f5b60d740d91c1b
-DIST podman-5.0.0_rc7.tar.gz 21865293 BLAKE2B 36462bab50a322942053d301e9bc8d75f4b7ef9776d73c1fbf30f37eb538e98c85ddae42d8ab3cd3183b85985716d1c42b94dacf9881a74046c75e45697c0c24 SHA512 ce66a6a061511bcb1e2e0044dbae50a421719974bc1126cc54c725d2d72282718e7cea8a5e0013b5e10b6d3ea9efb3d84716b4906312ed0190d6e5036dcd4f97
-EBUILD podman-4.8.3.ebuild 3718 BLAKE2B 690714bcd5e6aa7be22d459dafdf20ae68dd6311fe0b012575a80eb325d4c4192f113b188d1e4830c3729f922a5fac88095f5062f41157e4bb089d8f8d7782bf SHA512 abcaf64a18f3ecac66b97a231d4a8da42b6e394a65a08635956d72cb56433b201d2d0981f216d5c1b9a7136657087db6a637ed39648338766ba6a33a01a10ae5
+DIST podman-5.0.0.tar.gz 21861935 BLAKE2B 1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a SHA512 8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
 EBUILD podman-4.9.3.ebuild 3754 BLAKE2B 5d51729817ef8831557b159c82617ca5509b4e861f08ad15e40e55479489db8feaa188e2148e7b6a99b90ec7a9605ef6656a098183f0a72737f2538f71464712 SHA512 dbfa219c0dbcf3b3df67201bdc6c9c5b71dae105e3da2f4213d8c5f57d71543b9e0ed2a4c1229d05df2b3cdebf619c3aedc2e5770690668c3b77039ad137d385
-EBUILD podman-5.0.0_rc5.ebuild 4070 BLAKE2B d5cc059572da8c81210a080a354ed6062c1f18f7d56cb801e5e36f31619255ddb98ca60d1bc339f8f5dec812f8e8cc62b16814cedbbf03175a980dd559018d2f SHA512 15297bc7cf0eac927edf0360a0a9f6ba8f5122e37f77529bacbcb3a756085c9473e3e1b3706000322e8d1a722ac417fcedd9e2028940105e543e6e5d640e7a19
-EBUILD podman-5.0.0_rc7.ebuild 4243 BLAKE2B 4ee44c512f6eacbf15b1cc9786403a04fcedd44bb461b9aa42b01e13c284baaa9b0ecad6792151ce36f5615004866191e93bab22377c156880f4079853a7badc SHA512 8ebbfdb836bf5eb8475139b66145ba876ac3342eef76d3b75f9711bd86745e78a8fbd0e1d99aaaf50c2836b802d5729e6a69d3441f8767f4d4aacf03f44878f1
-EBUILD podman-9999.ebuild 4243 BLAKE2B 4ee44c512f6eacbf15b1cc9786403a04fcedd44bb461b9aa42b01e13c284baaa9b0ecad6792151ce36f5615004866191e93bab22377c156880f4079853a7badc SHA512 8ebbfdb836bf5eb8475139b66145ba876ac3342eef76d3b75f9711bd86745e78a8fbd0e1d99aaaf50c2836b802d5729e6a69d3441f8767f4d4aacf03f44878f1
-MISC metadata.xml 1843 BLAKE2B dae8b9b2065a2f777d2f32d7c8fd0761f31bb214f93bc6a74f6140fee067d9d7719d596c6295f83c875784fd10704571afa7ff5e1e129a8f2bfedd28fc6199ba SHA512 9dbb4d82150997521fc8d1793a6db8080cb0a924c3390bc58347e52accd4dc8c5e07283aad037cbc1b22d8009971edfd8816d09cf47404bae15b45bd518cb0ca
+EBUILD podman-5.0.0.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
+EBUILD podman-9999.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
+MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/files/podman-auto-update-5.0.0.cron b/app-containers/podman/files/podman-auto-update-5.0.0.cron
new file mode 100644
index 000000000000..509146e0aa56
--- /dev/null
+++ b/app-containers/podman/files/podman-auto-update-5.0.0.cron
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# podman-auto-update(1)
+# uncomment following to auto update containers according to their auto-update policy
+# /usr/bin/podman auto-update && /usr/bin/podman image prune -f
diff --git a/app-containers/podman/files/podman-auto-update-5.0.0_rc4.cron b/app-containers/podman/files/podman-auto-update-5.0.0_rc4.cron
deleted file mode 100644
index d0a0fb54b106..000000000000
--- a/app-containers/podman/files/podman-auto-update-5.0.0_rc4.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-# mimicking behaviour of podman-auto-update.service
-if [ -x /usr/bin/podman ]; then
-   /usr/bin/podman auto-update && /usr/bin/podman image prune -f
-fi
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml
index 0ae6596fc7c4..59ab2d3ffda0 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -24,15 +24,11 @@
 	</longdescription>
 	<use>
 		<flag name="btrfs">
-			Enables dependencies for the "btrfs" graph driver, including
-			necessary kernel flags.
+			Enables btrfs support (graph driver) in Podman
 		</flag>
 		<flag name="cgroup-hybrid">
 			Use legacy (hybrid) cgroups instead of modern (unified) cgroups
 		</flag>
-		<flag name="cron">
-			Runs `podman auto-update` daily. See podman-auto-update(1)
-		</flag>
 		<flag name="fuse">
 			Enables fuse dependencies (fuse-overlayfs is especially useful
 			for rootless mode).
diff --git a/app-containers/podman/podman-4.8.3.ebuild b/app-containers/podman/podman-5.0.0.ebuild
index 731c296c2fcd..b535f608f817 100644
--- a/app-containers/podman/podman-4.8.3.ebuild
+++ b/app-containers/podman/podman-5.0.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit go-module tmpfiles linux-info
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit go-module python-any-r1 tmpfiles linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -14,7 +16,8 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_rc/-rc}"
-	KEYWORDS="amd64 arm64 ~riscv"
+	[[ ${PV} != *rc* ]] && \
+		KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
 # main pkg
@@ -22,31 +25,28 @@ LICENSE="Apache-2.0"
 # deps
 LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
+IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
 RESTRICT="test"
 
 RDEPEND="
+	app-containers/catatonit
+	>=app-containers/conmon-2.1.10
+	>=app-containers/containers-common-0.58.0-r1
 	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	>=app-containers/containers-common-0.56.0
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	sys-apps/shadow:=
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
 	wrapper? ( !app-containers/docker-cli )
-	fuse? ( sys-fs/fuse-overlayfs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
 	seccomp? ( sys-libs/libseccomp:= )
 	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-go/go-md2man
 "
 
@@ -61,6 +61,7 @@ CONFIG_CHECK="
 pkg_setup() {
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
 	linux-info_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -90,50 +91,38 @@ src_prepare() {
 src_compile() {
 	export PREFIX="${EPREFIX}/usr"
 
-	# bug 906073
-	use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
 	# For non-live versions, prevent git operations which causes sandbox violations
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
+		  all $(usev wrapper docker-docs)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
 
-	insinto /etc/cni/net.d
-	doins cni/87-podman-bridge.conflist
+	if use !systemd; then
+		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
+		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
 
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
+		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
+		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
+		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
+		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
 
-	keepdir /var/lib/containers
-}
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
 
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/podman.logrotated" podman
 	fi
+
+	keepdir /var/lib/containers
 }
 
 pkg_postinst() {
 	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-	local want_newline=false
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
 }
diff --git a/app-containers/podman/podman-5.0.0_rc5.ebuild b/app-containers/podman/podman-5.0.0_rc5.ebuild
deleted file mode 100644
index 031861e35e9e..000000000000
--- a/app-containers/podman/podman-5.0.0_rc5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv"
-	fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	>=app-containers/containers-common-0.56.0
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	cron? ( virtual/cron )
-	wrapper? ( !app-containers/docker-cli )
-	fuse? ( sys-fs/fuse-overlayfs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# bug 906073
-	use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
-
-	insinto /etc/cni/net.d
-	doins cni/87-podman-bridge.conflist
-
-	newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-	newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-	newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-	newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-	use cron && \
-		{ exeinto /etc/cron.daily && newexe "${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-	local want_newline=false
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-containers/podman/podman-5.0.0_rc7.ebuild b/app-containers/podman/podman-5.0.0_rc7.ebuild
deleted file mode 100644
index 2027b142f82f..000000000000
--- a/app-containers/podman/podman-5.0.0_rc7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/podman.git"
-else
-	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_rc/-rc}"
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv"
-	fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	>=app-containers/containers-common-0.56.0
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-apps/shadow:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	cron? ( virtual/cron )
-	wrapper? ( !app-containers/docker-cli )
-	fuse? ( sys-fs/fuse-overlayfs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-go/go-md2man
-"
-
-PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
-	~USER_NS
-"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# assure necessary files are present
-	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor systemd; do
-		cat <<-EOF > hack/"${feature}"_tag.sh || die
-		#!/usr/bin/env bash
-		$(usex ${feature} "echo ${feature}" echo)
-		EOF
-	done
-
-	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
-	cat <<-EOF > hack/btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-}
-
-src_compile() {
-	export PREFIX="${EPREFIX}/usr"
-
-	# bug 906073
-	use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
-
-	insinto /etc/cni/net.d
-	doins cni/87-podman-bridge.conflist
-
-	newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-	newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
-
-	newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-	newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
-
-	newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-	newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
-
-	use cron && \
-		{ exeinto /etc/cron.daily && newexe "${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-	local want_newline=false
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index 2027b142f82f..b535f608f817 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit go-module tmpfiles linux-info
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit go-module python-any-r1 tmpfiles linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -14,9 +16,8 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_rc/-rc}"
-	if [[ ${PV} != *rc* ]] ; then
+	[[ ${PV} != *rc* ]] && \
 		KEYWORDS="~amd64 ~arm64 ~riscv"
-	fi
 fi
 
 # main pkg
@@ -24,32 +25,28 @@ LICENSE="Apache-2.0"
 # deps
 LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd"
+IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
 RESTRICT="test"
 
 RDEPEND="
+	app-containers/catatonit
+	>=app-containers/conmon-2.1.10
+	>=app-containers/containers-common-0.58.0-r1
 	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	>=app-containers/containers-common-0.56.0
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	sys-apps/shadow:=
 
 	apparmor? ( sys-libs/libapparmor )
 	btrfs? ( sys-fs/btrfs-progs )
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	cron? ( virtual/cron )
 	wrapper? ( !app-containers/docker-cli )
-	fuse? ( sys-fs/fuse-overlayfs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
 	seccomp? ( sys-libs/libseccomp:= )
 	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-go/go-md2man
 "
 
@@ -64,6 +61,7 @@ CONFIG_CHECK="
 pkg_setup() {
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
 	linux-info_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -93,59 +91,38 @@ src_prepare() {
 src_compile() {
 	export PREFIX="${EPREFIX}/usr"
 
-	# bug 906073
-	use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-
 	# For non-live versions, prevent git operations which causes sandbox violations
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
+		  all $(usev wrapper docker-docs)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
 
-	insinto /etc/cni/net.d
-	doins cni/87-podman-bridge.conflist
+	if use !systemd; then
+		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
+		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
 
-	newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
-	newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
+		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
+		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
 
-	newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
-	newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
+		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
+		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
 
-	newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
-	newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
 
-	use cron && \
-		{ exeinto /etc/cron.daily && newexe "${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/podman.logrotated" podman
+	fi
 
 	keepdir /var/lib/containers
 }
 
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
 pkg_postinst() {
 	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
-
-	local want_newline=false
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d0b029c9893b..dea5c0d55292 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index a75085090eba..49421042d680 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,6 +1,6 @@
 AUX libscrypt-1.22-no-clobber-fortify-source.patch 438 BLAKE2B e5089a6532f054447cd5161a8b7dbdfb32a432527b7702ce265d8c1bac76b8549d6adfcc6157e890bde4e0c9551d78f2d0aff24ea7ab989423a3716e65fcb334 SHA512 cbb9c1d6608c562c298abe5989d31b6b49f63e4640e271b93031d35fd749427182bafae64a75b6effc4e7143ae9f2867f3772090ec503f7c8073a3c10b53949f
 DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51
 EBUILD libscrypt-1.22-r1.ebuild 714 BLAKE2B 2059031221c9ace3a5fcb8e3f4632869078b1fbeba2101fcb68816434f43f1856edc073973ad3691aa17998c14c96ff84a29a794491fb60734c08004a2648a5b SHA512 d432ffdf0f3da3105c21de0de925169d60faf4af8ca760c2415b123241434758b7a47bd80b42e1bac53130386845401f5ffd88250786beb3926eb861f05999ea
-EBUILD libscrypt-1.22-r2.ebuild 805 BLAKE2B f14dd382f1bb994096e2cc3896e73330fd9857a1e10665681392af97e5f97905fedfd0b225abb4d9a694e981a2a119e391fdf9e72741b35bba9eb4dd2772e87f SHA512 ac1775eaaae09f2073606edad8ff98b3c6c787697b81e921dff4b42dab44a8f41fa924eb72f70fd65144024b878d1d8413844a9ba628fc3a879545832c0710c2
+EBUILD libscrypt-1.22-r2.ebuild 817 BLAKE2B af3173c41f49d8eb5d608edea3b599bbbfcbff89a32b2da643bc2db760d572400eef81cedc6971d694ce1577c7dfe880ec38537dd980f8dc864584f2da8c7f35 SHA512 d3f77a9ae6cbc14bd2984f75aca51aec6a9a1677e918f084f3e8b7028aed0202f33f0d1fa571ea20c9d895141f8c6468018c62015e9588432cf889213cb628ed
 EBUILD libscrypt-1.22.ebuild 651 BLAKE2B 5450158a061a864f203f10da091136f0aaaab11eecb3fe6f0c9b94cecfda50e0549ad88b6f498309ed4e16d813822e6a326655964a2b965e44e3712c63bcd45a SHA512 8fd7aa25a3662c4fe46a03641636d5b1fc5afd1f81f533ea77ace70880e4c1ac3329d21b0ef452256a3fc75bd387310a832fa79caf96f38e2d9dce5a7f11fa6b
 MISC metadata.xml 256 BLAKE2B 0583a0f48ddab7dd1ff43587374095c077c0d5afc7134fda41a688d537250f7b9942cf538518c890f3cb175c8c8f7dd170bc3a54ff717129ac16c2531bd48d56 SHA512 db3da96ac2e1680073a199ced5f81dd8b9f17954fef1cfd5b52a626f90a02024f7fcb9eaf4433194d0b6596c22553d5aec1695234a23f3a9d6fcb3e12c6c128f
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
index a5954ba92ca6..c01490457249 100644
--- a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,10 +23,10 @@ src_prepare() {
 }
 
 src_configure() {
+	export PREFIX="${EPREFIX}"/usr
 	export LIBDIR=${PREFIX}/$(get_libdir)
 	export CFLAGS_EXTRA="${CFLAGS}"
 	export LDFLAGS_EXTRA="${LDFLAGS}"
-	export PREFIX=/usr
 	unset CFLAGS
 	unset LDFLAGS
 }
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 6cc266d08f1e..ce3d3ee3d583 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/audacity/Manifest b/app-doc/audacity/Manifest
new file mode 100644
index 000000000000..d39b51fef83d
--- /dev/null
+++ b/app-doc/audacity/Manifest
@@ -0,0 +1,6 @@
+DIST audacity-manual-3.3.3.tar.gz 22938196 BLAKE2B b2646c84859a10e2f2d80abe44c3dc33021fda92b9e60e746fdae95ea7b32003d2a804c7ef8f88b3c3e3efdce8e0f3b2acf846753bede9d05dbbb92777c1055c SHA512 d522b94157f091206341a05b67dbf3c776fedb5a8329f4301244a9ad9cb5f638d49dda11fbb11d376f8f5c4509f1984933d388c44830c8c2ce0c2b59ee7607f9
+DIST audacity-manual-3.4.2.tar.gz 23305736 BLAKE2B 641c4d0fc70eece83906d4c2df427037ff675cab179860f4d637ffcb38b9390409557bcc11e819657c86ff99c3fce513b1f877a1e9c5597157881392e5dc3ce7 SHA512 0664d7c925c9e2c3a15e7b403ef2b8752ce219c40f16e361fc567794ddac92d94bdc93ddb73ac9e4251ab26c352cf072d62f765b5644df3a53febb1babfd6fbe
+EBUILD audacity-3.3.3.ebuild 696 BLAKE2B f65a2e61597c39607f19f333126d2d205b82602c5004e47d77002856c5817be0465291a7a07ec6f5b8a53b435cf6d30e2d597de0c85cf35c96908d353dd692b2 SHA512 ccf0d4b41d46c9914573e32727c92c566bf009db398385b0d0412aa8b340c6d3476d61126acf8a4ea56614ecd5abf73e56be82c0b43886a84ca9b9f856150eb6
+EBUILD audacity-3.4.2.ebuild 696 BLAKE2B f65a2e61597c39607f19f333126d2d205b82602c5004e47d77002856c5817be0465291a7a07ec6f5b8a53b435cf6d30e2d597de0c85cf35c96908d353dd692b2 SHA512 ccf0d4b41d46c9914573e32727c92c566bf009db398385b0d0412aa8b340c6d3476d61126acf8a4ea56614ecd5abf73e56be82c0b43886a84ca9b9f856150eb6
+EBUILD audacity-9999.ebuild 696 BLAKE2B f65a2e61597c39607f19f333126d2d205b82602c5004e47d77002856c5817be0465291a7a07ec6f5b8a53b435cf6d30e2d597de0c85cf35c96908d353dd692b2 SHA512 ccf0d4b41d46c9914573e32727c92c566bf009db398385b0d0412aa8b340c6d3476d61126acf8a4ea56614ecd5abf73e56be82c0b43886a84ca9b9f856150eb6
+MISC metadata.xml 632 BLAKE2B 3485dfbe370918a0f03d51e59c81fb2c52c162bd6b8cd318846cab7d8cd476e4ba56b5a571529df96164568dbe307572760740db7103642cc882b4893eb871ea SHA512 af60278e7a0342e72bab2aa51d12debc2b1bd3be8ba31d990875f150dcbf95719d4f4ce55f094f5feea44ec04f2af906a15c96dec7494f4eb8d56929bff8c7d7
diff --git a/app-doc/audacity/audacity-3.3.3.ebuild b/app-doc/audacity/audacity-3.3.3.ebuild
new file mode 100644
index 000000000000..c033739b6a0e
--- /dev/null
+++ b/app-doc/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="HTML reference manual for Audacity"
+HOMEPAGE="https://www.audacityteam.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity-manual.git"
+else
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/help"
+	SRC_URI="amd64? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )"
+fi
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+
+src_install() {
+	docinto html
+	dodoc -r "${S}"/manual/{m,man}
+	dodoc "${S}"/manual/{favicon.ico,index.html,quick_help.html}
+	dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+}
diff --git a/app-doc/audacity/audacity-3.4.2.ebuild b/app-doc/audacity/audacity-3.4.2.ebuild
new file mode 100644
index 000000000000..c033739b6a0e
--- /dev/null
+++ b/app-doc/audacity/audacity-3.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="HTML reference manual for Audacity"
+HOMEPAGE="https://www.audacityteam.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity-manual.git"
+else
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/help"
+	SRC_URI="amd64? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )"
+fi
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+
+src_install() {
+	docinto html
+	dodoc -r "${S}"/manual/{m,man}
+	dodoc "${S}"/manual/{favicon.ico,index.html,quick_help.html}
+	dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+}
diff --git a/app-doc/audacity/audacity-9999.ebuild b/app-doc/audacity/audacity-9999.ebuild
new file mode 100644
index 000000000000..c033739b6a0e
--- /dev/null
+++ b/app-doc/audacity/audacity-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="HTML reference manual for Audacity"
+HOMEPAGE="https://www.audacityteam.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity-manual.git"
+else
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/help"
+	SRC_URI="amd64? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )"
+fi
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+
+src_install() {
+	docinto html
+	dodoc -r "${S}"/manual/{m,man}
+	dodoc "${S}"/manual/{favicon.ico,index.html,quick_help.html}
+	dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+}
diff --git a/app-doc/audacity/metadata.xml b/app-doc/audacity/metadata.xml
new file mode 100644
index 000000000000..204ad578eda0
--- /dev/null
+++ b/app-doc/audacity/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>mehw.is.me@inventati.org</email>
+    <name>Matthew White</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">audacity/audacity-manual</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 976d80694ef4..3f8e7dac5a95 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6d2517fa16e7..0b3bed23287b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -34,8 +34,8 @@ EBUILD qemu-7.2.4.ebuild 27514 BLAKE2B 0ccea459f94ffad1deb29fd1007162e7ce852ce34
 EBUILD qemu-7.2.9.ebuild 27456 BLAKE2B aaad1a9bcfa95ce6dae0dc81b5d2de99e8a3805fb9df5b2ba6ef6e86e5633442fd0d8c1f5162819fe0f80392a23898eed33568040f01ff4ae94fb67f5f4dbc89 SHA512 02f3ad7b3840f9bd75efde555169fbb8bbcfa958b1316fa8169f027d6325834566fbf05806e23855195694ae8686ae1adfbf8bbaeb246b54006c355582594f5d
 EBUILD qemu-8.0.4.ebuild 27376 BLAKE2B fd1a9b51821eeafef8b6601499c2abe56744a8ee7b57805bd25c1ac6664e3bddcf4f31178c0b13c79ac23457a2766e8616539bd1bf9c9b975c20f66f5b37764e SHA512 5d08daedd16007c57c386e916b4a58a8a879fb8911018daa15127b3ee4534395d818725ce47130cee2c9881ce4ecaca64d5d5d02ac0db53ca00d019ceaff7dcd
 EBUILD qemu-8.0.5.ebuild 27482 BLAKE2B 45c89b4178eb9052391e9356bc99efbff2f356b95bdc9590cc897dba2024ae289d602cd6ef8527db395e6e0d097f3a81ea1996423e02d5935da5bc8040ae8fa8 SHA512 97f4e2ddfbd7b5f5c6d5d3fe18248d12652591d90065ef8c7f8e582b29aff7e4d8921030d7ff8ef04451622770306549ca616ca62c2cac758d3cb9813c462c00
-EBUILD qemu-8.1.5.ebuild 27377 BLAKE2B 87fa6bd65c13cc0a9b32723f8436538ec46f3027fc60eb54e88a81771d773c5039198b6ee0674b937fc6efb155e27de1a872665134d1bc35d718d009b0e8b9f4 SHA512 664cf6b76c01bbcd983faba656b2a3226e8803cd248559afd04885ab16e16f9e6a3547ced0ec772b4cb79a49ca348be5b9f44e8eea28009a2d6531fdccd08ac2
+EBUILD qemu-8.1.5.ebuild 27401 BLAKE2B 1d3442b07c850a275cee38bf8d3651c91fcde30498922f7e95886d427d85e42d78119e5953410d46ea5746e725f46e630211bc37d485e0cf26eca6d32253af40 SHA512 7323757a44c98b5c99dcd6110ad236be2e50585fbc02acb9e4c1ed233fe385a6f6b92f24514c3064543511ef9f63a96c6b52d83eade7e12e9a5024c3c46d64c3
 EBUILD qemu-8.2.1.ebuild 27886 BLAKE2B 0f1dad26a9c710d5b4039d6a3d399810fc1e21bbaaaffb674c3406f427aaae882f463c9c81fdc39bc25b40f85e2873b15fd77a119bc4776701115b2add611882 SHA512 254f344437f852a917451b5d6dde5caebfd6fa4c2198a66e5afd6d42bffd0df2205737f6ac24d370982ed70f6e0cfe6c7cc5aa45b7c45ff68fbe0684a268e23b
-EBUILD qemu-8.2.2.ebuild 27886 BLAKE2B 0f1dad26a9c710d5b4039d6a3d399810fc1e21bbaaaffb674c3406f427aaae882f463c9c81fdc39bc25b40f85e2873b15fd77a119bc4776701115b2add611882 SHA512 254f344437f852a917451b5d6dde5caebfd6fa4c2198a66e5afd6d42bffd0df2205737f6ac24d370982ed70f6e0cfe6c7cc5aa45b7c45ff68fbe0684a268e23b
-EBUILD qemu-9999.ebuild 27986 BLAKE2B a0fe2be4a95e0e303058cd710d2be63494d0b735f15503aedeed88cce4e0ca80474b55d4ca5c85f88fe29aaafa1a4a56135a2f2fba398af7e119d3dd6eca0e98 SHA512 87c506a44c49cf4c3a9c840e3c826f7d5e21efc8722345ba96055173628d0322d578298733200e07371492e812f47ab0436ab8cdfda66630b599b533734f0670
+EBUILD qemu-8.2.2.ebuild 27910 BLAKE2B 7fb78cf6a72e19f28af863aa0502fa964e90881997f64bbd4ac43fd3a2022f1f7daeb47117047230e9b1bbf3bae41b8fd43fa0a7a58599a0516c97bb64fea6fd SHA512 15cb3186c34cf9b328f62685c471af897e0b9fa40794fcf6db91becc0d35d2e9279bd1e76d68a61f956e68fba7290058e82ccd05821378ee39568b4a53f9bf37
+EBUILD qemu-9999.ebuild 28010 BLAKE2B fa5491366e50db6a04c25cd2095ceebf381b5c3dc39189655bbd4172ee21081daf1a85716a533cb725180ea329893c5558d5379cf58bbeac922f7d9ec65e43a6 SHA512 fab7138d420098d7058257538748bd37248e07664c30dc9968e2255d69fdd1964bd4d966433976495b5e2f7f23cd5b9a5a35ac5fe03e1984623d1cbabc9c5e30
 MISC metadata.xml 4410 BLAKE2B 8991a6fb819fb1621ad78ee9d32568dddc7ed2e4876ac5d6ebc6cde9eeb7badb6d0549b72afe8373118bf9dea0cba457bc4cfe65f49040bdcb272a5734eb47fe SHA512 f2a4c53da7f9b3443a76439d31cadccfb026c74226c5c4654d9f50ec19e71e4939d6685fae44fd28e194881ba11ad42215cea7b48963a31a1e0ecf427e826b9e
diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild
index 8b54b300b566..05d55122f855 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -275,6 +275,7 @@ BDEPEND="
 	$(python_gen_impl_dep)
 	dev-lang/perl
 	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
 	dev-python/pip[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
diff --git a/app-emulation/qemu/qemu-8.2.2.ebuild b/app-emulation/qemu/qemu-8.2.2.ebuild
index 9523cdbfcf5e..b62207759882 100644
--- a/app-emulation/qemu/qemu-8.2.2.ebuild
+++ b/app-emulation/qemu/qemu-8.2.2.ebuild
@@ -280,6 +280,7 @@ BDEPEND="
 	$(python_gen_impl_dep)
 	dev-lang/perl
 	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
 	dev-python/pip[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8f55155deb33..381a891e0191 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -280,6 +280,7 @@ BDEPEND="
 	$(python_gen_impl_dep)
 	dev-lang/perl
 	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
 	dev-python/pip[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index d9aac76bc869..b292ffc52b71 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus-podman-exporter/Manifest b/app-metrics/prometheus-podman-exporter/Manifest
index a56958646988..4cb3137f6508 100644
--- a/app-metrics/prometheus-podman-exporter/Manifest
+++ b/app-metrics/prometheus-podman-exporter/Manifest
@@ -1,7 +1,9 @@
 DIST prometheus-podman-exporter-1.10.1.tar.gz 13578778 BLAKE2B e854a61ac1ac7237f0ab4bb7d6d2f39f3ebcf9c32f45e4b44c551aa45a8a97902084f0f24180a1253d0c664907fa1dcb5dc6ac587d31387c708c83388c2c9ed9 SHA512 f8da5b88e6d88d02bc48c2fcd627aca0e88d8264aa3c971b2e251fd7641b329fbe66686d12e2dfca8fe40cc1488359caa1a345844f32e45c79a28bc172bbd501
+DIST prometheus-podman-exporter-1.11.0.tar.gz 13883834 BLAKE2B c8c7334d08c4fa86deb1c8d07cbea1468dbc815d0812fc7dd563a52a29573af8c4ae003e8d5aad80e997770187abf7c5f50ed841a1bbec327f220c676dd829a6 SHA512 f976d77940c08202e629c27ba91810f1d9b03ee6b3ebbbcd1568491aec70eba2fae70e6e5ec261105bcd503e5508a95f75eb5a0e5e7916bcbb17205d8a17f7da
 DIST prometheus-podman-exporter-1.7.0.tar.gz 12251956 BLAKE2B 91a6a217db3fd2b408344f738a7acad5c161adad6da53ef3d3750b73d9135022b0a4c18d85d0f79fc331344462e600574c8cd94477b57261adb29e5ffccdcc83 SHA512 3f9184681f1466ca4bbd32830c8fd233bb7e95af4df0b97cff606e39987d6c608b8847924d3b1c5fe98d058b32324dea86a142065bae7afdb0f99e4cfe0d9b52
 DIST prometheus-podman-exporter-1.8.0.tar.gz 12253412 BLAKE2B 673986f2acce525ab6c9d0858ca6c193bc292bc5e6c8ad50f81921a8f66673c29f724ad562efefb6fe63d556e491432b593b7581af3a01faf44279013a2ec209 SHA512 eb647d8d5c7d30a6676fe192ac2f8c3be5ee67525206c67ac9d0dc06f2fd5fb7dbad838f53fa75f550f5dcfa5c188bd2eb0e7c46b13fe2795b38187ac2fdb81a
 EBUILD prometheus-podman-exporter-1.10.1.ebuild 2910 BLAKE2B 661f60cd7591bc85137c8d1aed8c7dd955f12e9e4c0ea0c7511292131bdbc6a2d62b68adc550787c75223d07546c1d24a651e19a893a53c04d6621fc037f32bf SHA512 43cf204e8174c155c21dcbb049c0def70e94b19e4d1751577e757fb463f1f2d002370e63534fc2cba89540f71a47332c113c70dec8cd9b25f0d974738399d91c
+EBUILD prometheus-podman-exporter-1.11.0.ebuild 2910 BLAKE2B 661f60cd7591bc85137c8d1aed8c7dd955f12e9e4c0ea0c7511292131bdbc6a2d62b68adc550787c75223d07546c1d24a651e19a893a53c04d6621fc037f32bf SHA512 43cf204e8174c155c21dcbb049c0def70e94b19e4d1751577e757fb463f1f2d002370e63534fc2cba89540f71a47332c113c70dec8cd9b25f0d974738399d91c
 EBUILD prometheus-podman-exporter-1.7.0.ebuild 1180 BLAKE2B dc7cf905e259415e8f9c633c7f9d557495e9dbbf28d4e01e0ebbfe0bc2b635244fbca24a0745a318c847a232ea2a9ecfc77273c30f3efcccc129dd29631962c2 SHA512 85a051a6c051376fe90c495108a9e7718eeccd0848e38ab5371ede2bab58ccde2bb903fb0d7eb31b8a10635c51af805be09fc002350c4a7bdbc12b0f572e8088
 EBUILD prometheus-podman-exporter-1.8.0.ebuild 1154 BLAKE2B c59cc2a1e61485cc7c849423c71e5ae0c1f1fc07e2763fccb904faec90ecdf920249549179f3f9436e6ec05b15b1dff7e9698e8ad3aae23c573886b107139d19 SHA512 7fcb8c45b1c79f79d7b3f5953a3a6feff3fe49e57f80f00bc8e84707bd2d8520bc1ccba91d96459ce99fe3d579484c70998d1906007fa20020ac76bea8e4a2e3
 EBUILD prometheus-podman-exporter-9999.ebuild 2910 BLAKE2B 661f60cd7591bc85137c8d1aed8c7dd955f12e9e4c0ea0c7511292131bdbc6a2d62b68adc550787c75223d07546c1d24a651e19a893a53c04d6621fc037f32bf SHA512 43cf204e8174c155c21dcbb049c0def70e94b19e4d1751577e757fb463f1f2d002370e63534fc2cba89540f71a47332c113c70dec8cd9b25f0d974738399d91c
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild
new file mode 100644
index 000000000000..4452311819fe
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+	SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+	"${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+	cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+		--- a/contrib/systemd/system/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/system/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+		 TimeoutStopSec=20s
+		--- a/contrib/systemd/user/prometheus-podman-exporter.service
+		+++ b/contrib/systemd/user/prometheus-podman-exporter.service
+		@@ -2,7 +2,7 @@
+		 Description=Prometheus exporter for podman (v4) machine
+		 [Service]
+		 Restart=on-failure
+		-EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+		+EnvironmentFile=-/etc/default/prometheus-podman-exporter
+		 EnvironmentFile=-%h/.config/prometheus-podman-exporter
+		 ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+		 ExecReload=/bin/kill -HUP $MAINPID
+	EOF
+	default
+}
+
+src_compile() {
+	export BUILDTAGS="exclude_graphdriver_devicemapper"
+	use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+	use systemd && BUILDTAGS+=",systemd"
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr/bin" install
+	dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+	insinto /etc/default
+	newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+	systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+	systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+	dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+	dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+	newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+	newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+	dosym "${PN}" /etc/conf.d/podman_exporter
+	dosym "${PN}" /etc/init.d/podman_exporter
+
+	einstalldocs
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cd7b3e007939..e4d2d182b1b5 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index ccfaa1f46892..569bb3d07bf1 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,5 +1,3 @@
-DIST nattka-0.4.1.gh.tar.gz 95941 BLAKE2B 4037c2b364c091e10f4684e8c1e59c26c7af943c6cf230058b115d4518f9b7589ca845a5174f6f99280b2cb1655544afe3ba727ef6276570a00fcd3e6117c382 SHA512 d490999b6a4b4938f85081750c9b67f3876b666c99f6b36eada32a66c0111fc2f1be231b49b08754b1213b616b854d5bb4865ea8e3540e2d48b504fdb7047d2f
 DIST nattka-0.4.2.gh.tar.gz 101891 BLAKE2B 33f1b3746d79a5945ab764cd6cbbc33773c3935c1e18627e2be7d1b740cf7dac95b0884989cf2a7189237b505ea38bb84e57d72ba7a97a29789e6ec372224d80 SHA512 6c1281aeb11d2a576f6474203df7a8dceb8451d243812da972c03ad282e2fb46272ee8f797f5f9f002b9953bf9cb2f8843754ee871adf56b11468f75f7108a4d
-EBUILD nattka-0.4.1-r1.ebuild 1005 BLAKE2B 046e7f0bd3fc6af9d64fc2985be499bf1822ec0d08dbd0ea41d24a0b16676717b9129e0c36d9b203ab586e5d049c9d557c43fcb1fee9c2265dff8f4c53b5cc04 SHA512 e820a5e314baca5db65f90d3e3d4e6139cb45a2dc57c3cc7c6d1a4c0903bbc8ed36e9b84ea0a1cb59b75d7441d69e7164b7ff4f8b4fb7339ac62561fa8e0192a
-EBUILD nattka-0.4.2.ebuild 1030 BLAKE2B d1f43a8f4edee67a02706541ed9c582054d5d0cc954863b604ced4535b057417dd53527d5492e74ba059da7ff63fee4a397a3d21dbc017504179bcce64ef3151 SHA512 b1e038a20869fb31b1e44fcade7a76b6d585245faa2417e730ee06db92645ecfccc4be20436c4f29d84bf566662fb86ee8bcf6f3fcd826e8dc51e6ddcc9b55cb
+EBUILD nattka-0.4.2.ebuild 1022 BLAKE2B 374bbdf1bb379e179e8e13562734618cf20e9a4f4072cc01d3a6743be952d7e92dd67f478d83976b60ec01ebd6b171b7f3972e9c090fc1d6ad7faa8ebe0a2e39 SHA512 ee5745bfa9a4fac6526ad3bc6022b04011b32e2edcad8ba53c757e958a00861930a11ea5d3027606bec2d2d5852c493136811ee04c9506ea1bcf0ccb5b54bb56
 MISC metadata.xml 507 BLAKE2B 8a1c2cdea4e8af36c498cdcab09ce144df070f082ed18a7fae9b6efdc51a62ed47d6afe77de4a416811e1d29bdb8989f4a470a012c6e08db757a34ecd60871c7 SHA512 82acdc10588aaae42fe818de37bc2ba23464e46847d8e9ee83240a6555e1b7d94a3495fa8df964b142977f9b42a404d5cf01ca2e345a4a2a36594a1039a76e70
diff --git a/app-portage/nattka/nattka-0.4.1-r1.ebuild b/app-portage/nattka/nattka-0.4.1-r1.ebuild
deleted file mode 100644
index 0fbdf6846c7e..000000000000
--- a/app-portage/nattka/nattka-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="
-	https://github.com/projg2/nattka/
-	https://pypi.org/project/nattka/
-"
-SRC_URI="
-	https://github.com/projg2/nattka/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/flit-core-3.7.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.4.2.ebuild b/app-portage/nattka/nattka-0.4.2.ebuild
index 13f8fd3432cb..e7018f442073 100644
--- a/app-portage/nattka/nattka-0.4.2.ebuild
+++ b/app-portage/nattka/nattka-0.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5a07bb284a9f..3b07b254a84c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 55c4a5ad7614..9c4d2ca34c1c 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -4,5 +4,5 @@ AUX docbook-utils-0.6.14-elinks.patch 239 BLAKE2B 3f2b99e9afe33849af50428053cd05
 AUX docbook-utils-0.6.14-prefix.patch 2810 BLAKE2B 1dcb7b40cabc930f96d2caa3c541dba42c7ab380a08cbaf6bf87b9c84dbb13f976c7f1dc05883c308b789c5295fd5ec97c2ef2aa8cf5046c9f302e3d8c873fe8 SHA512 c0fcd0575b031c9dba6ca42cac7e46bfeb687279006b69ba931dbbd546234309f9667e9a6bdd355bd518d8346589a68e1c453b36239fcb158899693819c41f70
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1853 BLAKE2B 06ea398147d39a5a970415c5cf61f35f7a33caa4e2e342eecdf4d68b4e089f2b22d738be3e17eedbd95b51bc3a31402e18db6d432f5fdefda940da9fd24c8d41 SHA512 a894ae7b80702844bbb9d9a13ab85e2e697f9098d3fc578468e8814ee012591373172bac51fed47315b3520ea7daef1554bfab7611ec520036e6fab0cb5aa2d1
-EBUILD docbook-sgml-utils-0.6.14-r6.ebuild 1961 BLAKE2B 0dc44ade5a776590746756f2aa305b5585978d5f8618ba91e1e51ad38b7e0d551265ef2f9c7652399d02186fc6e0a1d5fc777ef06f319816760f815b7bfbfd34 SHA512 cf7358232d77718d2559f4ce86ddf09fa319de2e4369f498cc98c41ff779727866bd423f29ce540945b13890892d1f8251d6546af2020239e84d5289aee1d76b
+EBUILD docbook-sgml-utils-0.6.14-r6.ebuild 1955 BLAKE2B 9a84543577150481a1f13446857fa9e03a8aebb8e6f3fd550f31d34c47902d3fb7d51573c9093551005ffb8640d31a0d18367e3f7f9d2e88e29e06c9432d0947 SHA512 0ebf68ac05df86a0c571f8c73dfa3cceb5b2bdfe30792e8a86a33eb4d4b54569d2df71b43a2efaa43ec28cd2f7413cbf3745b622200fc7a7c1d74676dfbfe6c3
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
index 8a3acfb1438d..5e1830de74f3 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 2b596ea4cacb..f4ac7a454636 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/make/Manifest b/dev-build/make/Manifest
index 9a9b2c2854d1..06d2df7e03c1 100644
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
@@ -1,6 +1,6 @@
 AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b755cd988054464275c5ae255a9c77a507d9772f2124614569a858c820c533a46d859e11813591a6cdea636d74f2a SHA512 f569ebd924d64c95e0d3d7c61daaedb7780cccded83bd73036d56f1ef658497056f95a65c463fe347b14b1d12205507173eaab8cb74205cbcf32bf1a25531f9d
 DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
 DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
-EBUILD make-4.4.1-r1.ebuild 1771 BLAKE2B d1241ad99452b8f62857dabae5b10f9cdccd402d2720cf9db381719e5a811a055134743212f9e858622a1ec80cede18ef6fb7069a59020212499d8aa8bc94c69 SHA512 6ae5fe0521b05b348c8fa25c3d4941ff5aa50862b833b41777a8ae3845f6dd3dfa037af934d18edd7f1620273005fdfd1ce148134cc37145edf66cdda26527c9
-EBUILD make-9999.ebuild 1779 BLAKE2B b0e81c5888baf20ef17123bfdc409cc06f7d9bd822fa4856273b0475502c36d5479fc49fbbdae09e832e125e7622365f4ebd5527cbf9bfc15012db55d97667f7 SHA512 9633f903c1c865859954feef8a6044588703d04ba840d633f5c38b1885d5bcaec30312ca38b86830419ce3255f0884965d8f7e48f39bea6d4a9d24ad7b0ed578
+EBUILD make-4.4.1-r1.ebuild 1903 BLAKE2B fe28f91ec0992e2421c0e1bbc39340211d0f7113e927a6ca9b7e08a3e2f3863bec7bf8414703fbb8fc96eb97898da3ec983685a30120a7b4546d143ad0fa783a SHA512 239cc490ff0fe0d64bbe71cd6d630f0dcbdc0a2d0bce86ab92a37dacfd02bb1b50eae209e75b4eda84791ff052b880cd72b0bff275ddbc625536df3dfa86a01e
+EBUILD make-9999.ebuild 1911 BLAKE2B 39c08fc7922d9143534b8606e46fe159cdc5d5814651f02331d2748cdf74ef178ef2801910270710c46d3f0827137bcf0a39d3dfe3b0a0c4a68f82982489fdf9 SHA512 d156012277ca0bdec42095125f1a5e30b1087e5761e86a42d96d4a5d12fbf6204f83e791e113615b8b9248a78b3885863f32ca770ad10f9c95def9a50eba841f
 MISC metadata.xml 381 BLAKE2B 867fd4a045ef622ccb62c72b7198e205293501d075ec0dca7daf702bacbe2df21ea23aadb4150e42fdc0914a95cab0f48d439c1f7073acf2302bdaf48fa18688 SHA512 66494f08f599035728fa7f87b3f7ca093e3c50dbb694aed8214d1dbbb3d1e03441e6e159b1453709fa8c7da8cc8d73ab2c972517a3506b1fb671533d459c4418
diff --git a/dev-build/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild
index c2fbdc0dcb2e..3a67d090b66c 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="guile nls static test"
+IUSE="doc guile nls static test"
 RESTRICT="!test? ( test )"
 
 DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
@@ -31,11 +31,14 @@ RDEPEND="
 	nls? ( virtual/libintl )
 "
 BDEPEND="
+	doc? ( sys-apps/texinfo )
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-make )
 	test? ( dev-lang/perl )
 "
 
+DOCS="AUTHORS NEWS README*"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-default-cxx.patch
 )
@@ -69,9 +72,13 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	emake all $(usev doc 'pdf html')
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
+	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
+	default
 
 	dosym gmake /usr/bin/make
 	dosym gmake.1 /usr/share/man/man1/make.1
diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild
index b7bd016b9653..568476904fc1 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="guile nls static test"
+IUSE="doc guile nls static test"
 RESTRICT="!test? ( test )"
 
 DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
@@ -31,11 +31,14 @@ RDEPEND="
 	nls? ( virtual/libintl )
 "
 BDEPEND="
+	doc? ( sys-apps/texinfo )
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-make )
 	test? ( dev-lang/perl )
 "
 
+DOCS="AUTHORS NEWS README*"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-default-cxx.patch
 )
@@ -69,9 +72,13 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	emake all $(usev doc 'pdf html')
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
+	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
+	default
 
 	dosym gmake /usr/bin/make
 	dosym gmake.1 /usr/share/man/man1/make.1
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 79d9228bf504..98d050e37239 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/lldb/Manifest b/dev-debug/lldb/Manifest
index b133e0741d8c..db891f606249 100644
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@@ -4,21 +4,14 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD lldb-15.0.7.ebuild 2787 BLAKE2B 606d1bef5194c6d173480719f131847bda2093a14937e831972e3514e86b9ab3f420f7d9cbc60457dacfa0613af21b88f0f91b20ac2215d10b18acf73a938885 SHA512 3e9adac80fbf2a37784e197e882d3a797e6f37b18afc06b8952f587b9259a0610b08702472360e4828e5499f56a520566cbbf869c19380227eaea172d2b35934
 EBUILD lldb-16.0.6-r1.ebuild 2605 BLAKE2B 93d0148ce952dc67a60579da1516398fe529c4efca3d15844fc7cc7aaac46ac9f5615eca85602346c0c5b6bebcb3343ca61a0e98aa7498e325200632ff084825 SHA512 51dc1b8d85da0bcd8e6f2a42f3da30f20861de1bcce8b03edd7ef924bdea38d192723d87364783e195585c1de096bb5a55ee46a8c9fb9b5da3e211a9228c59df
 EBUILD lldb-16.0.6.ebuild 2735 BLAKE2B 02d90b4ef7180e73efeff06ccb61f1f03ecda99183420245bec0c4b7884b01c570c2389a634db9f46386355bd3ccc9cc5a0a4a01e4254a8718a9668f96ea7517 SHA512 325400e59d98e87eceaf12710a127cc5927309f683f2460983004bd6acdd9115775b95b406b872464a0184e8a749d570265c9c18f2df7774021c4377574b68d6
 EBUILD lldb-17.0.6.ebuild 2714 BLAKE2B 6ee98a13b31268898a6c768368a1b31ab776790c57ec361cb5762cf263c09a3753e509bcc844260be4a66e75df78e67a318dfece1b70a2b79180dbd9a185a2a7 SHA512 8b4794a6b599a806ccb0b014b414baecac7882c136e5736dba2d37152387aa506074399db4f86407466a15ca4e47789c2843b1a5cc85e2eec9cfd1aa35359e10
-EBUILD lldb-18.1.0.ebuild 2620 BLAKE2B d8c73768046753f89c3922aeaa7f4113bfe0a264766765fb756f2f46c3b75610f5eebc4010d9abfba33fe39c04595e41b2eef732479028063dfb059263dd470e SHA512 614edb0432b74a3ee222fbc389a445c85f4a99ea3a862cfa033ace57f4cebf04098c56a4a0686cca78d46d27dfd5b74aab3634c1ff19d02838af5df3c187dfd6
 EBUILD lldb-18.1.2.ebuild 2620 BLAKE2B d8c73768046753f89c3922aeaa7f4113bfe0a264766765fb756f2f46c3b75610f5eebc4010d9abfba33fe39c04595e41b2eef732479028063dfb059263dd470e SHA512 614edb0432b74a3ee222fbc389a445c85f4a99ea3a862cfa033ace57f4cebf04098c56a4a0686cca78d46d27dfd5b74aab3634c1ff19d02838af5df3c187dfd6
 EBUILD lldb-19.0.0.9999.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
-EBUILD lldb-19.0.0_pre20240302.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
-EBUILD lldb-19.0.0_pre20240309.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 EBUILD lldb-19.0.0_pre20240316.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 MISC metadata.xml 495 BLAKE2B dec5cbc692a57ddb85bccb855d6e16893e6e851c6e3b3f321693fd7cb8bf930167976573d61bfca3c29dc667bb57c2c11669299bcc80d1da04fb53ea90ca1826 SHA512 6168aeac121fa7b3f19fe2590c4ad52eae959bfd3bebceebc64a54d254a29226d5424ab031f9730af9f574e3956119856d1ea2008b5d24721b346cf8f5ad7f9f
diff --git a/dev-debug/lldb/lldb-18.1.0.ebuild b/dev-debug/lldb/lldb-18.1.0.ebuild
deleted file mode 100644
index 7734bd04d4e9..000000000000
--- a/dev-debug/lldb/lldb-18.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
-IUSE="debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-debug/lldb/lldb-19.0.0_pre20240302.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240302.ebuild
deleted file mode 100644
index c79bdcdf6f3d..000000000000
--- a/dev-debug/lldb/lldb-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-debug/lldb/lldb-19.0.0_pre20240309.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240309.ebuild
deleted file mode 100644
index c79bdcdf6f3d..000000000000
--- a/dev-debug/lldb/lldb-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 694a2cd8fee4..755d3bc771a7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 6aa897071bcf..e36d5800c226 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1750 BLAKE2B 691bf74589650205182ca24a01d649678773a495f33876dc348a695fa34012782c58a723e5df0fca84d1715966c8bb8ac94cf30624ea773964330195c89109c7 SHA512 83d560e10793c5a188d6dcaaaf5a3bcd92e7ea1d5ea21af319b6ca9befeabc812af8122934902f3423afb6e3a941af5c38ae689e14584bce4753fb29a7db6745
-EBUILD libclc-18.1.0.ebuild 1299 BLAKE2B e3c065012f92bf55b94af30addaf2198d43828ce026f993eae0692ce9d20ecec9f5de1c4e9d42b1ddcc63fce380a3bbc8cbe1af5f5473a28638702bd516bd848 SHA512 fa756484b88b3b902ab3dc5913a5e2f1f291533b1e2f563f95b5fd5da571c84ad2606fd2a6bd59f5bf8a57839948fe06c49df5dc6da3132cf46caf52d2a5e347
 EBUILD libclc-18.1.2.ebuild 1299 BLAKE2B e3c065012f92bf55b94af30addaf2198d43828ce026f993eae0692ce9d20ecec9f5de1c4e9d42b1ddcc63fce380a3bbc8cbe1af5f5473a28638702bd516bd848 SHA512 fa756484b88b3b902ab3dc5913a5e2f1f291533b1e2f563f95b5fd5da571c84ad2606fd2a6bd59f5bf8a57839948fe06c49df5dc6da3132cf46caf52d2a5e347
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B 92a3a9d265bb42357c4ea9fb9d3d2987eb472a5a4d2a7531b2216cb81c09f411477eac675d6970084e8feebcf292928f6ca93575f51def4420ecead684136de4 SHA512 a53ed11ab2052cbd8f26c70c14994ffc347d373f07a820f6c3bf9335c64b72c1ac422998da2eb814e1ed83a9d6a80df75b405d9063c31404099c575c6d56b05c
-EBUILD libclc-19.0.0_pre20240302.ebuild 1268 BLAKE2B 92a3a9d265bb42357c4ea9fb9d3d2987eb472a5a4d2a7531b2216cb81c09f411477eac675d6970084e8feebcf292928f6ca93575f51def4420ecead684136de4 SHA512 a53ed11ab2052cbd8f26c70c14994ffc347d373f07a820f6c3bf9335c64b72c1ac422998da2eb814e1ed83a9d6a80df75b405d9063c31404099c575c6d56b05c
-EBUILD libclc-19.0.0_pre20240309.ebuild 1268 BLAKE2B 92a3a9d265bb42357c4ea9fb9d3d2987eb472a5a4d2a7531b2216cb81c09f411477eac675d6970084e8feebcf292928f6ca93575f51def4420ecead684136de4 SHA512 a53ed11ab2052cbd8f26c70c14994ffc347d373f07a820f6c3bf9335c64b72c1ac422998da2eb814e1ed83a9d6a80df75b405d9063c31404099c575c6d56b05c
 EBUILD libclc-19.0.0_pre20240316.ebuild 1268 BLAKE2B 92a3a9d265bb42357c4ea9fb9d3d2987eb472a5a4d2a7531b2216cb81c09f411477eac675d6970084e8feebcf292928f6ca93575f51def4420ecead684136de4 SHA512 a53ed11ab2052cbd8f26c70c14994ffc347d373f07a820f6c3bf9335c64b72c1ac422998da2eb814e1ed83a9d6a80df75b405d9063c31404099c575c6d56b05c
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-18.1.0.ebuild b/dev-libs/libclc/libclc-18.1.0.ebuild
deleted file mode 100644
index 1a8008058811..000000000000
--- a/dev-libs/libclc/libclc-18.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240302.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 15a69aca7556..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..17} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240309.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 15a69aca7556..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..17} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 1547f1aae82e..4a711ae11a93 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,7 +1,9 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
 DIST tree-sitter-bash-0.20.4-2.tar.gz 444183 BLAKE2B 31016de876ed84ab991ebc1e531dd750c416a86db5f91097db54e7362de673ea89bbf8863a9df487f75386f19a7e8ddde48a2e727af918d1beea8acad3ce67c6 SHA512 074f659ea475c7a442957a3df234f967ae9a6ace885ecfad6548a1d0f2af7535e5460d81bcd160a04bda1b902af0a9f741fc0c7b22309cd1d11ab2bc33ff0a22
 DIST tree-sitter-bash-0.20.5.tar.gz 525750 BLAKE2B 2508ede3ac6b0a7bac3f46af35ea018916b5cf6b0acf593e546146277c1a619dba52eac6064e3e0431e0f5e41bc80b441e0ac8886287ccce5bdabe3924a036e8 SHA512 bc1c4ec816183b4a4990decd45f3c46a424e29d4c417b762f3f761b6396faa984c6eb05237cb4921070e0b478485146889176a862b0935b4b345a704675bef22
+DIST tree-sitter-bash-0.21.0.tar.gz 557096 BLAKE2B bfbdb4db0f75c292567043a47d32e26c6ec119ed70fa9b77675eb57e686c072315fc114befecc430730c8eec20238544d13836402f2264a1b6657e0387d4987c SHA512 9585ea80f85bc7010444a91142bc943486ade68982c7ca367a6cbe65619af2bdaa1acd8b6ee698cdf74b84d62a7f44acc4676ddb4b6007035eb9eea4768f122d
 EBUILD tree-sitter-bash-0.19.0.ebuild 364 BLAKE2B aa9e2ebb88fc9b7cfc560a1363d7f6627f3a15e4be9d050a8c86ce394fb31717cc3bbafa1bd4be4e72d7a1798371743952780f96cab888fe5166312dbe30431e SHA512 08d01e57e92bcf1f0fd0f745b05e547e82655e15aba70a93b43f6893c9f1db4ed0faad844b3ad8d1a9d63eac7124c09237b58a9ec6c02bb0688db57ae2428a75
-EBUILD tree-sitter-bash-0.20.4-r1.ebuild 543 BLAKE2B 67da0f81f36b8dd1cc0c55b441187461616998dc4ac36b51f0acaaf1fad317bc6b1e175cf458a95b5008402afebf40843ad67a24b627fc93ffb11f315556665b SHA512 dfecd2a9085d27dfb367628ca897b12b1b1939d9c0b3c9493b06e3cd7dda7dc1393b23de6f9d2645e6657ea71dfa3700db4a0b8dbbdf28ac49feda7b3cf0128c
+EBUILD tree-sitter-bash-0.20.4-r1.ebuild 512 BLAKE2B 73fb15078b2830a9e470d2ec10c2da386835ca91cfeb22a54b1108b86f09122ca43478a94cc538e36df10f127db79e3815dd7736c3d3ca150351a4ea7b3eade8 SHA512 afdf6aa801ad1d8a7af0567a0901755cb659bbaee8f1fb0e03102150819747f70a930fd90cee2e877e46e52814726c52a9f28888eb4a5ca67ee0f7de6be4a11f
 EBUILD tree-sitter-bash-0.20.5.ebuild 364 BLAKE2B 2046737a627bfce8cf821b97fe10365c2bce44389f21b669ee24bb6df6dc6758ce9a409bcb4d57460f362a95c0f7006d7a32b1a8dc48e925b333bdf15644a0e4 SHA512 b98545066d6acc380dcfd16030417af37b26067b4d9f7a85e79660acdf8d3a5e2287728a4ecd418be1d230f15d5dc36f2473673ef4f69a7c8c0a793c79cd16ea
+EBUILD tree-sitter-bash-0.21.0.ebuild 396 BLAKE2B f39fede03ae7b8be837a3e27fdee6f411707f797089df8665e62ec4b1d79bcc66b448d2dfa4698d202217b0ba468a075a8a8f3efa1a64cf7ced02ae70aeb6603 SHA512 5d8bc0f257221f5f92d537f4f1e3d88ff5e05d0c50dfbf664e8682661fdbc591aa3e65a46175082cde39f94908e506aad770ebbb3c69c6cb9b3d59a1a0aff813
 MISC metadata.xml 549 BLAKE2B 0e7aa59fc51d20125f5a7b2310579c1f54ef300cf8140022bd37ba090acf4d20d567f154d2f456274167141e9ca242cd322d94f3146cd2358211e9229b3ca2b0 SHA512 68daaf748836ae31aa3a581df1591d7059aa8aa115907986f541f343f057def3bb4fdbc249d4db931680ea5fecf5c850fa5f561cd3dc275eb2bf026d38de1466
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
index c4ca2d385d57..8d2e42a385d4 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,4 +15,3 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 # Override eclass SRC_URI as 0.20.4 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0.ebuild
new file mode 100644
index 000000000000..b9d109250cad
--- /dev/null
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Bash grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index f65f25605692..be4fd1bae88c 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -2,6 +2,6 @@ DIST tree-sitter-cpp-0.20.0.tar.gz 504679 BLAKE2B 654f72f7a56a66dccf437ba5a2b2b5
 DIST tree-sitter-cpp-0.20.0_p20230410.tar.gz 715821 BLAKE2B fa867ce4e16dd1044007cf366bc711a6eb85dd6fee11796aa32d9bcee4ffbec3b83b7cd56333d5d79c3eb5e6f6e966291626d6edbb7660aed4b4e144caa18e60 SHA512 0d48722962909a708eec0c401e08f71f9eb3e742dc6bbdb0cfc9cb2b31c187b222866f279346de68726811db461f12fa6b1453bafe49d64f6c340a94a6a7abe6
 DIST tree-sitter-cpp-0.20.3.tar.gz 1056333 BLAKE2B 3b1fc2509da265b2f49ec1a9bef7b005b06eba0311432af9e2e97977ec3a568a8ee531375f5330e624675f5b12711c4cf3306959ec82d21f1017380fb6e28b7a SHA512 62630953cb873dccbf6203b90ac6bd62fb596a615c71603c93b4fdc1e21d456c8f6ba74576e9e86732dbce2b7deaa082ea35eddf7fd7387d1ba13236757dfaab
 EBUILD tree-sitter-cpp-0.20.0.ebuild 340 BLAKE2B 7538b5354dec7d1cc491ec4844de1c83a4b9321db37d5af571771a43f82ee9b8ea8eaf2a9aff7e1fa43c2aaf24fbee9a04019a05b6e296caa0435d576e421b51 SHA512 3dc1780ce9527836c585267b63591352ba5b1bea3d4b0c7caa0d4d5f36ec2419cff2bcc5cf05f8dc849f23a55154995cfb13e96a1cca1f846c3a0297fd10d6c2
-EBUILD tree-sitter-cpp-0.20.0_p20230410.ebuild 681 BLAKE2B 1d72270c1e739f09ca656746545fab1e36aac4ca3b33ba3ee6b52f768f7d9b865a2a36c06d92cd2d496068da6df12ca4ece827312fff3feac9c0fb431838a82b SHA512 a01af87f1c55d9cabb7dbe441c1820134dcc34f153bf55823b6ab44b12f2270a301ac974677fd89051fad49f0fe73798bda4ef9ac4db1877a893fbdb5a08a306
+EBUILD tree-sitter-cpp-0.20.0_p20230410.ebuild 677 BLAKE2B 17f96986df973c60fe004a8b94e267141d971bc02bff31a4314e282741108d3e2db9930dda8944d8aaec1554be932900b351fb5c58e9672e3c9135ff0debcbdb SHA512 b4dead1fcf0be97040516ba3a029edb95e93505809d84cea3eb56c1d66d45dbeb26c98cd5c636969ce3464a808074def40ec07fc825351d2e7b7e89ff517e7f0
 EBUILD tree-sitter-cpp-0.20.3.ebuild 364 BLAKE2B 1b939a3c1dc73e0b3ed1a1bc29f006a3b1f6de0e3ed24f516a7b8dcbabdc4cf086f1df22f9bad3fe7882d90b50eb4af477dd58593de49efa11e4157028e3675c SHA512 b8845db80d1d907977bd31810771e751f05fb47a574b12a0a462b05cd9409def079fbe2accdcdc15128527c8591640c7665ac0c56fcd839b04ad63ea9777d0b9
 MISC metadata.xml 445 BLAKE2B 38d48d1eecf642f04f8e069f60c9676668736864260ba6e59bb0ba1d67992a18267afbd2854e9455974d8f4db3179c7cb78c34411f8b838f677494023a87e6c3 SHA512 525b59cf53de56d7168998af64fa2b8bbce684defc2e3cecfcdec6e68aa8fa0adb45a4b2afcaff7dc5f4678a69db124785d9d1ca21dd73702bc90a2f3cd6e207
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
index 7b755f216577..7d1911486869 100644
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ GIT_COMMIT="0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"
 DESCRIPTION="C++ grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${GIT_COMMIT}/src
+S="${WORKDIR}"/${PN}-${GIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-gleam/Manifest b/dev-libs/tree-sitter-gleam/Manifest
index 38d95cb238fd..af46d83e367b 100644
--- a/dev-libs/tree-sitter-gleam/Manifest
+++ b/dev-libs/tree-sitter-gleam/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-gleam-0.33.0.tar.gz 145953 BLAKE2B 542014b5273d3426ca948ee08f778830046b58be9de410861ddf51071984b2c9619099d8f36670e9b47e3d16d53657923f6d2a902102ade7a668b4b1ee3c93aa SHA512 0d34c8d653805fc9284e496d047cd1480c0608a42c7491faa7f3840117fc003713f6233a80556169fdd7345b571b1ed7c6ecfb8aa44ffe3e625e564c332cd0b4
-EBUILD tree-sitter-gleam-0.33.0.ebuild 527 BLAKE2B a8087525c52bdfa27d4e67b6bfb77c12390392ba2e71d05d151b31130161a81c449e24a2b4d4686fdeb8936353090bf389ec45b6cbf83e2c9336dbae34ab4568 SHA512 b503af1245a8eaaf2c18512dc607a6541f2b8c2dbf784330ba5def216e9f1f19f294e48bcca3078fb93d1816ade4a69c40da5d3e454023b2704b1ed53901e311
+EBUILD tree-sitter-gleam-0.33.0.ebuild 500 BLAKE2B 38fd5a7ae08fdc8093d7041e556fdce333ba46e9475cc4a1e33f1219aaed1699ff37cfea5132d99a7d540629283d8c47679953c86d4f9d448b9392bfc7c00d7f SHA512 3ab2aa4f9a0b570dbcef2b402facea077de0aebb4ad9aadd502b08f053ec44b0431b36955e9e5aff94ee2ba71168bfeec4e5278499b537573da3dbb28d4f27d3
 MISC metadata.xml 341 BLAKE2B 67b3690f0533f91215d7fc153895735c2065dfda4d1ad37d38c85163ba467e0294ce44aee25e38e319ceb9ef39622f9aa786b50efce17b262406a953a0be1f12 SHA512 e78cbd8082406494301754fdf169a4161103ae203cd6cb51c37bb3529c77f4fd7da2c7446c8f89932549b612d28d2a52cf44c30a59397ccffc185a64e9b679dc
diff --git a/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild b/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
index a42d41fcbbc1..3db768bc2df6 100644
--- a/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
+++ b/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
@@ -8,7 +8,6 @@ inherit tree-sitter-grammar
 DESCRIPTION="Gleam grammar for Tree-sitter"
 HOMEPAGE="https://github.com/gleam-lang/tree-sitter-gleam"
 SRC_URI="https://github.com/gleam-lang/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}/src
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -18,5 +17,5 @@ src_install() {
 	tree-sitter-grammar_src_install
 
 	docinto queries
-	dodoc ../queries/{highlights,locals,tags}.scm
+	dodoc queries/{highlights,locals,tags}.scm
 }
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index 794d31ee1b8a..9444551758ee 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,5 +1,5 @@
 DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45
 DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836
 EBUILD tree-sitter-go-0.19.1.ebuild 299 BLAKE2B 4fdf4bfbcc4a8ff5e79eaa3c23ad4ccd4b7186e849164557076bd97cbd15a1efe6d9004892206759ec6a97dd61aa8784c02c19914e201a51370314ff70a2fd7a SHA512 242c0256830fbdbb67ca6f05ca6e4af4e4b6e31eea5ee0549436f1a256254961b6df93c618b5e0cbb9ec1d374c9ab069d333938645a12bd52e72e1e19bcc17ab
-EBUILD tree-sitter-go-0.20.0-r1.ebuild 467 BLAKE2B 1846835bd95ec0180989249941af6d002fbfcf4c43f29ec028ac177a99e179980ec191eb3c272fc3e0b4d77a71a01e97ee0017b088cfcb4e12f224c4592e5b45 SHA512 c290cb09cb4d7c01e60a6f0489d0505645e814118f1f441946b0aed472d26ccee776ec6916e8500bc66dc764b00c01bdd494973eaf2766382785270970d67d54
+EBUILD tree-sitter-go-0.20.0-r1.ebuild 436 BLAKE2B 7d57ae3c83ce1854ec4f83b9cd7ea5d1bd7442684ad69c7479857ee0781f8e457a0b2c0ffba6e9087f13f86c757e32da4c0b605436acc4cda15e64ff782658f8 SHA512 def4723c1ef76c1d4e5847f73d515acac0ab5e5626fb50069e2d9c1ae0d25ead8fb7ed7769e9e4c8e4bce42d842c7830c6fa584355ae176a3282b3728cf0797d
 MISC metadata.xml 444 BLAKE2B fa5fa7e6372e8bda6a7bc00aa4b7904f721ce2cfcf11cf9df7f582846a304f31750d23c6090b1e93584500bd1cca2b528c3ae14ac85bf31e7999ccb557ad8807 SHA512 372434b52dba0f7a4adfbc7ecd975fe161852a9b9c1c599cef12d3071c973a514e546e9182e0f3bb840a4d71109df5ab3e9ff6e1c86f72e6112551c8e37c0f57
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
index d1e163716e36..1d5e61986362 100644
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
@@ -15,4 +15,3 @@ KEYWORDS="amd64 ~arm64"
 # Override eclass SRC_URI as 0.20.0 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index 83438d6ff9c1..045009ae2c19 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -2,6 +2,6 @@ DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff
 DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
 DIST tree-sitter-javascript-0.20.3.tar.gz 394552 BLAKE2B e578299df6645b3529e8b82385a8060a8e25f122faf63f4e7f0ecc6ddbec7f29986c552a83dba9cf0bc8866225e749e3c9c0a5a9556e6266e8e731cf09af4def SHA512 31fd1b645fcbdd6670bc6b00e6c4adc2ce440aa35ba9b530a6161849fd70d0a38f8539727d321ba2bbc60a8d9bcf33296b561f8921115a8e68c50a40b253bbc4
 EBUILD tree-sitter-javascript-0.20.0.ebuild 315 BLAKE2B 2b9f5a9c4b709644a5c5c3794a70246704199b5626a48d3ebae585f6de8d69e31be08ff3023ff63bd995f520c73268d95d5f376d35d098594230501c030bd87e SHA512 2641dfcebef2c291114997f80fccc9ceefd352559b726ca3ea198382dfd055225705c4797eb4b33f5a20cd29c34a5511afbc53bc85acef3fffbd0df62fbf7c64
-EBUILD tree-sitter-javascript-0.20.1-r1.ebuild 476 BLAKE2B 2f57aa5a232bd376a798764bc75bb7658a5da934aec7cfc505fa4acbe2aecab9942db0485b0717be7eb38c9c77949555097f5bc47fbb95ae00016374a370fe43 SHA512 468d0bbdf623b34d890493247f1890bab3a9c2d451a4a8f18755511cc7759ad1aad47a361bb60322e4f9468f248e8034e45c194c35aff058c67a366579c46516
+EBUILD tree-sitter-javascript-0.20.1-r1.ebuild 445 BLAKE2B db27d411dbee91e8ce15ca9d093ed7d197dafa0161af52faf6599dccb4307c0a0298bc7a7fb4b69feeea9fafec95588d6f237dc02e9fccf6a8618e968a0b4eb2 SHA512 18f36b40a18ce2ee7863de12fc58522eab2e0066a5aff8d0f67feb8ed6d788fc52df3d3d97407efbb9c9cfd2c707eb8a206e65126516d7cd544e6fe94719a793
 EBUILD tree-sitter-javascript-0.20.3.ebuild 298 BLAKE2B f9c80cc1f9df5bb9b637e24c5ef4b82699ac1d53c58da0bc75c0deb511c3dc7fe14e2b8d1eebc1a881ad70a5328a6e83d1fedefadc9908c291f0353ee8e759a2 SHA512 8dbaf3d05913917c1601414fdcae326cef4dc8f071a7924d78a2b62edc6a0206bd6ff3240c0f2b008a3affa7d6ac60ccd097ba17d9382c66eb84a32e32b26e98
 MISC metadata.xml 452 BLAKE2B c0a1b41f1e185ed114d88bd150adb7c0db6b3f4519a40bf84947706621725cc592f31d30d83a2068458026fc920a6e273a480a63f9d90a136f7afab93cac4481 SHA512 e05141731ca0a84b6d6037e73c5ffe3a11cc6bf86f8d2c4642333ba05dff558eb93d8fb062cc67059e3ebe4d9b75041eb6f1ef3f79b38b1dc1abd9fc4c6fc77a
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
index b1b7e3a5cc95..e1d5ee9003fe 100644
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
@@ -15,4 +15,3 @@ KEYWORDS="amd64"
 # Override eclass SRC_URI as 0.20.1 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
index bd8cb40a8914..827546bbe8b8 100644
--- a/dev-libs/tree-sitter-ocaml/Manifest
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -1,7 +1,7 @@
 DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
 DIST tree-sitter-ocaml-0.20.1.tar.gz 1509589 BLAKE2B 965980ce37b27bde9771308eeabe5117bc7997f3a5429e9774eeb885b81199e5d8ebc471bc5cd10d3e15e2cbcffdf6f887f0623b61c3595deca06492d22c78a8 SHA512 c3a070367ddce3186ea09c705f4c08279f0fbf890669ce6486eef5b9564ea2c3a88041b3227ac9210fdb9257d4971697e6ceebea672fe37e7fce038cd9a09838
 DIST tree-sitter-ocaml-0.20.4.tar.gz 2849217 BLAKE2B e96ffaa2bd72b849f215a9d843fc8b27003917878a32eb5471a3ee4547a931a5dd4b991872d913f514d6519b9bf78b7b57bc501c89f360265a36abb695ed229d SHA512 517f1bf1ff989be4c0853eae20f3c7bc51ef3f68bce1a850d80c6ba150cccac820b6ead00c45e53acb2dd06e9b2e7646dda219353ffdad16be3329f2bd33593c
-EBUILD tree-sitter-ocaml-0.19.0.ebuild 318 BLAKE2B 9b0c72a32938b3f4f99bec3c84267d92c5f4522b7a67ac79e6f35f501062b8d13498560109a8587db1271fd814aeab6a433e4c8ac6f2d8f6e4cc542f42b289b1 SHA512 d5070cc56ff257abe8919f283d891d1ee8f3871d6e8338b24fee2541d9e1fc6eb046877105c7063da2e3a1b3e32fc25fa5ff73920b05f465c1f2a23a1c46aecc
-EBUILD tree-sitter-ocaml-0.20.1.ebuild 318 BLAKE2B ac0a99074f40bc451aa125409ffe06f978d8c737fdf8cae93980ccc874b9d2d44e52969ad9511f1c431a9c08644295900638fba5b69582683466aa5d48af23c9 SHA512 d2ed07156ea1c01278b04063103de74f72bf189e2a17b22fbb49c76a4666c97b3ac56ad4869bc6936e2dcafc9c8398ff40973fc521be65171668b37608f849af
-EBUILD tree-sitter-ocaml-0.20.4.ebuild 318 BLAKE2B 1fd82bba8237259ff8b42750a75601b9d2d60d1ea6ed5e9a110564d4a7cbf5ae04fe2c7711caa765ff2c366254342b39fca6fb0fb1499dc8c05ec6ac939bba3c SHA512 1535ad8558bbdaa9191aede143f5653eda0a3de59a9b814a6dcfb7cf591adb3f8bf294b6e0f0f735b7850ae565537dc998a5913761ba0e4b95e4d39473a0ef62
+EBUILD tree-sitter-ocaml-0.19.0.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
+EBUILD tree-sitter-ocaml-0.20.1.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
+EBUILD tree-sitter-ocaml-0.20.4.ebuild 314 BLAKE2B 15a7951580b196f2441ca495709693a40897d46ab3d372ebe20a1d3cbd2e5028c93a2f8e2a2a20487097379efbcaad451a03ef5fbfbcd4ce639b5f2c8358273d SHA512 d31b1476aa0a2f11e08308bbea3b5448710e8fe84f4d50422899346caa221b0ccf66f1756750cf30f090038cc487823f831c20dfc4712671cc34a74aa08c3390
 MISC metadata.xml 560 BLAKE2B 550bcbe717df1b3ba199b5895fb4cf884c3297713602f2f891445647f4c1dc574b371e3b5346eafe25ea4fe7f4290cdaeead02a70b05714a05f55ff2caa2e107 SHA512 4c56aa12beacd6ae57f60372fce8997e49a73b95a3b94487d9dff5a25ad42f771ae3b0af1a4f20d0e1e05c150bd16047c180d5a3e46db4f3a73dff51e9e0e3ab
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
index 41143977b462..afc9708cb318 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
index a22d049de4cd..afc9708cb318 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
index 263b5edbc896..afc9708cb318 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index ca06d4f647af..68e33507aeec 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,5 +1,7 @@
 DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
 DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
+DIST tree-sitter-python-0.21.0.tar.gz 275770 BLAKE2B c595476144931fbb08c404fd72d981ad8170333fcbec98cb4b7637932860dea3967abee712ce6afe1c6454ca02cd67e6c84e969ca0b5f593d6822ec1ee623afe SHA512 02410d235473a3e9a108b7820f146cdf8df5794814ff1e2ce8ccac1e38a727fa3e133bcac6718ade2a0d0f0965e879bb3cb9652d1d30f738969f458add53dc50
 EBUILD tree-sitter-python-0.20.0.ebuild 313 BLAKE2B 7daef9f803f6abf6261a2f5887c035485e581b26d054742676a5003e04ec090b1f0c98783c11fb160ac9e65b5dad1ef8c3a72dbb7e3157145e9cd5401208f749 SHA512 bfd8e60b322d9c49b2c6f0d124ae1f4cc4dd71d594fe8a3f04bcaa88906f0a7d1c8adb58876475237dd28e7df8e8600bc69f9475edebb516e964edcdce62d3f4
 EBUILD tree-sitter-python-0.20.4.ebuild 313 BLAKE2B e1b33ca7ea816e0da8151840451a11e5ba6f62c70ef31ca4b274b9e22f20246f08916787adab77feaec9507d66454f7213932bc9df26e4915cdbd8958cce902a SHA512 186a2485768e9034dfafc7471b702347ba2aadf8f3a47906a79552640feae5689b63fcdf61d12905b418de7860669deb836e8dc5d8f61759c48e56caa44f8eb7
+EBUILD tree-sitter-python-0.21.0.ebuild 338 BLAKE2B cdf58e460871b609b7654d4f62dce902d43eeb0ffc76a16fef1f9a27e38057eb54666ccf1333e0694eba4a18f42be1b309a7adddbce4234c76aab56b4b407be1 SHA512 3cf8d69b98096fb580eb2336c339da79a0023d6b11ca411edab2c1f245eee43e8c1e3d809109360e907dd09f88ae448c593b6044a197d96289609f6735ca6516
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0.ebuild
new file mode 100644
index 000000000000..e7ea609d79c0
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.21.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Python grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index 714c60e87567..87fb80c57c3f 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b
 DIST tree-sitter-ruby-0.20.0_pre20221101.tar.gz 575761 BLAKE2B 17daf39dfd812ab0993cd2a3ad728603d629c2e177261fa60d237a1dfd504b2a087611824cdffb03e95c0b304d9f6991ccf36aad1f18db4aa3177c082c6e275e SHA512 ff6eb4a28e5313cbdebca0f939d209d7c15016fef4ed864e64ce2e6f30023e15a88483c5bc90673fcee42df75c6e003b69fc2e5f81b72ecf1a506c836eebeba4
 EBUILD tree-sitter-ruby-0.19.0.ebuild 285 BLAKE2B f0eae4cb4a9e979353a83e56897ebd87c616877c292b03d1506f1a46fb05cf117e303a60245d213f97bbe429b6e6a32e4e5851618147ef59db694a7c7c4ffcc2 SHA512 4f50df5ca7ab14990741c761d98af7b3e7f812690e4cf97432a7294a567aa521d07603ee385484df72176fe0f53e914504c40795dc389a9e2ca42fb65a2d6592
-EBUILD tree-sitter-ruby-0.20.0_pre20221101.ebuild 526 BLAKE2B 195296829cf625e8993e136dca3b7cc116f489c66546854c0e4339d21de0d5bced85517d12c35505e0510d23577aa2911e859c5acd1e848eb3c0d632a06149f2 SHA512 3e4333910c9bce735995927bc2ce86d7b26efa15e47046d6b70bc8819a80aa1ecde97eaddcce41f1027ea05ff8ca0beab7451caa3ab90e4b8d00b7f8eae6fdf9
+EBUILD tree-sitter-ruby-0.20.0_pre20221101.ebuild 522 BLAKE2B 184d0aa99d2ae86b8abd2b2206fc279c01495f9e49267b64559e7d2bedf88ccd9173bbd846984c2fe8add00e0b1f89a1c102febfe7439a9b58d28f0838e1c7d7 SHA512 da273e117a0fee8ed52c99143923abb72225cf8c29b7d03aac502cd731ba0e012cabd2fbaf34542ccf3cab410a946126c5648201808b5a48f573bc5b0ce83231
 MISC metadata.xml 559 BLAKE2B 152613d9b7937a08857d96b4f66803dee57788dce76181acb149bd2a372c1647035076171da2fb0b0745d1762589dd829486536befd1245ad0e2d917fd646d28 SHA512 5c353e6872add822be369b693ec38c2cc797be4c57c23c5a43b144407b7af987f0741c3dc56a173f6ebf05e2d3fad1484f7d8b45393d211ea7e1ae1c9d6281a0
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
index 0dcbd7dc9e45..c0e7e24609c7 100644
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
@@ -11,7 +11,7 @@ inherit tree-sitter-grammar
 DESCRIPTION="Ruby grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_COMMIT}/src
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index f9635e614466..63312475d337 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -2,8 +2,8 @@ DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd
 DIST tree-sitter-typescript-0.20.2.tar.gz 826705 BLAKE2B f51e56932676bb16d6439a0513f38cd5970afff47045d3e43ad804c1557c6f93c267934d1cd7804caded6d14b85fb88e6f7c21ea99bc23e99912e6f434d96510 SHA512 0ed78e515ffa3756800e1c3864540b761d734c34efeab4c5ab46ea96ae026bc09f7c6ef51eaa7275cc06ebdccc870961580da1930717d038265c0293fcf1784e
 DIST tree-sitter-typescript-0.20.3.tar.gz 843881 BLAKE2B a8b01a6fef435ac089ff716be400e6f55b89256a0b170cef3d6103eeca301f076d909180db61534dcf58bcf703d607871193f0a517d34398d81131c6dcb0e977 SHA512 6dacfe3d329acfbc80dd798bc900798cf3bad06441ece0964adb51117876b8c54be7d88303deb3abf139d7241b60d45c458a66f6079a149c010a3cd55581065b
 DIST tree-sitter-typescript-0.20.5.tar.gz 1556573 BLAKE2B ae4d71cc8e4745a3b6899f3f28fb31f0d31b0b1f749a73485b5f0b9e81257bde1b3338650e72e7c0082386cabb3b04bfc6bf8a603305aa8fa44c1e08e3843aab SHA512 5b0f9b5725766069d1535e39f3a4658b5200a2a33c3b4881f4876b741a6c13f9140429b73621949e2bd1e06ab0ee147893fffcd3c5349df337eb923a649b8867
-EBUILD tree-sitter-typescript-0.20.1.ebuild 339 BLAKE2B 2e85a828b757db9a150980ac71aa8da12a31180344f145f66bddd2a69da709f3cc8c7e0e2c509d64e1ca5480ac9afc6f46cfdd2914091f1338cb083d87c36466 SHA512 ec25ddc8e69f09965106b9068788a71cc28f6cfc38434c54a6eaf38661b0a1f8c64fe74d212e47fe3f825ba909f689f13bf3fdb4646e95bae84093d87013d55a
-EBUILD tree-sitter-typescript-0.20.2.ebuild 339 BLAKE2B e9c4134395b0b48577ed5b81a0235ad8597a33ef693e3f27816681ebae998ff0d530f776f8dc67353a9a7ab0ee5d71feb7d0890eb6e973ad2ac254408b1e8d80 SHA512 0d89e0141e6d87709af137ac23af417cd696419cc92a4ba67fdce68116da9e9449757eb957105d7809f3a544a57689c88c8dace4e4b4a5595c5cb543edb4da07
-EBUILD tree-sitter-typescript-0.20.3.ebuild 339 BLAKE2B b046ec4e8a1dc01458fe207e5944fb9a17fd13bb9663b01d0b95f231ef16037a75a42304ed2c531c2f284233df117dbe1f2792307e01cb27c375082491bd515d SHA512 7e1fa7b8a03a6111069e174fe6ebb5ea15e10311ea652d95736428850bdfd1e710c4f8d939801a0aa1990f9997f1e918c3fc03681dc7be474feb5608cd84b129
-EBUILD tree-sitter-typescript-0.20.5.ebuild 333 BLAKE2B 3bbfd6d653632a7e25ec0f62d99593939d2479ea4278a1a8dac847bd4f9d6576af516ea9aab2910ef0352f33fb5567ce3a8ba1c725ea29337c65ab2aba123759 SHA512 99a34b2ae24c70078c3aee315bd780bb6e28956357c5c9df879f8cfd3ab2336603c8d371415aaf08a9673f7ac9b522309f951545559cb7a8365a729f8e45d0fb
+EBUILD tree-sitter-typescript-0.20.1.ebuild 328 BLAKE2B 01d9ff54b43b4cd657a314a2a05391a4de2c4edcbb9d83bfeb0e80bb5b56609db61a75b35fe5821c685e4ff93ffd2bcfb1adda9b1b0919aa4d4033ac2d6491e2 SHA512 e02b7e6633aea88bd36b8572d1fb338e98b37305192e39e51a892e6b8a45554d823dfe07e98c964d46da8fb622a7f77fe029d103578986c0f1534ed560634894
+EBUILD tree-sitter-typescript-0.20.2.ebuild 328 BLAKE2B 01d9ff54b43b4cd657a314a2a05391a4de2c4edcbb9d83bfeb0e80bb5b56609db61a75b35fe5821c685e4ff93ffd2bcfb1adda9b1b0919aa4d4033ac2d6491e2 SHA512 e02b7e6633aea88bd36b8572d1fb338e98b37305192e39e51a892e6b8a45554d823dfe07e98c964d46da8fb622a7f77fe029d103578986c0f1534ed560634894
+EBUILD tree-sitter-typescript-0.20.3.ebuild 328 BLAKE2B 01d9ff54b43b4cd657a314a2a05391a4de2c4edcbb9d83bfeb0e80bb5b56609db61a75b35fe5821c685e4ff93ffd2bcfb1adda9b1b0919aa4d4033ac2d6491e2 SHA512 e02b7e6633aea88bd36b8572d1fb338e98b37305192e39e51a892e6b8a45554d823dfe07e98c964d46da8fb622a7f77fe029d103578986c0f1534ed560634894
+EBUILD tree-sitter-typescript-0.20.5.ebuild 329 BLAKE2B 6a90eae0930c5633cb889012474daab79a05d202983739074fb0ca1786684362ddeedbab74e127baaead89ac431a66291f4650cb0805aeec15279659130a1241 SHA512 ed5f14e64d2b0372f6c79a84732d57c310ae43ab59ab613d6ac6c8795aeb969451f2e4b6ccf804c4c28dcb5a6696781e986089ddc7f5a73aa00488ff6713cb8e
 MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
index 91c68ef697e0..3826613aff5d 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
index 5186725e58e9..3826613aff5d 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
index 72a2b3dd5f81..3826613aff5d 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
index da5d17a90d8a..3ab5b3028d0d 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${P}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index cf1b44004be6..02597339a9b6 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,10 +1,13 @@
 AUX tree-sitter-0.20.8-no-parser-header.patch 1007 BLAKE2B f1e088a764629685f84d9526eda219a8e52f4e7e6aefe3cc1f4ef713ffa4b21cd228369f4be6ba082359a1065b73bdcb52f80ba1a1cded2215153e3d59d9097a SHA512 c2a5541fb528ca07daffb80103397226a59d53d4f206282ae43e2deee27220ef9a9d5ade86da7b09130398c8bcd2e809c547c490f8271ae696f097d89a6931e8
 AUX tree-sitter-0.20.9-no-static.patch 756 BLAKE2B 26b67c972575d3fce7d9ac841828e66d395c6b4d81b99023332649e72bb2a0a515b9c257a9927dcb654fbdf20c4b538b5ad39c18f063f47f3de171a2258eecc9 SHA512 0d624ae97d7bbde0a035128b372dc175eb9d0a41871270fb43179356632d040d7827d2d6a073a1f7ecff537c1ec1a647df907c5ee39ab6b8840a1827b7f1808d
+AUX tree-sitter-0.22.1-no-static.patch 858 BLAKE2B 0f3ea5693f55a80af02597c740beee5371b98cbf3c671c203fb5eb916f0454916c995fd3f53cd64942db2efef500e9473edd4ead7320d082b98f14bbb7fb0bed SHA512 90edc87e5cf6039ef86e7e3e3906acea2fc3066f37fffa026c832904effa7c3df546143b7b2465de0f979b3f8750cbb89778f8780b1cce0b529c542af7202f1a
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
+DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
 EBUILD tree-sitter-0.20.8-r1.ebuild 1328 BLAKE2B 53e234169c5f1378ed6f67a59a58e40efc186c0354b6b845973ae2e1676accd35f54434ac3a88d34648f27027439b5489a6db10953f9443cdf500e21f914301d SHA512 0ed16e8d4994053a6a08633793a6f3ff37e077e1825d14f6be8cfcff3343042b8b41f12195e987263350acc99a47ae3660f33b5c04c9c574e479dff08636eabe
 EBUILD tree-sitter-0.20.8.ebuild 1277 BLAKE2B fca5db0fb7a996038dd8c65c12b74e038d566b01d68e2a19ea00a56b69d5e17feb1f175ffc7077dde778861fa1a918e3f1d33201f08b3d46ec90cb19e5639acf SHA512 97138d0d18931238eb7359a4f0043c69bb63624785d48326ca127fc166c3cb8c372dabbde1aa787041fe7345aca642b6eafdc2c9907bc75992e771185fcf3933
 EBUILD tree-sitter-0.20.9-r1.ebuild 1329 BLAKE2B 0f6ec587af1f107c0b0ca55e0bc7f1deb617103f6a170f714c1c98154a7178d1dc6bc1248f190b738be9109a97119c725485e00a388811f33b979bbdcedea64e SHA512 8e0981af4402bd0d20b732752eb966ae5502b7e5a52f6c065e00598042733e8029f28c3cbb524a59e344418ec3bfa1560a7e3b402466a9ae16ceafaa06d2e0c1
+EBUILD tree-sitter-0.22.1.ebuild 1150 BLAKE2B 046ddf28b24a4bf7c4f58e09106dafee717965b7a890ec07124689c3126cecc470b9177c87708d2dadda0998cf17066635f56ba9bca8209205979544727f03ef SHA512 6c03ec0d32279d19198922f8a373f8faf3933c932b372526c1360e4e51d46327ea30e8c647161dcd153b74ec3e6011fc1c6a380d98d4d4b45308e96cdfdbf8bf
 EBUILD tree-sitter-9999.ebuild 1025 BLAKE2B 85ec2589b2036eccd8a1e73dbf66b250ac818135bfc771667f9c61f0ee9ad125992a94c01f33f0662d6bd059e1c57eda8616a2c2f0a918461db9ef09601b0834 SHA512 e3141a10101219d2ee2a978277214827b787ab0a9ed67d0532f070805393a05e5ed040c954d7c8ee157c5fb5161126ffb65a12b834122564d913addc9ef451ee
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch b/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch
new file mode 100644
index 000000000000..c2bcb3cd6fd1
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
+ 	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+
+-all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc
++all: libtree-sitter.$(SOEXT) tree-sitter.pc
+
+ libtree-sitter.a: $(OBJ)
+ 	$(AR) $(ARFLAGS) $@ $^
+@@ -69,7 +69,6 @@ clean:
+ install: all
+ 	install -Dm644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/api.h
+ 	install -Dm644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc
+-	install -Dm644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+ 	install -m755 libtree-sitter.$(SOEXT) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+ 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+ 	ln -sf libtree-sitter.$(SOEXTVER_MAJOR) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild
new file mode 100644
index 000000000000..05b74b9f9391
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Bump tree-sitter-cli at the same time.
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.22.1-no-static.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="" \
+		CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0c15394643bf..ce23bc6fca17 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 8fe8d4e50736..36e84816ad98 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
 EBUILD llvm-ocaml-16.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
 EBUILD llvm-ocaml-17.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
-EBUILD llvm-ocaml-18.1.0.ebuild 2466 BLAKE2B da2561431f2a593490fb3d20f208e69d97c1d8f95ef4d47681d2bdbea6f9f10bc470930787bf566bd052c49a5b4b8b9fc5f6b60bc837fadd0ae61e95e36c28da SHA512 9d3e85045503ba47be049d7b9edd464f4b2ea5828a63f289fa5129e1c1a2a308278ec22c396d2fba374bf457c1556df31c7d28ca5c237283ceeb5319fbd546dd
 EBUILD llvm-ocaml-18.1.2.ebuild 2466 BLAKE2B da2561431f2a593490fb3d20f208e69d97c1d8f95ef4d47681d2bdbea6f9f10bc470930787bf566bd052c49a5b4b8b9fc5f6b60bc837fadd0ae61e95e36c28da SHA512 9d3e85045503ba47be049d7b9edd464f4b2ea5828a63f289fa5129e1c1a2a308278ec22c396d2fba374bf457c1556df31c7d28ca5c237283ceeb5319fbd546dd
 EBUILD llvm-ocaml-19.0.0.9999.ebuild 2439 BLAKE2B bb0e88a5e695bdee92c2a6af929944f78ddb799f9efad1de86151a997e3b8c0bc099920b80aa5400fe072022b0a21767dd3187144c450dbdc859e0ae2591bd23 SHA512 4409ff11250d3d75f80508b2dcdcdd7571df68a7ebd33b8f08f4334415335674f1019fd7af56bda3254a28fa725cff394956b08b5de9176a2722bd020949a219
-EBUILD llvm-ocaml-19.0.0_pre20240302.ebuild 2439 BLAKE2B bb0e88a5e695bdee92c2a6af929944f78ddb799f9efad1de86151a997e3b8c0bc099920b80aa5400fe072022b0a21767dd3187144c450dbdc859e0ae2591bd23 SHA512 4409ff11250d3d75f80508b2dcdcdd7571df68a7ebd33b8f08f4334415335674f1019fd7af56bda3254a28fa725cff394956b08b5de9176a2722bd020949a219
-EBUILD llvm-ocaml-19.0.0_pre20240309.ebuild 2439 BLAKE2B bb0e88a5e695bdee92c2a6af929944f78ddb799f9efad1de86151a997e3b8c0bc099920b80aa5400fe072022b0a21767dd3187144c450dbdc859e0ae2591bd23 SHA512 4409ff11250d3d75f80508b2dcdcdd7571df68a7ebd33b8f08f4334415335674f1019fd7af56bda3254a28fa725cff394956b08b5de9176a2722bd020949a219
 EBUILD llvm-ocaml-19.0.0_pre20240316.ebuild 2439 BLAKE2B bb0e88a5e695bdee92c2a6af929944f78ddb799f9efad1de86151a997e3b8c0bc099920b80aa5400fe072022b0a21767dd3187144c450dbdc859e0ae2591bd23 SHA512 4409ff11250d3d75f80508b2dcdcdd7571df68a7ebd33b8f08f4334415335674f1019fd7af56bda3254a28fa725cff394956b08b5de9176a2722bd020949a219
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0.ebuild
deleted file mode 100644
index abe0ff931561..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240302.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 879c30db0807..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240309.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 879c30db0807..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4ff5d9e970e7..8c0b345890fa 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index cec509995b2c..d4d8b8c63dad 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,6 +1,4 @@
 AUX argcomplete-3.1.6-timeout.patch 945 BLAKE2B dcdfadbdef547d45013eee33d00166b98eb6621a55f5e399cc7d330541a95118aff4a1646a85a1351209f88ff0e74d66e2468ffcf3db7e91d44ef453cc9c73e9 SHA512 fc26fc219d88a74d49245a2d545cb8040fb773fc7a948847380d4d343f19650994771a948fce99311cab7b52b3e040cf3f58291a0ac50b4a4f262dbb28c1bf85
-DIST argcomplete-3.2.2.tar.gz 80764 BLAKE2B 0e059439c64301026fd238b070adb84f69c81f2f8fe6e27d31426abb71d4fadf8b34ff84465d9a9f5757550f6f55330ab17e204b7be18b459cddfb06c3851e25 SHA512 dd94795c561a692286341be234cd15ae684f0af6b11475322e6d616e640c27e7c9d9c73686790cecc09535b7f1287f95be2faa8b62329b12a6dbf9e2d403e439
 DIST argcomplete-3.2.3.tar.gz 81130 BLAKE2B 1c3a1c3fe9159ba1ab64db2a05d32dd961b08bb00d4cf3015fbb7990c02ebb766200fabe228c4e48ad791ea1a02db0775df1eec3181c7d1291743894e986f61c SHA512 25c73ec01a9c7e0b3d2cab1b86953369b0464431e86d6be2ba14d0209c1e1bc9fe5c5ce02590d86a44df74c9e828d4579b1265d2a37adf21f1e8bfdfb2350a44
-EBUILD argcomplete-3.2.2.ebuild 1046 BLAKE2B f83438383b94bf5745c59f3617b552ac62c29285e9ccd26f5cd82e97457847c6b15946d3a9130122669edc3623381b68aad8eeba0c6d3ad85969bafd746d43d2 SHA512 6d899c8cc0c21cffdcc7bf3e69db304a93db895d5062dfebd7f47bfd3b42a00f9c7969643448813c95d112e1d80276620563cba4015a423d747dfd53752a23b9
-EBUILD argcomplete-3.2.3.ebuild 1054 BLAKE2B 2849339689fefaf2ed8d99ee4d83e02eb0bfa4c5116b934a365d1b227abdceec8d29e4fa36fc1febe302d37eb89ca5368ba5854c3dbacfa04460e4bb98cc6b10 SHA512 4ac0706e74dab49b6da98d22737656f1e8955dfdd0ac70ca7b7a9b81a568d49ae63f7421ac3063d482a51e2ab6691d610be3f9321d8792a43964afe4b066354d
+EBUILD argcomplete-3.2.3.ebuild 1046 BLAKE2B f83438383b94bf5745c59f3617b552ac62c29285e9ccd26f5cd82e97457847c6b15946d3a9130122669edc3623381b68aad8eeba0c6d3ad85969bafd746d43d2 SHA512 6d899c8cc0c21cffdcc7bf3e69db304a93db895d5062dfebd7f47bfd3b42a00f9c7969643448813c95d112e1d80276620563cba4015a423d747dfd53752a23b9
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-3.2.2.ebuild b/dev-python/argcomplete/argcomplete-3.2.2.ebuild
deleted file mode 100644
index cdda946da90b..000000000000
--- a/dev-python/argcomplete/argcomplete-3.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="
-	https://github.com/kislyuk/argcomplete/
-	https://pypi.org/project/argcomplete/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		app-shells/zsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)
-"
-
-PATCHES=(
-	# increase test timeouts -- this is particularly necessary
-	# for entry point tests because they read metadata of all installed
-	# packages which can take real long on systems with lots of packages
-	"${FILESDIR}/argcomplete-3.1.6-timeout.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-3.2.3.ebuild b/dev-python/argcomplete/argcomplete-3.2.3.ebuild
index 0ea9deb31943..cdda946da90b 100644
--- a/dev-python/argcomplete/argcomplete-3.2.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index be1094e93d59..fb73e32f6d5f 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,5 +1,7 @@
 DIST asgiref-3.7.2.tar.gz 33393 BLAKE2B b5927a141772a2c0bd4c9354692558c766981a2d7b821122eacb7ee6b59aad86925dc2afb179ff9a3823a65cf17faee89bda5560d68a9ae6d82f9ad1cb31d7b2 SHA512 578ccb54e25869ac9bc7bcd59819d4fc056fdb89a27ec3d7c5b74608984c9d18b41f0b281a3a67bf6b56ad85a7009e336bbdd4a76e2b4a0c8a26c0dfef2687a8
 DIST asgiref-3.8.0.tar.gz 34907 BLAKE2B c8c45f0395719fe9dd9e78ba118a1f2311c1e661bfd7beb12845639dc28e6c0d7bef9a83580588facb2d5954417260233cd38643bc0de3e45d8f3655c6207128 SHA512 ef2e442ba684097e19f4f005c6474b4e6544c7902a84fab85c55667e220f5b1dc11b45d71657c457e7809bcb0b9c99446c79a476d46dfe0a7b77a7e59593027a
+DIST asgiref-3.8.1.tar.gz 35186 BLAKE2B ce18c03ad3de054375eb5c97792bfdb6b0ae19f8769f2968892d805d3c54c2d4e7dd7b05036bd786a828d0537fcebe983b46d38bdfc17d09be7e924ee3462d5c SHA512 3ef9ac2fcdce069cde96467abaa4a820c4eac19d40ce72e1afd0ca08279c00053a7e107966d766651def33a72a19c11559849b1032e89d62f544156590ef801d
 EBUILD asgiref-3.7.2.ebuild 704 BLAKE2B e46fd19f084d8f039570f244f5cbae0c7a6125d411058236d8fddb0a756840cb2f70db1d2ea476914de5dcc46c97e64bdbeef9fd30dbf5db00f7a09e07428426 SHA512 2b3254ed5b64c0ea6b7204899990e13ae184b5ee5e3046ec9cd3fa502ba7deeefefd3f8bf00599cead72d9684acf01ec280cd2c4cc8fb4ee9409b9546fca9ffe
 EBUILD asgiref-3.8.0.ebuild 712 BLAKE2B e7ead7dcf484b443eef96254734bb6abe1bb959b33b1c730e71fda753d843dc09ba8c79f31bfc5dcefc0cf1ed4155dd1374703f5a4db6454135e6524dcccdaad SHA512 842a6f5f760466618eb7991b25970b9a62bc246aae1ff7eb5915fbe50f484d3133b5ee18f7b8ddbaf1174d04352721a6dd84c563bf0a70adb3a3d3adecfe8e76
+EBUILD asgiref-3.8.1.ebuild 712 BLAKE2B e7ead7dcf484b443eef96254734bb6abe1bb959b33b1c730e71fda753d843dc09ba8c79f31bfc5dcefc0cf1ed4155dd1374703f5a4db6454135e6524dcccdaad SHA512 842a6f5f760466618eb7991b25970b9a62bc246aae1ff7eb5915fbe50f484d3133b5ee18f7b8ddbaf1174d04352721a6dd84c563bf0a70adb3a3d3adecfe8e76
 MISC metadata.xml 389 BLAKE2B 312af34b9583dc413f5a5d69c9677ebc2d3fb1d10c192f2b537d8cd057122086009d9c6846f9177fa6b1b96b6fa7641a3d833f4db34ef74db93e73f19042eaa2 SHA512 d35649849ab02fc46837b408ef7de3e45057517c472198b86a1619911bdb451ffffadb26f8dae864f194a1e5c6f424cc904ba342a8f8e84c69fe9fe75286e867
diff --git a/dev-python/asgiref/asgiref-3.8.1.ebuild b/dev-python/asgiref/asgiref-3.8.1.ebuild
new file mode 100644
index 000000000000..7b91be9aa018
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.8.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 175c505737b7..e1d94fc7f9ec 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,3 @@
-DIST serverless-application-model-1.85.0.gh.tar.gz 5472842 BLAKE2B 528a7e5f17a461741d3dd1911dda13c592a835cb2d44452d2c719e072e6d1dd715562d3660f9f92200ff6b5893d32e05ecc9faf30a835de9cc29ef72af4489f3 SHA512 a48b0ca4d18f524623f2e23ea3b721e1bda3bc94ded53859f87e40c53ba4e9f3b97423aee58f20a041eaba4a1b092353c88de33a52576fc4084670cb45f4c7f2
 DIST serverless-application-model-1.86.0.gh.tar.gz 5490164 BLAKE2B f784adc234080d447b33e375acf62ab65728655aeef2d6a4c1210535e55558f1afb85c011038b42435d5aaff8d69a179769a03d3c885e1fa487be434492c1c3c SHA512 e4ec2eca9f5531402f34e37c1bc7c9257f3120c3863f18bf2661b9f8757a680c6433d59c2a3f1b31e1ffeeffaa02fbd87f6407b3faf6ba5909bfefb79462ca18
-EBUILD aws-sam-translator-1.85.0.ebuild 1674 BLAKE2B 3f94a613a37ace84a96a89ab11c3829e6d98cb0a96cdc59566095ff722d47ed65b5f28404ba74469405c4561c765d4da4a8f8cc0a9ccabb89191ba148fd08de8 SHA512 df3938da391ec2c3ff39cf4b7129cef4945f62a75daa232e2c1d514e08bc7b37c45c5bb651f7f800dec9dd087a09411c8a75c370bd7f08d36a77e9ea55a1de64
-EBUILD aws-sam-translator-1.86.0.ebuild 1677 BLAKE2B b8d7ec7611f4ff1841b312269c528d21dbd9d48c87746f03031569931d9e0118701417533638e237b923eecd315187c2e4c23c254e0c8702544b31cf6319b4dc SHA512 67a57cf37ae68a6e578446382ba24eeac23c853719b6e5ef4d35070fa34dd33b045d1c8a49865b2e88f24b9979a03852ecda3720036d2d2bca794d9665a62561
+EBUILD aws-sam-translator-1.86.0.ebuild 1674 BLAKE2B 3f94a613a37ace84a96a89ab11c3829e6d98cb0a96cdc59566095ff722d47ed65b5f28404ba74469405c4561c765d4da4a8f8cc0a9ccabb89191ba148fd08de8 SHA512 df3938da391ec2c3ff39cf4b7129cef4945f62a75daa232e2c1d514e08bc7b37c45c5bb651f7f800dec9dd087a09411c8a75c370bd7f08d36a77e9ea55a1de64
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.85.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.85.0.ebuild
deleted file mode 100644
index b4675407f163..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.85.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=serverless-application-model-${PV}
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	<dev-python/pydantic-3[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts= -o filterwarnings= \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.86.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.86.0.ebuild
index 166699d76ae6..b4675407f163 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.86.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.86.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index dc63c110cd28..06c91a1e667c 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,3 @@
-DIST bandit-1.7.7.tar.gz 1980358 BLAKE2B 78330ff515a5b8200a05615c8fbad0a65011ffd9c29cf40464fee372417982738de7fd616d1b5f8910dbe45937ba6da6a87252f471e7d762a905f4683d3892f0 SHA512 32682a9a4c54532be398444799bc6d46d06e2806d3e3e851dd09f0151b21df5974eaa4c940307f32cd6c58b36b99a361cbd8c48f189c27071565be6de63b0db5
 DIST bandit-1.7.8.tar.gz 1983678 BLAKE2B 7891c6f3cd893c0abd9becfb648284cbc393c5d0d1be6d9bf9934fcd33038ac34afd40e3d5cb4ef2d3389cb33f73d719de21cd9ef3acf8f64c73e41a11fc4fb6 SHA512 a9fb2e052018eaff77617f0b9aded2e42f2e50f8ff08d273597a686376e2f621f0f7be7efbb273380155a8bbf2aed4c7f15e48b5652544122d5b9766a4dc1cc1
-EBUILD bandit-1.7.7.ebuild 1079 BLAKE2B ae307ea6f4e345eb8b4790bea2351dad56cfbe35ea4d0ad726915c99c72941a5836c5a68d0f21e83da69628610f6620a49a2c6650c3634045e0511be2984263d SHA512 5fc2f6190bbafcae242214450ae5e9a1e2f504c702a316d7d3f947a4acf140461b5b2e129c99431b0ac98fa1ee2aae7554050ebb7dd4b224053dcee8d708c250
-EBUILD bandit-1.7.8.ebuild 1187 BLAKE2B 7a1b1ffb531c47d643574064dbea1266bfe37d47daf2c241efc67245f806290b73525d036bedde763c86dbd6433914c5af95e3e57706202c8d0c8e545edcd001 SHA512 84c7909b08b06a0838239ac3552afef03f85e9c35188b5b784101339d3f3ce4772c776f84c762295d24593a2bce0e0b27144e704610794e681366c9c25a8950d
+EBUILD bandit-1.7.8.ebuild 1184 BLAKE2B 944f84c4ade8e8ced4158b7815f27edc1f08bddfc28d819a6051505da1d4a74491071385ab8ba258df7ba405ec40b4e4e5f70d834ebcb3e53d34dcf7f41dc1c3 SHA512 3ed3f7760555af8bb033f1e1796be082bb4a2d4150b195ee4ebaf8a8498d3608d2c053d26c31f02cb5a31e5e48c192678366498333bcd7c3f28261d58133c338
 MISC metadata.xml 810 BLAKE2B 6f836d0afbb33f233618f056a9d4161cbdafe93abbed2f321e4e799bb75a86e2c4cc27cd43e74d05e1a15496ecf52e6a575ecd8dd4ae463ee37f742331b0086d SHA512 e3dc0280839cb1a54a2585fd6fe19fce66ceff73a7e010479e99e9631c224851b303d577b5de0ba62bc94b78b9b75b30c0103421441bba9753e4231bc3914481
diff --git a/dev-python/bandit/bandit-1.7.7.ebuild b/dev-python/bandit/bandit-1.7.7.ebuild
deleted file mode 100644
index 8240885d8c64..000000000000
--- a/dev-python/bandit/bandit-1.7.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="
-	https://github.com/PyCQA/bandit/
-	https://pypi.org/project/bandit/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-3.1.30[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/bandit/bandit-1.7.8.ebuild b/dev-python/bandit/bandit-1.7.8.ebuild
index 13be010b92ac..6c48138a96b5 100644
--- a/dev-python/bandit/bandit-1.7.8.ebuild
+++ b/dev-python/bandit/bandit-1.7.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1d8a306f7f3f..29b95c94d064 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,15 +1,7 @@
-DIST boto3-1.34.54.gh.tar.gz 779564 BLAKE2B f61a74f6a317af6f180edb047e8c37e55c2d497c9507728eb098e2627d071aa56bae037a4bb8582774a49b20d0c1794a8793ab3d8e92d90071de3caf1d32bc2b SHA512 e3549e7b7ad254eafff60eb9bd21aa179f2840c2097874fb0a0602e767dbcf203742629eeaffe6432db65c3f76c326032e700cebb7ea92ebb7305ae6e26173ba
 DIST boto3-1.34.59.gh.tar.gz 782060 BLAKE2B d46f20f101f36380a17cb5c1bd511adde1b9fb01981566b863d192d0b93d9965a6720dc67ba47d4e1da94b3994dc5a6e59b1effa4e5c4f5e1e25f1683d99c40e SHA512 5d1d34339d60cd5c2efb60da885c4f92e5c245ef95bdaf46631d2938adf9fb08f7fba86ce2dd3e6382291d0d72c81aa9698cfe327d88c0b8ae8812d9c1e0b37c
 DIST boto3-1.34.64.gh.tar.gz 784663 BLAKE2B 6a4b335dba37ea09d7b2cec152699972b0b1db6c9a538435f565fcf6694d0f7bcff8e1dcec04f3a8a00844582eb8f5b3635b6425404020e760a35809c6d868b8 SHA512 39297271578a5766d95dcef540fa9f29831680ae13e618b3aa0890cf888e4e7f8c509d3df15e8003ab94c66c7de1442adf74a1bb38a8d5cb9bbab46f00fbc17a
-DIST boto3-1.34.65.gh.tar.gz 785163 BLAKE2B 15596df62933b72311f7f6cb7a9c710355ad040e4be8bd8c78481a1a69ccaafbc50ed427466da985c0031d5d1e440ba78fdc751655921d08f15c506d29b2d5d2 SHA512 12ded3641b4c18425886d9f017e157e22b587386d17a16914918deb68c5e8b13369e40af1012a8917621fd97c0d076057bf95d3e4a9ae367f9ccec3d88aade96
-DIST boto3-1.34.66.gh.tar.gz 785695 BLAKE2B b11aebb785ca7cf93f8eeffef7d96a698a3073e4144131c6e786518a957b5a346f4fb67a306461b25db3821e04ff5687c680a5f816c3c587b9196d77961d501f SHA512 80570ee5a0b7beaac71784a4edca2c5504a7d0e1195c919ddf9a90ae7b0dab30d7798082948678f7bd61e701006c7f35d417e905df5be7027e0341f9c649b724
-DIST boto3-1.34.67.gh.tar.gz 786594 BLAKE2B 633bcdefdd9753cacd2ca101ed72a544e11b2fa9137320b0c259808369ac017ec65e7d9dcd14daa3ac7e9f6dee23459ed6c119458b8d885efa77f27f2dddb029 SHA512 8c10d5ae3498191c2199ea4535b180d0f0cb4ac07c698970a2664ef8837c81ed8e23d1fefefd0ea79135fd0da68a60b92137a382daaff8ba306a977821a623f6
-DIST boto3-1.34.68.gh.tar.gz 786741 BLAKE2B f71aa7473d01a9a7f8904c8e27474e7c3794bfe5e9fdfef66e3d43c551c4d79104f6d73d390b1dba83e40ff41ca44dda7cde9f1651a3d6924a5b11afe12b8566 SHA512 77b8e4875bebccf1a35834629974fe195119759f739c01f811c61557cbcc3e09bba612ab0e7c236737fc5dd18d059bfc4c2eb337dc5bb4eafb58fe6ccbaf38ea
-EBUILD boto3-1.34.54.ebuild 1258 BLAKE2B 7f7ba2672f66400a4c2c202847d4bc7b57a0941b51f4f2f725475c38b6092c6a89687476db8bb701688ff47ccce491ffc435968a407ffc30ef860747573a1f43 SHA512 aebf347c928b4364a045a4bfb20edad39f9530fed5dfeef6b7e684feae0a146b71aa53cbb49f0b79e89671b97402aad447e6971df74ee44fef523ebad23f992c
-EBUILD boto3-1.34.59.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
+DIST boto3-1.34.69.gh.tar.gz 787293 BLAKE2B 9e46a959f3efdc3e673d38c8e3c30b8ceed1c1f47d685466e4164bcc1000381710bf8d8b6afff0999185ccddf38da591df004c54709729f2181308cb2279c43f SHA512 ef765518de95468e66270cea6dc93ede48547fb37db3ed9429659d85fb25174162cd062814c6adefeb8385c14079e7927f52d66501ab45f8d251ccfc830465e4
+EBUILD boto3-1.34.59.ebuild 1258 BLAKE2B 7f7ba2672f66400a4c2c202847d4bc7b57a0941b51f4f2f725475c38b6092c6a89687476db8bb701688ff47ccce491ffc435968a407ffc30ef860747573a1f43 SHA512 aebf347c928b4364a045a4bfb20edad39f9530fed5dfeef6b7e684feae0a146b71aa53cbb49f0b79e89671b97402aad447e6971df74ee44fef523ebad23f992c
 EBUILD boto3-1.34.64.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.65.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.66.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.67.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.68.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
+EBUILD boto3-1.34.69.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.54.ebuild b/dev-python/boto3/boto3-1.34.54.ebuild
deleted file mode 100644
index 2a35a5b9c0d0..000000000000
--- a/dev-python/boto3/boto3-1.34.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.59.ebuild b/dev-python/boto3/boto3-1.34.59.ebuild
index b64e7191fd19..2a35a5b9c0d0 100644
--- a/dev-python/boto3/boto3-1.34.59.ebuild
+++ b/dev-python/boto3/boto3-1.34.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.34.66.ebuild b/dev-python/boto3/boto3-1.34.66.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.66.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.67.ebuild b/dev-python/boto3/boto3-1.34.67.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.67.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.68.ebuild b/dev-python/boto3/boto3-1.34.68.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.68.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.65.ebuild b/dev-python/boto3/boto3-1.34.69.ebuild
index b64e7191fd19..b64e7191fd19 100644
--- a/dev-python/boto3/boto3-1.34.65.ebuild
+++ b/dev-python/boto3/boto3-1.34.69.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 27deef743d87..33aa7a200aaa 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,15 +1,7 @@
-DIST botocore-1.34.54.gh.tar.gz 12748623 BLAKE2B 2b4732636e0d7cf46e12fc2cf4320c7c4a89c79abe5102a06c0b60c61ca1f638edbfeda0248c3044dbfe594b3dcfe0e8e73f52011bcad0e96fa4c51f3b6b944f SHA512 36fbbd8ad1627b86723ffbb54149ffb7b740831cb31be2e9c0423d158c5755161ec853ef5f97f4fa2632116099266d5f8dc06e47fda6356f988eb39636f435aa
 DIST botocore-1.34.59.gh.tar.gz 12764223 BLAKE2B 13347793764afb8ef51502149f490e5082e65a76a3f72eb484d60ea44542dc8026ddfd6e6cc0c90273f6f3fbdc82e42bc6ad5f2c434900a881208ff79edcbf6b SHA512 5afe577889fed68308a414982c12d36ddc9ce1d7d7b866c544d1f25226050772775c7ee04e490f72d1f355a1f68fcfcb7431d626fa9a85f76065f2576de511cf
 DIST botocore-1.34.64.gh.tar.gz 12774647 BLAKE2B a41493d400b0f4f406a144aa968f0111ef2fa4bd739e43c6db8dddf4b70cfe68c714ec16875b942078a4bf8b9bd3a2dc596ea403c6e7dec6b076dccac7167c4b SHA512 66b7abf68d560ef87c94fbcde2738d8ce2c5bbd265678fab80d04966cdf1559c1ea3401dbcc6ef8e3f183a45ea1c3d31def8f1ce2c39135a3c247e73a18082b3
-DIST botocore-1.34.65.gh.tar.gz 12776587 BLAKE2B c2e54d007e910e5fb274655a0b8fcded4a44966b8f35097eed38ce8fe238cf694e0a26305df4e029115ee6e174314beb5d2934a08e36129388ccd8e2ca2903da SHA512 dd76e445f55b44bdf2b3b71aed2c5beec2332311af669dc04f073e885b54da3ccf79fd49bb5f97de71f6b3b7f36c6fd6f431164cde5b75241c7f89264fe0a4d6
-DIST botocore-1.34.66.gh.tar.gz 12780694 BLAKE2B 004e9e2d60c1b62a730cb9718f7f9b849ede23dfe4d08a138406c801de61b3867f78363167f9c49a64a0d604121d893061c068b1e4e0dda282911a428d88d613 SHA512 3731ea08a2868f59839ebdd3a194bc9afdfbc2b5557767846b5a97956ee2a29b454514a5af46dd65ac43ab00ed2d684572b8e3b0599be51349ef52808dc231b8
-DIST botocore-1.34.67.gh.tar.gz 12783869 BLAKE2B 762c01fc4f79213ace3f2cfe862db9f14a992fdeb884a6c8d7aeb5096bb74319ff29fc72c50717eb5a9a44eae1a55f226c57909f839f6690553d3dd1d8e2e0eb SHA512 18c1e3c2b57c74a4c61ccb66213f8e1108701abfae384732f6782492d4594bc3e754112ccb4aa26736f641baad4a30ec92a620d34bfcbcfd3ecc002d5a702a25
-DIST botocore-1.34.68.gh.tar.gz 12789296 BLAKE2B f8ed1d15f7bccfcba31dc61eb412f71a96344eb60c16ed18e307f63cbdfc621639d0222dd31686bdf1de64c3355bdba9345d861e3ad2904551f39974cff1c08f SHA512 e9bd9d895898da0096be5599a1109b927ed6a4706fd5fd5d82d628d4e92e36ba7864646612dadb60647d10b2cbcb790119d92177eaaebc13aaecb47c2f4a0b32
-EBUILD botocore-1.34.54.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
-EBUILD botocore-1.34.59.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+DIST botocore-1.34.69.gh.tar.gz 12790282 BLAKE2B 3d12eb5eb8e85777b43b3774e783c907f05e50dfe93445920ee0f42a82857ba7a70c5641e3cbfc03ab05f81f7cd989ff79e332bf2ae192b9bf7b3b3cbe6e9c0e SHA512 b520c5d3c6ce2f1db3e8620e5f7c882ed8483928de1cb32d22eabe76262ed8658614a0b1db42ceff445f11b009c48ef9a5761490e5982154e14173750b9e2554
+EBUILD botocore-1.34.59.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.64.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.65.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.66.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.67.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.68.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.69.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.54.ebuild b/dev-python/botocore/botocore-1.34.54.ebuild
deleted file mode 100644
index 7a44b043295f..000000000000
--- a/dev-python/botocore/botocore-1.34.54.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.59.ebuild b/dev-python/botocore/botocore-1.34.59.ebuild
index ba6cd2a5d2a2..7a44b043295f 100644
--- a/dev-python/botocore/botocore-1.34.59.ebuild
+++ b/dev-python/botocore/botocore-1.34.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.66.ebuild b/dev-python/botocore/botocore-1.34.66.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.66.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.67.ebuild b/dev-python/botocore/botocore-1.34.67.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.67.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.68.ebuild b/dev-python/botocore/botocore-1.34.68.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.68.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.65.ebuild b/dev-python/botocore/botocore-1.34.69.ebuild
index ba6cd2a5d2a2..ba6cd2a5d2a2 100644
--- a/dev-python/botocore/botocore-1.34.65.ebuild
+++ b/dev-python/botocore/botocore-1.34.69.ebuild
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a3aebbfb7ff6..370120b8700c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
 EBUILD clang-python-17.0.6.ebuild 1203 BLAKE2B 13f87c2782967c4fded88a60220b87e9f9f50d9c37543f30ab2b9ae94cdc5f53d2b1fb422e13450df50ecbb0e36f2a531705fd75f021f265e67f67dd08c85eed SHA512 8abd5bdb175a8c24c542dbcbc73617f075e50a555d9da698ae3139414c2fc11b9ee96d42af0829432c0d2f9d3c820683a2ef5946fdc4332f3d06e40466bbb38f
-EBUILD clang-python-18.1.0.ebuild 1205 BLAKE2B 78a006e8a28866a217ccf4a13e3dadd8dbba7c3f333b07dfcb67918f7f679018b0e73d67d3783dae074f9bc34620d6b475b8586fd3865d08f0b04433107c70f2 SHA512 0d40b1ad626b1c7ad89e633a8522e3d627a1fbbdc0a5427a24b7d4a1719f00d11552ac49ef6eb2cfb97129dc18ddf0767232bdac232dbf9d9a2381d5a46f04bb
 EBUILD clang-python-18.1.2.ebuild 1205 BLAKE2B 78a006e8a28866a217ccf4a13e3dadd8dbba7c3f333b07dfcb67918f7f679018b0e73d67d3783dae074f9bc34620d6b475b8586fd3865d08f0b04433107c70f2 SHA512 0d40b1ad626b1c7ad89e633a8522e3d627a1fbbdc0a5427a24b7d4a1719f00d11552ac49ef6eb2cfb97129dc18ddf0767232bdac232dbf9d9a2381d5a46f04bb
 EBUILD clang-python-19.0.0.9999.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
-EBUILD clang-python-19.0.0_pre20240302.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
-EBUILD clang-python-19.0.0_pre20240309.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-19.0.0_pre20240316.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-18.1.0.ebuild b/dev-python/clang-python/clang-python-18.1.0.ebuild
deleted file mode 100644
index 92a6321a504f..000000000000
--- a/dev-python/clang-python/clang-python-18.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240302.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240302.ebuild
deleted file mode 100644
index bef9bf6fddbd..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240309.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240309.ebuild
deleted file mode 100644
index bef9bf6fddbd..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 9e136b76c3ff..8b5ccb51f19a 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,5 +1,5 @@
-DIST django-rest-framework-3.14.0.gh.tar.gz 9056443 BLAKE2B 217be67f42207d72d862011a72aecef3e111c1e1dd4b4e090cae6b22dee3fb32e060f7877c498084cf1221eb960b4ca895ef55721f7cabaafe3e36ee152e17a8 SHA512 c1012c656b427e0318b2056e2f984ddc75a5b4e85f375c76fba165ad06e285848eee1bc6dc76c097daec57d780efb2551110199d62ce636a03951aec13ab4013
 DIST django-rest-framework-3.15.0.gh.tar.gz 9293419 BLAKE2B c6884185b8a11ca044956ec15bf3d31c3c46d8a911128f37ab305d89540a223e4b04ac4c13fc107333e9774ee048505f6cd0c66989f9f3cc9511239354572d25 SHA512 1b283fea0a94d64ea29bef59f18b5cb309627b7b927d80cdaad11d1fa9c4df2e2059d619ca5a73f382fa21bf847a266926542c1a1f5764bd6404d7c11861efab
-EBUILD djangorestframework-3.14.0.ebuild 1307 BLAKE2B 41b40dd945007763cb9c35451b78a2b5eda5263b4cd1a0c95102cc7da2bcca09474f6ebabceb1847f79573936313865c2123b2797cf25a6062b7f48fe75d0e3f SHA512 5ac1a0b7dd41f3cc52d3ad2d356469fecd5f55053930d7ce5df9fb694a3744a14f39404fa36c2bc421bab3498fc01557e9e2d3bf783e54593fd4e1afdf830f14
+DIST django-rest-framework-3.15.1.gh.tar.gz 9291840 BLAKE2B daf672a1fb01494f08dd54af7369bd464d4fc1e22ff3c90c0fe787408d4f327710c5e6394e33546a4df2da752dbd774980f092108f2f4e395795af3aead18f89 SHA512 e44c3d861973928194035364fb6b5ddffbcacab959072b2c549971dd6675b5a5f1be13b55856154dbffaefb48dcbd4a63fd9ffbce5456507b52fd5e4648706b9
 EBUILD djangorestframework-3.15.0.ebuild 1307 BLAKE2B 2fc7f227e4ae0ec70cdbb0964dfce69cd6288f8934b3a113468a3041f3d4de1b37109b45ad60c1356078b86a8135d10424d80f354d5f27792df5196351aaea86 SHA512 7dfb6ee8adeb51473c124ffa4149dcf3b3d6edef8b2a56418be6166b96d9ae352dda754b33f8872993f938177ed36942795e3fae47f9002e8ecb85c049ba48ce
+EBUILD djangorestframework-3.15.1.ebuild 1580 BLAKE2B 4104bb883508a9b46397d8af23e2ae0c570d0123eed908d34b4841d9c2d57dd39a52a239c37d9b730f64f5fa5d5e6019d96e3c2a8534a1a83eb44fc5b7fe4d92 SHA512 4c236c411ac7bc1c8ffa17528a55111878da8b52822dbebca6bfcbc27285d5dd6d0b84dd05bf85efc05f3b46927b0d98c64e3c25daa846daa6e1c5d07bd70011
 MISC metadata.xml 415 BLAKE2B bb9ad83d104afc4bd68af5918b0ee30646b152c16115338e9a80ca4b6cdff52a15a9f1a7877d0964c974710b7a23401e8560ae9d621a57053cb10cd998dc699e SHA512 983ee54c8b07fa5078ce4e7fc87f1baadf540d8b5a25bbb34c1419e5892ad6c0dc518b617e02958b3dcf67aa02d24d74483917c37926f930608b83913afab334
diff --git a/dev-python/djangorestframework/djangorestframework-3.14.0.ebuild b/dev-python/djangorestframework/djangorestframework-3.15.1.ebuild
index 9cd99ed8fbf0..4bcf2d5c27de 100644
--- a/dev-python/djangorestframework/djangorestframework-3.14.0.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
+		dev-python/inflection[${PYTHON_USEDEP}]
 		dev-python/pytest-django[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
@@ -45,4 +46,8 @@ EPYTEST_DESELECT=(
 	tests/schemas/test_managementcommand.py::GenerateSchemaTests::test_coreapi_renders_default_schema_with_custom_title_url_and_desc
 	tests/schemas/test_managementcommand.py::GenerateSchemaTests::test_coreapi_renders_openapi_json_schema
 	tests/schemas/test_managementcommand.py::GenerateSchemaTests::test_renders_corejson_schema
+
+	# upstream is removing pytz, apparently it's not tested anymore
+	# https://github.com/encode/django-rest-framework/discussions/9342
+	tests/test_fields.py::TestPytzNaiveDayLightSavingTimeTimeZoneDateTimeField::test_invalid_inputs
 )
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index f4c167d8e2fa..2f8e3bff786a 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,5 @@
-DIST google-auth-2.28.1.tar.gz 240469 BLAKE2B 5bb74863eceddb7e0a1cdd6adb52a7467fcbd23a913177d20910194458721c3abcaa5d2f1f93324fae08aff91c8dc9fb65ba786ea8ed698daebb440505f17b2e SHA512 013c90dbeb6868406f56de87b72277a7932795ae3b806442bf07e90d34143e9a8035d2481f8c46a707a2bb0ed4285a1cb249613eff0da0b28b1aced783ce6a08
 DIST google-auth-2.28.2.tar.gz 240450 BLAKE2B 8e82f3e27ca6eaf61c48acdb233437caaebd5c4bd59a0392c097b816a4efae74b492504608849afa85d58d32822943e245b355ac48d18bb1fb6807cc7278bdba SHA512 9aaef2034a1b85350a39662dfa2ab53fc4e6a46326ac5cf2e361b3f8febd196d2cf5e5ab01c1bb3fedf33f0e1526ed33db60b088ed6c943732a70ed65c7cba01
 DIST google-auth-2.29.0.tar.gz 244326 BLAKE2B 36b0bd8f445e3c7c3e0a83d07cf5924401dec99cdd22a6042bf5b9ca1cc9b1e28d0029f8f1509bcb32a7c54abd7c453dd5077ad25886d265822cf1c880b1326f SHA512 0f6d7e9728479a5937d72321f5ae6cfa3592dd42bb518a5519fc0936b533472e872fe947470a1774f8e53a2dad3c65e001de3899b74b6373dd149c6944423473
-EBUILD google-auth-2.28.1.ebuild 1439 BLAKE2B 7f1d474e335a4a6ec0a86d6f47d69accd6ae97bb5ff53f1d1c4e8d78c79ffcbaf3f1a633a279936276ecf707cc2455f494a68a599c3299f06e73090e08d3b4c3 SHA512 cedc905deb31d47c3581d26b8b7765145452a281c0ca0ba79966b47d1f20779ab41e6c321b3ced80b7d805bd3d9ab47cdf041e3d0c727b69c88059b584e6b54a
-EBUILD google-auth-2.28.2.ebuild 1442 BLAKE2B ecbc9be9f3ad790c4f3b52d359cd4e3727fb67c5b179a6a3da566077ad811ac6e7cf459af03fcfd088e8c61ba035780fb3f0f59f79be33f2699ad044a821af10 SHA512 dd25537915a25048d6baa439a9c983c432c334a7cc395eda312d2517c71f83750964cd4d1978886d270e3f6e38f020f75875ecfd86e9bd102a265e9c729bf812
+EBUILD google-auth-2.28.2.ebuild 1439 BLAKE2B 7f1d474e335a4a6ec0a86d6f47d69accd6ae97bb5ff53f1d1c4e8d78c79ffcbaf3f1a633a279936276ecf707cc2455f494a68a599c3299f06e73090e08d3b4c3 SHA512 cedc905deb31d47c3581d26b8b7765145452a281c0ca0ba79966b47d1f20779ab41e6c321b3ced80b7d805bd3d9ab47cdf041e3d0c727b69c88059b584e6b54a
 EBUILD google-auth-2.29.0.ebuild 1442 BLAKE2B ecbc9be9f3ad790c4f3b52d359cd4e3727fb67c5b179a6a3da566077ad811ac6e7cf459af03fcfd088e8c61ba035780fb3f0f59f79be33f2699ad044a821af10 SHA512 dd25537915a25048d6baa439a9c983c432c334a7cc395eda312d2517c71f83750964cd4d1978886d270e3f6e38f020f75875ecfd86e9bd102a265e9c729bf812
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.28.1.ebuild b/dev-python/google-auth/google-auth-2.28.1.ebuild
deleted file mode 100644
index 9cfd3b0ae33e..000000000000
--- a/dev-python/google-auth/google-auth-2.28.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.28.2.ebuild b/dev-python/google-auth/google-auth-2.28.2.ebuild
index e044a6c75ff3..9cfd3b0ae33e 100644
--- a/dev-python/google-auth/google-auth-2.28.2.ebuild
+++ b/dev-python/google-auth/google-auth-2.28.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b5d032ef706d..cd495bdb109f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
 EBUILD lit-17.0.6.ebuild 1026 BLAKE2B 53cf66c043c39b6d50c2696206341991c231d956b1c27c91335c2648e6c687cb4074ba85958402542712d7ee8a9c4cc6ff95707e9046d52cdc61d2f4da6b8f6a SHA512 0b7048ff2ffb46a1a6407240b9ec4f7543618032a0bee7941cab9b304e252b22efd764b0d89aba821488135e5a7cf1939dfb6658b6d8ae1740091aae88143156
-EBUILD lit-18.1.0.ebuild 1029 BLAKE2B 867dbe4c176cf5e3e1221e42b02bbafcb2c937b5e43cf2c602fe6274c2e4104025124b6c6985e82862d50f7fb2a940c006685769c2cbb6d7e96b6dd52e32d03d SHA512 e0da4131bd1580fc0991eb6f2eb3e68416ddf9c717f90a87f085e78d2557b925d755adf8d7c29b19118fe6e1eff22b608ccb9b122294e56fd9b037517d791b57
 EBUILD lit-18.1.2.ebuild 1029 BLAKE2B 867dbe4c176cf5e3e1221e42b02bbafcb2c937b5e43cf2c602fe6274c2e4104025124b6c6985e82862d50f7fb2a940c006685769c2cbb6d7e96b6dd52e32d03d SHA512 e0da4131bd1580fc0991eb6f2eb3e68416ddf9c717f90a87f085e78d2557b925d755adf8d7c29b19118fe6e1eff22b608ccb9b122294e56fd9b037517d791b57
 EBUILD lit-19.0.0.9999.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
-EBUILD lit-19.0.0_pre20240302.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
-EBUILD lit-19.0.0_pre20240309.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-19.0.0_pre20240316.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-18.1.0.ebuild b/dev-python/lit/lit-18.1.0.ebuild
deleted file mode 100644
index 5476bd8c23e4..000000000000
--- a/dev-python/lit/lit-18.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-19.0.0_pre20240302.ebuild b/dev-python/lit/lit-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 3d0315962098..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-19.0.0_pre20240309.ebuild b/dev-python/lit/lit-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 3d0315962098..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index afa87396731d..af5e4687d6a9 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,4 +1,6 @@
 AUX manuel-1.12.4-tests-python311.patch 793 BLAKE2B b5af04ad5b1508d35683e44c6fcfaf5c5d364c14f81d569c7971179a959c2eea98d70d077c45fa9473e4ae79f4a471f51e587c421588bb2e0795cbfc2cbd3c55 SHA512 1a89e91cbb63c5d040aa08afbb86e5fecf4fd8fb4d43079ac0fcb71d1e9d6cde7ba0c7eb042016e5e5eff8c594785662be3972c4667dc4e18ad7dcc1fa856eb8
 DIST manuel-1.12.4.tar.gz 45369 BLAKE2B e15f9261854fbad8ee1e1dc8645ec286a212c460a78fff1576b6886d8bf462ffe9a5484338fd9efc2bf053a7689e16b08de55f763ae319e66a363c5c28cf2a60 SHA512 cd65307f2ca94e66d88bc0c7c75702d49f505b358ebb812fd20906036ba10f2d1d11d2d69404b88c5f10b584dea05a988b5dc8ba07210b9d20ebd8a11b701633
+DIST manuel-3f4d94d2ace3bdab4acad6896c93f5c96d6bee92.tar.gz 39774 BLAKE2B 7be5bad5ee39358e1b0229c02c86c9492cae09684d8a942b9f5dcf0afe31037f635295019306d404a1fb0b81e40bb523d194cc499a89b32600f1a330ddaf4d2d SHA512 f96fe6c9438b00d7562d64ead32ef84dcc4746281f066e4e7c175b1b274691ccd615c31e1d26fdc25a67e67d03f28b52182652921ab2c9ff365f59aaa475adaf
 EBUILD manuel-1.12.4.ebuild 761 BLAKE2B a644564e3cf43496af80d462edc1127ba1e5ead2bdad71e1c97734194f4958850031513f4d912ad060dba24b02b9a01c38610462a4e6956a77cdaa292d96b200 SHA512 daa7c386108b56fa45e65aeea98c9a01b8b875c3b7650d15875ae85594408e420a0f2dbd50a5ad51af64e881aed05b9b6de64093c72a927543cdb2de211eb671
+EBUILD manuel-1.12.4_p20231129.ebuild 1076 BLAKE2B 1e3fd706b83d4d6350ddcf9e22b844f9768eb8302b4d90de1c0fa2bd961ed4722d447aeddb173943f800161fb29e24b17a07ef036b0f0629be57560725d96c6b SHA512 ebb9046a9b0d95f94932d0d94c2a6d4fb087f5b61617d1ac396b42acc9e04cb3c2ffc380444945e1faaa353ecfcb2d8ff2d7eafb7dbf504db38860821b29d106
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.12.4_p20231129.ebuild b/dev-python/manuel/manuel-1.12.4_p20231129.ebuild
new file mode 100644
index 000000000000..17f31d055f8e
--- /dev/null
+++ b/dev-python/manuel/manuel-1.12.4_p20231129.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+EGIT_COMMIT=3f4d94d2ace3bdab4acad6896c93f5c96d6bee92
+MY_P=${PN}-${EGIT_COMMIT}
+
+DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
+HOMEPAGE="
+	https://github.com/benji-york/manuel/
+	https://pypi.org/project/manuel/
+"
+SRC_URI="
+	https://github.com/benji-york/manuel/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# unused rdep
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# tests are installed to site-packages but dependent data files
+	# are not, so run them from src instead
+	local -x PYTHONPATH=src
+	"${EPYTHON}" -m unittest -vv manuel.tests.test_suite || die
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 95958593ff86..e11e35c8eca1 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,6 +1,8 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
 DIST mkdocs-material-9.5.13.gh.tar.gz 14797946 BLAKE2B fa525ff6577eb9409f08a3dd3b609f85d5bd0eabf3922d2f32751ee3d2fd52a09bdcbf4aa73f8a5c5185ced8eed542a33f414980a1632cc995d572b50fdb277d SHA512 57cb9a8d18bbb1d4ce43976b59737fc9619d8755f1736687b8399df7edbe0f44e91a97256ede886f45583a32d3cfdd049361c817310bbaca045b96e1a0d3e5e6
 DIST mkdocs-material-9.5.14.gh.tar.gz 14819394 BLAKE2B 27c083e03d46ba8e24750065eb498bf8f1745715e9ec1e0c6785f532a93e05415fe1d4d8490d738c2b6f016573cca1897dfcc05837d5e3fda90b14d65889caf2 SHA512 6d371e43cf6051fbe58c2eca60cf9371626876be5640bfe478ec97f4c9c8ae4f019211c8d8fcfd1fbddb88a35680c821cb6870c565b41a337f0b7aecc59abf9b
+DIST mkdocs-material-9.5.15.gh.tar.gz 14819594 BLAKE2B f0d992962acc7636218222913fcd8d40b6b74c3c4555d1ed8d5b30a4d438c137849624a28d3ed015d04d8c62955d9fffcb5d4e12a3008512a3d3247818789d9e SHA512 341069be531e8caed1e13fed1fabecf2dc4903afedfcccecd36955b22c859b748c88a900c7fca485b796d53812a893f3e49f2e8e519c1bcd8f5b8e7bf32d788d
 EBUILD mkdocs-material-9.5.13.ebuild 1794 BLAKE2B 57edfb330af7a05f23b7baa57c878462f123a83e5b647ecfab1b8e25e5aa44a59586878bab2e3b7744174bc818dd4ba6b4561d3bfb7df69de53db1112ece4545 SHA512 bdb3af90984d501faa16d0cd27bf72fc9e4965ecbf427b99fcb5e7d615f4edb8610bfeb86b958559a3640b05d4bef3e2d7fe35a3e136ef044886461deae6496a
 EBUILD mkdocs-material-9.5.14.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
+EBUILD mkdocs-material-9.5.15.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
 MISC metadata.xml 1146 BLAKE2B c9eb031eb40f303fdcc39f891cdd2d4317075deb030d0f8374f874ecd63bf73960427eb3ee485b5b28515f58689b1e1bf977ee7b565bf8f9275b115853044f2c SHA512 01db399842cb09af4823278f84fcf8c51ed42609a2e61d8e64964e1759e14d22ed2f32ec0565f19184575089a218dad4939337798cd3a5b39f5be55f5f7edb69
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.15.ebuild
new file mode 100644
index 000000000000..46c2a0851fa9
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.15.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
+	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
+	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	social? (
+		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
+"
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 4be87a040f05..feb1daca8470 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,5 @@
 DIST mypy-1.8.0.gh.tar.gz 3023408 BLAKE2B 81f987423f2bbef8f7f1b894983b34d34b0df408bae28fbb2cb59c5d4597b4d6b9afb8e9a2914aad969dcb621f1fe4ba4850b242bb76c4cfa35aae340f4f36b4 SHA512 231237ea44ccf619ac3d3f7f3cb42658bc9802d7a34f61101a9ac79f0fa67d8f566950e14dae3465c9620cdf67dc80cb65a3e2a6724ff944bfa911754caf592b
 DIST mypy-1.9.0.gh.tar.gz 3029335 BLAKE2B 5329a95e5ac52933413a91bec2c8bd728451508b7ead880c7c4542bbe5d4cd4d2155c6d372d31a653af9a913de51d8e35d44c1dde193787ce8eaedd8d64d682d SHA512 aaa975b97e72f00a384a38fee190e39c6469b062a7083c76bb94bb7058ed38f713f65b96bb36a871a430633cab424a0f11e995868f867e2f7a13c4754ed96c89
 EBUILD mypy-1.8.0.ebuild 3516 BLAKE2B 3d13d335e49cf38e0bb3512e1d726c085ccdd014d7f55d4a8620e87513ee456fa6a829cbb1240c2ac40b3ff7b784997ded1e915c83ce17b36750945b5aed75df SHA512 3620d216bbd666c6fe250733e0e94fdaff7d50e4fb5c9076287fe0bb6165a7a7864a29f05cd20ba8124b16adcc82ddd17a75331ce45dc48d56ac0c79ee6381f8
-EBUILD mypy-1.9.0.ebuild 3687 BLAKE2B 74e2d9cbfa6cf4fde045f39cac4fefe889abfc5c6f4c8d7daa9d6e6b6a044dc8657d8143cdda83df2acd4bb3d96b79dd33c3e361b674555a29a7b8b647fba4d8 SHA512 36dbc3b64c6a5fc2a18ff1dd43ebb748f3cba5a21b6290128f9884abbee886db3672d9971d87e8655c514459e5658c9d7fc87f9f9f77d0840fc1471d66524ba5
+EBUILD mypy-1.9.0.ebuild 3685 BLAKE2B f9c80ec1c018493bcb12c869949b76db31f1ab20dcfe214099ecb16c1b1175f8fdc681e4364ed4afb528569fbf6a919d13a0969c5683bdab558db463a264c747 SHA512 c0f431cf2a2dc1e98c71c0fadc8330ddf346011a449540e7053fb32d3802fdb57fefc33ddf3f9638b26cf2a7c5dd0e142340c407480efda376910c949c9a4824
 MISC metadata.xml 661 BLAKE2B df57cc2dfde5b112f8c26b51ca5cc9e7727d318ee274ea7e1abf448819daf0307f471aeb7c32b19f20e87ce1ccffd47a5529415003765c275523e1b5236f3bb1 SHA512 eddd19c4b0b5211f73f9619f388a799ced108b62bb43d852ed2d01d0b1717e7b9ef118d34b9d61db543c7b47080fb8058c3d35f7359cc456069636f357e080c9
diff --git a/dev-python/mypy/mypy-1.9.0.ebuild b/dev-python/mypy/mypy-1.9.0.ebuild
index de2d9546e36e..232d50016f45 100644
--- a/dev-python/mypy/mypy-1.9.0.ebuild
+++ b/dev-python/mypy/mypy-1.9.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index aeb2105e0b65..fe1f00fd9b75 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,9 +1,11 @@
 DIST pikepdf-8.11.2.tar.gz 2870263 BLAKE2B 6cf3666baca5d20b125efc3f6d8cfe7f96b9334b8a39da67fe3f4185f41232d8a18bf902f21bfe33e4259b7fb61e7dc462a247c76bf4564a3bdf0ea987119d91 SHA512 57bf5d16aaf9367eef9407f7f406a5ee74f2060d276ab861379c74c2193d02b2e3cca0925ee29813791bb36fae8dbbba4a9b16a7f4c2d19c67c21bbe7bb3f80f
 DIST pikepdf-8.12.0.tar.gz 2870386 BLAKE2B f27c034ef94b63e56efa84abef987b23801ddb0c19c078715ffdf15596fb60b54a1159b3f43f6252418b51f967e9049912ba6950506811a41c766320148201e2 SHA512 9c6d269a7a8f806f22cc3df9f0147fc3c3a534b191e9db4f90c56a6ce9c695f7e9a20c44265551b0d2ca2a189d15c52dd602614baa44939d7ae943e698dec400
 DIST pikepdf-8.13.0.tar.gz 2870366 BLAKE2B 4e08cd992ef6dc18d64d3b62ca85a138474c2d77548a14522172b80d842b9ad969d701e30376a394aa60baa5b17bba7e48eb11c071e130f43e387659e8e862e6 SHA512 6ab231510ced72a6697cf7ea50d7b73d6ef33d4305fe70904164319f2c6964fdd645f8011a049d763a50809772ccb65a9833feca3e65e59b5c37c84bb90dbc79
+DIST pikepdf-8.14.0.tar.gz 2870612 BLAKE2B be0fd5a8d48fccc7695c45acc28cbda8252529d0687197c261e077e8c3a63e3597e504bf2aae2ab09648c0f127228d517bfa630ed77ea90bc28c8f3463854779 SHA512 f0e073df952cd850e0529fa798743a09f249a998450be1393b109b21850cf86b80c8813b55db778dc4e265df48af7619fccfac30ec9195c3ac724b8c7724e858
 DIST pikepdf-8.4.1.tar.gz 2853305 BLAKE2B 2298514159db17ba49b8e2fa2407d60de50273bea111ece704251d99193bdc4c8ed77f624237a49c3f4f129e3b14ac4ddd1006cf3024bcbf822bc5523e0fee35 SHA512 6989e8a3888f612e453ec1ea8425c0ca35ccfee19ae5e8c32df136ebc3fbb7728d9fe5beaacb4e392a20c9037a1009fc8f8d53d73634427fb0df9103626e34fa
 EBUILD pikepdf-8.11.2.ebuild 1784 BLAKE2B 1920b60b3e6ebc30d66d5aaf075ef17c289100352de96baa8f6cc1fd75902bc93c5e8acef248f14709f6a6aefafb013a07bac31ddb5105e3405462d4a4cbe518 SHA512 ebf383c9294149b862d054e8176e27265d45b479ed3271cbbe45c32bc2f83157cc35e5ddcf45b67420420557444de95637ef820eef30da9b85e103f8386b5b57
 EBUILD pikepdf-8.12.0.ebuild 1787 BLAKE2B f20c760bccceb7189871ad4146157a4f75c35e645c07a06742ba415e72d662af004b9997b869998879e0dfe76da7151c06a7fca44ebfeaecb11953004bfc8fab SHA512 be99064846a9dcc8bc56daec70270baccc53f7e7dfcd8f2e0e90507a41855c918b27611ca1965976de2ab02ab217cd04fd9ab014bd9b3a5b4350579d7791cae4
 EBUILD pikepdf-8.13.0.ebuild 1785 BLAKE2B a82309df05a94656ee276350899affbabe9252cce6892b84400dc3b50c0e3bfe827bae9e01de7a55456bfc9702389dccc4eac713990320e3e7ebeb2dea39bd8a SHA512 0602024fcd7ee706fb6114f1acb3686c7d3c5609d08c03ed4a60a7c2be7b53ee1d20e365ae8411597e8b043c4f07c9123c2b899ea2252cec1b0a4ef3abc09c83
+EBUILD pikepdf-8.14.0.ebuild 1791 BLAKE2B f8a8de60de99bd6ac6e50fef0cb6cf46ff18f7ed4d3d4b8562cef85b8a1f7ff2fc605c43cebd2f983017b36ffc92790d75fd00afc0d09ecf238c6b021a1fd615 SHA512 5e488073997321d41f4ab2a67d31f58bf9f8bdbf8ba18d972e8990eab524b1a0839215252dd05dbea52d36df5c09000c7f60db667b55f7ec662e538044512073
 EBUILD pikepdf-8.4.1.ebuild 1680 BLAKE2B 2d988c8345fe6642e1bf990dd385259ac9b8709e8e22b6b1dc74f3e7ecf88193fb9c06cc3085b82aefb811a5cf18f676dd23c2d75c27a4071903a291bf272f5a SHA512 05b25f5fafcb3999eee5c8f1c5f44e6b1c7dfd0397fdcf7e4f2a5c812a950cf00a87a502a4244cf01e775ee5b7360cffbf2dbcba64d5b203216be008400e4683
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-8.14.0.ebuild b/dev-python/pikepdf/pikepdf-8.14.0.ebuild
new file mode 100644
index 000000000000..f5173f73b2c1
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-8.14.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
+# https://qpdf.readthedocs.io/en/stable/release-notes.html.
+DEPEND="
+	>=app-text/qpdf-11.5.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-10.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+		media-libs/tiff[zlib]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fragile to system load
+	tests/test_image_access.py::test_random_image
+)
+
+src_prepare() {
+	sed -e '/-n auto/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p timeout
+}
diff --git a/dev-python/podman/Manifest b/dev-python/podman/Manifest
index 27731ae9f10b..3bab62382edf 100644
--- a/dev-python/podman/Manifest
+++ b/dev-python/podman/Manifest
@@ -1,3 +1,5 @@
 DIST podman-py-4.9.0.gh.tar.gz 182639 BLAKE2B fce3efa75658bb29513fdb55fa8b51d41401a49d58c2ea3c17c037e435f1f822090c6cc12b1afd06aec7e96c2541abb898fc37a0d2a62fcc5cddeeaf7832a0c0 SHA512 73488ccd3e910284410a43ec607cefdab3b8f3478617b95d5a6efd6f817a3eaced1a5ac9993d13c0104bad1bcd868507d544ef0396202003bb2f8b024901396c
+DIST podman-py-5.0.0.gh.tar.gz 183844 BLAKE2B c2c5511815d37321a843dfe028839592f6e9b4cc580263e743b6a2ee0917b3307b77bf4d08b327781c6d765c231d8bfcc4d1e0027351c4297509433405887552 SHA512 3abcc4c989843fb82a09e32359018cb9b3352f014253def4bec46a7336c95405b50fe774192d2f4625748351c57293b70d393eb85671719833c0a9f1311612ed
 EBUILD podman-4.9.0.ebuild 1194 BLAKE2B 645670f0fe056e5e8e6bb854ebbf9b551648429a3dc988c6c8f3db6debbf8554f800a2fff26c1d2057f8fd0760b92b77960325d199e76e60fb82f56815977e61 SHA512 8ed5fe93feadfd36b1f3ab82ae6b72b0472026260b4b5737635d1184884e5d7cca1194c7f9a42da6c87c5df5c3205e0a38fcf8d03bf514a4c9b5b0aa95aa5cfb
+EBUILD podman-5.0.0.ebuild 1194 BLAKE2B 645670f0fe056e5e8e6bb854ebbf9b551648429a3dc988c6c8f3db6debbf8554f800a2fff26c1d2057f8fd0760b92b77960325d199e76e60fb82f56815977e61 SHA512 8ed5fe93feadfd36b1f3ab82ae6b72b0472026260b4b5737635d1184884e5d7cca1194c7f9a42da6c87c5df5c3205e0a38fcf8d03bf514a4c9b5b0aa95aa5cfb
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman/podman-5.0.0.ebuild b/dev-python/podman/podman-5.0.0.ebuild
new file mode 100644
index 000000000000..9567fabe9519
--- /dev/null
+++ b/dev-python/podman/podman-5.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=podman-py-${PV/_p/.post}
+DESCRIPTION="A library to interact with a Podman server"
+HOMEPAGE="
+	https://github.com/containers/podman-py/
+	https://pypi.org/project/podman/
+"
+SRC_URI="
+	https://github.com/containers/podman-py/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.5.1[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/requests-mock-1.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
+	)
+
+	# integration tests require a workable podman server,
+	# and it doesn't seem to work in ebuild env
+	epytest podman/tests/unit
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index fe16cac47523..c9ece2793534 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
 DIST pyglet-2.0.12.gh.tar.gz 6415028 BLAKE2B ba1a697fe4e75b77da2b4ed7c1fa7b95269eb6f67502103fba158ec9fca636fe6027c6ece10c517ed4f7bbaae063b62d947cf9963bb4ed31b842eb7fddf793cb SHA512 e94009f002b295df891367f7e2b30f692606b0a35c1475e9ddf7f463ef5286691f8755f804b24c382fbea97ab2d58dfd51422110be9994a520dce6d365b90df0
 DIST pyglet-2.0.14.gh.tar.gz 6420548 BLAKE2B af4d354f49b6d413c35eb9f455a580a0981156b597590a5430f2e380940e815b9a0e9067b0fe47965ad4e88ae7771158fca39d52fd83fea3539cb9252500a7fa SHA512 ffbe2ab0847cd2635970c919fca3c9c190949c8843d5c7e6b7b702e32cf6e09dd4a6f9e7f2ea55134abd7f0ec9ecff347a64aa5771e0e64e67c169d3c60944ec
 EBUILD pyglet-2.0.12.ebuild 1748 BLAKE2B 748734b8b40adcca8e0437baa0bab97606a9c08448a73ad46dbbef0f7e577b97f477d79fc8684788d7a38093fc4ed8e57f5b176c908fbf72f9da6fce3b86f8fb SHA512 ea5abb25dca1b23dd024479a234acebdadd5e685fbb0fe5bc2f60f8f709fc9f6391963503c0e9441ce7288f4556e4224afdf9ed8ae5273fdc86b1fdec3b31426
-EBUILD pyglet-2.0.14.ebuild 1751 BLAKE2B b3c7746523d6a197ee3dfee0eff32edf23300c61ff721fdcb57170d492c025ebd41d79560a6da84e4b32895ede9e4ed0f2b474c198f7a5c587703b9870fd8617 SHA512 412810b0351003f31c6ee909d82be87041b94d9747af56dd119ade07804200680ef4ce081375953d1da88ecee97ef9602ece3635f7ebd66840d32eef8e1d7993
+EBUILD pyglet-2.0.14.ebuild 1749 BLAKE2B 7da2d4ee12b82ab66fbede8c3d7b3f4d9076d36d3255a0bf445d1dcfd988a55c53b2edc916e66b6e4c57954a273538ecdaa683acb91ee535b333fb6747cbbdd5 SHA512 5ee2be633b2fab555b1c17300f1e54cfbb3e515439eaea18e88da8511c2f8606ce7edca9eed01ca51912689e78ba7f5609903a6fb2b9a5f1ab414e04223f5264
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-2.0.14.ebuild b/dev-python/pyglet/pyglet-2.0.14.ebuild
index 28c5feeacc17..10e149e7d85c 100644
--- a/dev-python/pyglet/pyglet-2.0.14.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index fe6cfb0a808e..184726ccc017 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,7 +1,5 @@
 DIST pytest-asyncio-0.23.5.post1.tar.gz 46227 BLAKE2B 25c1ea816efee026ffec8703a3f8d84311e67a73e5c32395aa0b5dd9ee9b328c0eb198ee64aadafedd9f1563dfe8074720059f536a998cddc45c7b85e8d7f251 SHA512 a8948f82d281d760bdd55b4fb84dc72ff6a8fcb813896d1c9024586c1aac52b5f18831599f6b5160f203ac35410ad8286c06242ece63d7eb728b89e66ca82855
-DIST pytest-asyncio-0.23.5.tar.gz 45887 BLAKE2B 6f641d3c614c5a224f51278ba6021ed40f015a30aa19999cca7803cc3b50e91e8a0e3c997fbd6905801a10fda5f6c2de9f2ce3228d6f1a3f734e81ebd9f0796c SHA512 112ddaa0cf8c05cec4e99cb55df4db1b7d9929b13aa531172b442cff4cd49fbe12ec23ff12aaa260f303919c840c13b21c00a94990e4b107fb115c4850a33b47
 DIST pytest-asyncio-0.23.6.tar.gz 46203 BLAKE2B 37dd3cafa2c77b0dd04a6f406e9e83705b31a98eb058fef02ad6d917cb291874dac0388a129bce5d80954fe8dd0a28fbe9e2b94dabc2ff59a1a055154b908cce SHA512 24ec7fef2f1db744c743c4da651106320d02e8a83af0a238f6335ef669751e541b7fa787fd007fd7208f1837c1cb684acdecd66ee5e022501a7aad97649fdfbe
-EBUILD pytest-asyncio-0.23.5.ebuild 1605 BLAKE2B 06b9821bf10e8071302d96eefef1ae5ee1abb01fd22324409e4fe118dc2cb93768b2e0a48ec29596d95e20ab37e89f9aecc5f6911a54c84c8ba980e70b97d99c SHA512 5645c0a2addeecefde1b1d1d163ac0b1ef5025dc92a6cd26f92530b1642d7677b77cd97ccf57e20ce9ae9b6daa773701805686bd60eb5722e0727d8e8aab1ec2
-EBUILD pytest-asyncio-0.23.5_p1.ebuild 1613 BLAKE2B fc7729d1a0392ab2ef98bc82056511444fc4d83fc9acfdd993ad81291ba40f3fee346442370c6a2f32267ec33de203db7e0632e1b158d2919f18aefb0da44437 SHA512 5b3c5e36c5dfa25a4ae5d918d6d52f7df29f8a005012f437d52e2a53e12495ad7eb5b39f413a97f521605a5ba57d5ad91037274a1952c6ea91cd0942155f9a57
+EBUILD pytest-asyncio-0.23.5_p1.ebuild 1605 BLAKE2B 06b9821bf10e8071302d96eefef1ae5ee1abb01fd22324409e4fe118dc2cb93768b2e0a48ec29596d95e20ab37e89f9aecc5f6911a54c84c8ba980e70b97d99c SHA512 5645c0a2addeecefde1b1d1d163ac0b1ef5025dc92a6cd26f92530b1642d7677b77cd97ccf57e20ce9ae9b6daa773701805686bd60eb5722e0727d8e8aab1ec2
 EBUILD pytest-asyncio-0.23.6.ebuild 1613 BLAKE2B fc7729d1a0392ab2ef98bc82056511444fc4d83fc9acfdd993ad81291ba40f3fee346442370c6a2f32267ec33de203db7e0632e1b158d2919f18aefb0da44437 SHA512 5b3c5e36c5dfa25a4ae5d918d6d52f7df29f8a005012f437d52e2a53e12495ad7eb5b39f413a97f521605a5ba57d5ad91037274a1952c6ea91cd0942155f9a57
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.5.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.5.ebuild
deleted file mode 100644
index a1a22d27efb3..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/modes/test_legacy_mode.py
-		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-		tests/test_pytest_min_version_warning.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-
-		# TODO
-		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.5_p1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.5_p1.ebuild
index 3309bf08c6f5..a1a22d27efb3 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.5_p1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.23.5_p1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index d1fed387413e..a5253d08b38f 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-subtests-0.11.0.tar.gz 12763 BLAKE2B b1e1373d197798a9c27ed65569a681e9ea8dd36014cf6ea57a1d44ed888dca21bd8c5afffeb7f590a501d83d1bc0a8e1fe06b13832173e6937b722163614f21e SHA512 cab486252148e457e234e0dadacefa5ff38cf67df48d9c8bd61aa546a4a1e712b70dca0a270dffceede6be0f8a6324e8c21beaa4d1528b39f12bba72e077ef1d
-DIST pytest-subtests-0.12.0.tar.gz 15251 BLAKE2B d7a526a4af21828d4ad8364b0cf50dc5ae071806b49dfd13068f679b43dfef6367f32e61bad0547100408d0d6fd58d6a33ee96220d234116535b840da1b659c4 SHA512 4ff64e29b5c7f76a239ac3f365450a60d3ebe3ee9d01781c4f79f100b1590d24a867c503567d0bbf60e397bc1cc3dff091afbee823aa9399b7cc14a6e60bc0b8
 DIST pytest-subtests-0.12.1.tar.gz 15303 BLAKE2B 68ce29fd067836cb32b43f260c98b0a8d1827a1bf6f3f61bc98eb69a5259dad725379bece5fe745e86561cab7e58042aff7da51d39e99fd09bbf0127d04d8cca SHA512 5eb4ff950171f8e008b3879453b55bab1ebc82ec60ca4da839158ad6e195c03f1a5d6b6ce2ac263a3ecaa2f684955e4fcc7abf5e429de9ffd898586b758e6cd4
-EBUILD pytest-subtests-0.11.0.ebuild 951 BLAKE2B f73cb93c3534a9ff1f55a80c7959d0e14aa0a3df7be41c9d6f4594fcd168ae4a836c779b23c209d6c0c89036c02d78348516541b5de194b7a9665eccb2d90a3b SHA512 2db66c2ae6f9d6c4a350b6bbb03f268f40d05879483e2fa852004f898f3a60bf2937b60d056b9cb92570cbadae5be5cf35aab38209e814d6d91ee7c1acbb53f3
-EBUILD pytest-subtests-0.12.0.ebuild 991 BLAKE2B f2c5db20a6d76b7d96f10ee1f2297f0a86bbfe445a888a4fc91cbbdc7296fddbedb737472ed3aa7635a2b0245b24715137d2ea44dd1b37fd10597c8b1af5b048 SHA512 a8c259a611eda8cc8c93cb1fc52adc1be9ccb8325fa44a0f5542c6605da217b7c1306972c8fa88da7ebd7aadcbbd39053fa6fed43c08d52bf95ba1cc3c3d1f62
-EBUILD pytest-subtests-0.12.1.ebuild 949 BLAKE2B 2e6f4352a8b088d2b263388e2a04d1279234b2c17db0863aa986ebab9f0c830874bfdff2cf19978588dd8ecfab1b76577868c0b2ddc62c1bc0a3d712db37ee00 SHA512 119dafee3bb7add4f0745b65f85bcd618afcc290e589d65d0fae024cf20068f79d559cac4cf36485575477d86e68b318e359b9da91333bab1934060cf833e77d
+EBUILD pytest-subtests-0.12.1.ebuild 941 BLAKE2B 257625f01d20967d13162b13b7ed386b21223166c7282faa751ec145ba64912a98aa1485411731a6bf19373304282b75133fab6c71d1b229d88503fcd6f8f6ec SHA512 9fbfc23660eedcb27ee527f1c78d7bd622a60e90051bad0619513abb7c5321fbfea8a7c90ef8f5a347bdc775cddf4e5decfc88390de36fab53681adcbc8ac601
 MISC metadata.xml 409 BLAKE2B ca267dc80fa124c3c8ba82f5e46356492e8cadefcf8001469c3c076b079844ae72829b5b527658bea341c3fee3f173421c9f2e7ec7042a171e234070113f4734 SHA512 57c12735a910107b53dbe54969f15ce70eafda3df096c78082d91d5bedc53b015ecae3e3d901e0a2a90841370916f6e4e94041e0b5589ffdce323144375e6c20
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild
deleted file mode 100644
index 73d58a2ab238..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_subtests
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild
deleted file mode 100644
index d97c208fa7e5..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	<dev-python/pytest-8.1[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_subtests.plugin
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.12.1.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.12.1.ebuild
index 322989e03e96..2f8e3e53ebdf 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.12.1.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.12.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 625e156030b3..5d6eaed1a206 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-timeout-2.2.0.tar.gz 16391 BLAKE2B 550b803ed4a64ab0fead7f6e61297ea6bfc6e59988998c5383fdccdebb3664fe9f6651314bb1a439f6431e844bb770feb50bedcabd568e4dfea7526d8c328dd7 SHA512 11a0c4e958b324bff3e149bf2a7dc5bf6ab6549405d5061856f8f1ad0e43df1cddce83df4c804b717276bfbcfcf60ee6b400625d0f4e4e73c98785146c22164f
 DIST pytest-timeout-2.3.1.tar.gz 17697 BLAKE2B 5f0ffa2fdda59ef28a92bfd5742891f63c1fa400db4ef89077fa13d917932d83e76d543c4c326a27df582a025122d8a75f1f7adf0daebbecc42273d4323ff93a SHA512 f200d625d11f76173521f4e2e4e09d57f6613d9b1420c57893b454ec496d5f11b32390b95eb995b403d15f8563b742a58fa0e0cbad42246b4049787a389ad83e
-EBUILD pytest-timeout-2.2.0.ebuild 1092 BLAKE2B 7864c24b6680df40408be51c56e8bdf89e9864199533ae4dfe139772982919bae52865c50c127361e6adb2b2068b2aa31a5bbb13b8ee762ff54791143c67101b SHA512 3e0eb9ca90a92f443fc01b1807ba926c92c264c6761b85d2f574d1d1c83fe83b9b1da556dd9512e6a5a9ae9925c1357392ebb62b54817e1d1fd7110a6fae2ed0
-EBUILD pytest-timeout-2.3.1.ebuild 1078 BLAKE2B 627be1d83953628b7aa4d299264cd26389e35044f537beed2e0db23418d91e052693e52b38cc9f6b6393f7ee1db1860196241d675cf9b1c5c019b328a07ac4e7 SHA512 23249dee7d0c4f2a27cf511e722551740c1e584d1bdfd7cdfebac3153f8b2fff72fceeff5823253b4b5707682289086a58846b64afbafcf41ae2fb5e96b25896
+EBUILD pytest-timeout-2.3.1.ebuild 1070 BLAKE2B dbef48b0368f757406bba30fab73df6044abd36e3ececc9a782f04d6c7589243f930ecfc01488176a9a7223c63c44ea0c34724c71d65c30193a37f97abc1d875 SHA512 901299703bfd066c21634c18742fe9a9873081c45bed34eb87eba35477e1d5a8f1e93602bd118fcc3bb86e354f6c76efd1e62db9182770435bd936228f23e92c
 MISC metadata.xml 420 BLAKE2B ff56de441243acbf2c7332acf224c8f64427378a8cd5f56c040eca1bcaae467459d8ae09409a963d0053a95035a4e7cfcda067d5be78bcd24ba222b2ce56d6f4 SHA512 c6b4ebdd5bd59452d0952e50526ca9b7cb5b88b12d989947a4775d60cdc9315d594ca7c37cb17c0cd4b2708d08db625f678fd577ac9031e0b0e6dbb364a6ad3a
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.2.0.ebuild
deleted file mode 100644
index 5faedcdf1e13..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-2.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="pytest plugin to abort hanging tests"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-timeout/
-	https://pypi.org/project/pytest-timeout/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# do not rdepend on pytest, it won't be used without it anyway
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!hppa? (
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test_pytest_timeout.py::test_suppresses_timeout_when_debugger_is_entered
-		test_pytest_timeout.py::test_disable_debugger_detection_flag
-	)
-
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.3.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.3.1.ebuild
index ea860f7df388..2d48986cbf02 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.3.1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 28ad58cfda73..987259c446f4 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST requests-oauthlib-1.3.1.tar.gz 48367 BLAKE2B 0cc538fe7ed1ef12740b60bb8b3e32d84f0d45b6c231c70b8bbfe9db9c8775acc51f50e78589e43eb0644c82e919a5a124941986023de4432e0631ebf0764869 SHA512 86fe34d39ad7224fd44a1b0c4fbf3784032239b894ae73ba65043941cde9675c2f8abedf44ccc00b5fb1648b8e261de258464b311f3ace6392ab6202fb50aa08
-DIST requests-oauthlib-1.4.0.gh.tar.gz 51324 BLAKE2B e62d696ceaf483f5cbfacd60570a87665d7b7933d3c79de93ce7884c6ac9f245d5ba77f1e83c518226ec2be89c3e6ba4281669e1dcf83cffcddda95fd25ae2fe SHA512 14ffe34be4aaffb774aeda7965687738c12b23291994a86ee9c1436490cd20588bfeac4fb41b4cc89966f62a6ed5152235cd06cd194a8eecc8ea9367975d87ce
+DIST requests-oauthlib-2.0.0.gh.tar.gz 51357 BLAKE2B 1c1c8c2295f1bce2cb1da1c2fdd899004dfac2dc53956ebcd4affb9fcc6c11047545dec0b96311755d041694c07dcfccaff7ae479ecf7aaaf5ebcfb64665a76a SHA512 15d353da1422ce6f826b5cb3b26afeb597da4b1f0ffdf797f9cba75be4d8bbf00321dd697c1e368f6a8aeb92c57566725c745969fa7e8d60f690f79da13db867
 EBUILD requests-oauthlib-1.3.1.ebuild 911 BLAKE2B 6b01f1a8695898685e96229413bbed566f788cdb266fa9430b2f736f1e0f0a1f53e5cb666e8a3754933bc57c9e33f17778a1f4213b3c59ca5e619b8998f87e1f SHA512 377180901e33cdfccaeb4bf5c3ff724ffe21efe4f22425ab366cc204ce550514fcb4ca4d1103cdcc05bde9a541b2254da9c1b537cadb062cb20e7973d3667d6b
-EBUILD requests-oauthlib-1.4.0.ebuild 1112 BLAKE2B 7bb051fd60b8d5255f5e56f805548602428f5beac0876680f5ed28c13b82344f0354641634533f90dea8c94fac0cf97de87381be4dc5a1a13564ff51287c3158 SHA512 d21129839a8cccf18dbcc076e7f66f38954c96675e95b4e5f4b14426dcf744d30b22adbc4998e7ed878bd453e218950db3828fc5d90f7926391867e64f053dd0
+EBUILD requests-oauthlib-2.0.0.ebuild 1112 BLAKE2B 7bb051fd60b8d5255f5e56f805548602428f5beac0876680f5ed28c13b82344f0354641634533f90dea8c94fac0cf97de87381be4dc5a1a13564ff51287c3158 SHA512 d21129839a8cccf18dbcc076e7f66f38954c96675e95b4e5f4b14426dcf744d30b22adbc4998e7ed878bd453e218950db3828fc5d90f7926391867e64f053dd0
 MISC metadata.xml 387 BLAKE2B b1f09234024d5145eb44490f5898e16d176b39dd5c5bc03a13b1a4d0801d20230348f0612132a7782d4055f908f52ac49793bd9ebd91ed8c832b0c9fdd6a3296 SHA512 d5aa59b6e4812e106d3c7aec130d630609fe86193abed686b5eb7381b26e54306fc4424afaaff6546fca241f551fa1631f732f75d49491bd3578052f80b99a0b
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.4.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-2.0.0.ebuild
index fbe6ef8d3352..fbe6ef8d3352 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.4.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-2.0.0.ebuild
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 184031a4672b..b73e3be3a010 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,7 +1,3 @@
-DIST rq-1.15.1.gh.tar.gz 633531 BLAKE2B e1cf463e54533a1a56fab98a66f4cfe2ef73da48ab965a10066b84050aa1ac72373328246236fbd45bdf3d026ffc355aa117a21047dce1cef16b18c6e96a0f3f SHA512 75228f037c5c731f7788bb18654f2e07a9af39f8980900166e07145887f7cbed06fbd7fb5513a770cee791d07a49d85a544b83f347cce6726d7745f8396e3aac
-DIST rq-1.16.0.tar.gz 627998 BLAKE2B cff296147f92d234a29f3e1c0f762bcaf873aabebc3cea816e8a772586e41ca850bba600d1e6e974ebfe1da4286ee4b15a5326cb0fee1a082b7bc632005b3ef5 SHA512 8746bed4d9fccd2f74ceb3ba026268f3c7441f278348e2823e6dbaf95326ff396f76564f3622c94440fef4b0a49b5fadc5680b1abdb3cfaacfa1118aa85c8457
 DIST rq-1.16.1.tar.gz 628089 BLAKE2B 74d57c34f338c8dfe14c921134253618253124fc34b69b78f0526a9c4d08b0d70ed50115658ee275f09b98ca48d7f5334032d81e0e9437184a0d3c4e782645fe SHA512 618f7833724b4bca5509132878d1bb28a25f99299a774709e839ff2b6771e27731330318070f6eb6c4aaced8167aec4ba02a89bf40285a9b16cd04e1935f7428
-EBUILD rq-1.15.1.ebuild 1444 BLAKE2B cc0a48b0d249bd0f04cbe89b0751df613e110bd467b639bbd8c3df1e25c8642635a8cab902d8f0c5d98a8ed4e039d241dc2e712ef0e8428ae5a26bf3e7440c4b SHA512 fb337dad159eb75080893a48b2a2bc7f6634479f15361f832734fae69255151253433f29abfa9303ec3ffa45ea4845dbc00e556f7af0791a943c5c9977cdbad9
-EBUILD rq-1.16.0.ebuild 1332 BLAKE2B d0514b70af8f560334d6d563644926e0b9fa5cc2c1d92930466495d29e9698918c68964c1e3baf98e5aca6c16eccb4d891adb927fa159ffdcf5718a745a6a998 SHA512 b1452dced3349b8e2330839e8ad7adce2882a5c91ad20c326705998fe9ce02af93d267affd4320a60934a7b3edef6295e56f8b05d7c9e80d7fdda887e931b73b
-EBUILD rq-1.16.1.ebuild 1332 BLAKE2B d0514b70af8f560334d6d563644926e0b9fa5cc2c1d92930466495d29e9698918c68964c1e3baf98e5aca6c16eccb4d891adb927fa159ffdcf5718a745a6a998 SHA512 b1452dced3349b8e2330839e8ad7adce2882a5c91ad20c326705998fe9ce02af93d267affd4320a60934a7b3edef6295e56f8b05d7c9e80d7fdda887e931b73b
+EBUILD rq-1.16.1.ebuild 1329 BLAKE2B 13ffc62bb63314065af4ea2fdc555cfc152cdaaa7281f92bdb29479fe44c4b2157db1c453a6ccd055114368783cd78a2f7e07520e406e2d062e66a6f7c9e7770 SHA512 7a3fe8a0e519c66417d2c0ed8b76e45f4ff9ff62ed0fd52834706ab5321387bb49acb8b327d4e56719563c8900837de59e02e5cf864d715bc57834e19ec20a0d
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.15.1.ebuild b/dev-python/rq/rq-1.15.1.ebuild
deleted file mode 100644
index b1958be8a028..000000000000
--- a/dev-python/rq/rq-1.15.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-	https://pypi.org/project/rq/
-"
-# Tests missing from sdist, as of 1.14.1
-SRC_URI="
-	https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.16.0.ebuild b/dev-python/rq/rq-1.16.0.ebuild
deleted file mode 100644
index ac48b2056812..000000000000
--- a/dev-python/rq/rq-1.16.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-	https://pypi.org/project/rq/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.16.1.ebuild b/dev-python/rq/rq-1.16.1.ebuild
index ac48b2056812..9ab9863d85e3 100644
--- a/dev-python/rq/rq-1.16.1.ebuild
+++ b/dev-python/rq/rq-1.16.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-press-theme/Manifest b/dev-python/sphinx-press-theme/Manifest
index 2c8d82094305..a837da7901c6 100644
--- a/dev-python/sphinx-press-theme/Manifest
+++ b/dev-python/sphinx-press-theme/Manifest
@@ -1,5 +1,5 @@
-DIST sphinx_press_theme-0.8.0.tar.gz 68878 BLAKE2B d03b361b4447a78575f7c0887bd01fd2e685030babb3062da67c571715e0f82eafb889e872dab9817a2813344172b3f3b94193aa10905bbbe2f45b64a9682cda SHA512 b4393a9200b42f414401ff5419fc51db8dd248c677a8ba234f2ae8cf5190cef2083c3ae25b7f5435223917a7c3e471dace6987e323fc885456af2467cedc8a78
 DIST sphinx_press_theme-0.9.0.tar.gz 84424 BLAKE2B 5c05d7ca4d40d054ee8f38ba3e1cb41d0ebacc0a9efd371c7a0c4c9943adb01e9aff36ce430c237497aad748b70c3c2b1f75062e2c63d1bf1b51b850f8235a6f SHA512 fec913a128e2b03d33baa4c9822932a468bf1a8c42255b8e734cbfbb2403b75d4696cfa3b19b6585240d5c5cce4ac3fc4acbc6cc8f2e2c530fa1a67983ce017f
-EBUILD sphinx-press-theme-0.8.0.ebuild 520 BLAKE2B c9c58de64b1e3dfba569469fd133478aaa7283aa16e1e4951dc1cbc7bb27a9543ee975c9c3fbed6b8828a5c28bbfe71bfe8377d4750d9652f1a1ea8eb180fc7f SHA512 ea112ff3641e222fdf5b02fb9300eb32245f9295fc66bfbb6d440df9ed848fe2945b6edc70d70d4d50d8d3c605ede1d29e0f6935aae7a01e902003db47b09421
+DIST sphinx_press_theme-0.9.1.tar.gz 254696 BLAKE2B fa1c26ed8f7e2ec375e3be716622669d02845c733f37fb42e5e960395e365aecc526b711ab5375fb15946612e0a1ad6dfc066b0aec8b68316fdc828d2582a4d7 SHA512 4c3fe68e6be32ac93b514aac10f26a096e4190c0428e79329448717691f896a847cfdfd756348511c6af14e37bc8492ca7ea905833317a5259c0858553714ec8
 EBUILD sphinx-press-theme-0.9.0.ebuild 520 BLAKE2B c9c58de64b1e3dfba569469fd133478aaa7283aa16e1e4951dc1cbc7bb27a9543ee975c9c3fbed6b8828a5c28bbfe71bfe8377d4750d9652f1a1ea8eb180fc7f SHA512 ea112ff3641e222fdf5b02fb9300eb32245f9295fc66bfbb6d440df9ed848fe2945b6edc70d70d4d50d8d3c605ede1d29e0f6935aae7a01e902003db47b09421
+EBUILD sphinx-press-theme-0.9.1.ebuild 520 BLAKE2B c9c58de64b1e3dfba569469fd133478aaa7283aa16e1e4951dc1cbc7bb27a9543ee975c9c3fbed6b8828a5c28bbfe71bfe8377d4750d9652f1a1ea8eb180fc7f SHA512 ea112ff3641e222fdf5b02fb9300eb32245f9295fc66bfbb6d440df9ed848fe2945b6edc70d70d4d50d8d3c605ede1d29e0f6935aae7a01e902003db47b09421
 MISC metadata.xml 576 BLAKE2B a2810f29bb4a08de1f9a60484ef93865cae628002754681c96c4f3321a442d34fe15965b9dc4027ee4f423cb7d1b45e17d94b5919004b7f1be9534a7e9e4b049 SHA512 85a32a9682b26a1d159c423bd4086b555b7d430d41e681efe19a1604145e5aa90c397dfcb614f1f972ca6e5add9a1db1ca6cf016c49599bb1a9b88e1ff57df35
diff --git a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild b/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.1.ebuild
index c6e6e6acbc2f..c6e6e6acbc2f 100644
--- a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.1.ebuild
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index aec3f725e033..40d413342a7f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
-DIST stripe-8.4.0.tar.gz 1071302 BLAKE2B b7aa15e20baa6c0a2e939fda1ee45d3acab72ab771717ca15b0302793f4958257d0fe915c02d92d4be1d51eb6cc6be3bc28d4cda43dffb0ed1e2e958cfc29160 SHA512 b7ddb5a11c379492f5a7eafcc44197e026e3020420a83c294db6bbe2d73b39c4af38746817d0684e84f09232b12b45280d919090a331a9a0d03af4d02e59ef99
 DIST stripe-8.6.0.tar.gz 1075310 BLAKE2B cf497317cce5f8525ccc8491ccfe8610f701abc175b9d24099790ab8a5ed7b8c67888960f96d579c7d623162d82e9f26beb09532f84eb7785c93acc3cb516825 SHA512 25fc7396ea0d5cc448a8c9c00f5dfac7ea5181a4c82d7f1b3d81d0e54b55876213ffddcb478391604f228ff5a7bbe6adcfdee0cdfce3ed385be8432c400053bf
 DIST stripe-8.7.0.tar.gz 1080685 BLAKE2B 0d91f852ad88cf09fb5230a421f9b9b5ade3e7617e95f6f0b5ff3bb14e307d272c1d8600a2673d63a408ca24501e71383fa18f527433e9fbc816f6a48fb9c576 SHA512 977c57a4bad1b572dbee566609f28a9b7e3bffea6516ac48b1f69c51a8ee8fb44d342ce886e2809f6c18b633c30f57e35c565817f2dd67d82c23048dc47d66e5
 DIST stripe-8.8.0.tar.gz 1102096 BLAKE2B b8a2696d3f3347afb6ee9b3c6981ac4b2a5a19775d698e1cd12a7042a8373faf1ac132789776f8d5248d7691da9cf21a227916445c72ee172d2928cae3583895 SHA512 7638d49687cf3008828efd75a600ab8319e13bfb77aa4accb919628ca9e7fdd502b28a43b03863bb76d185af3a0521fd775557d72f850bf8b692c0504b7ff7a7
-EBUILD stripe-8.4.0.ebuild 2139 BLAKE2B ebca4f16824fb84f12b8a3009d39418bf836d5afe7a7cba989a79e7511cec8e7dd5497c641fc7722a4b91b5b5fd41cc2d66aed9d66c7f85bc0884c66dacdcb61 SHA512 5d06e11939ee3a719576700265c595e974f5b1d4b5b5f3431283e78d6c2eb16dbc9a49e3919e7341e91e00a4130d1345efce1249f098ab27dd7967a32b645094
-EBUILD stripe-8.6.0.ebuild 2142 BLAKE2B 12b001219d977c62a6077979b148cce983a3cab06ed9513222d50ee54b5e1958e70d01d906f50e0e2103674c68a0822de16309ce6abfa17e1883d04c1a7c7160 SHA512 9794a2cd535557155735e3805d99b6825f27e827a82b505042e15cfc53d4912c384fc3d9687bdb5eb2474ebac3f3a08d84946e2a617bb18729c2d80ba59a4fe6
+EBUILD stripe-8.6.0.ebuild 2139 BLAKE2B ebca4f16824fb84f12b8a3009d39418bf836d5afe7a7cba989a79e7511cec8e7dd5497c641fc7722a4b91b5b5fd41cc2d66aed9d66c7f85bc0884c66dacdcb61 SHA512 5d06e11939ee3a719576700265c595e974f5b1d4b5b5f3431283e78d6c2eb16dbc9a49e3919e7341e91e00a4130d1345efce1249f098ab27dd7967a32b645094
 EBUILD stripe-8.7.0.ebuild 2142 BLAKE2B bcc7dd630341fec24d7a7e6b3898ed74c7e2491698bec62dd4a3f7006a4e25d34a02871820df8b832eeaf0e52ecbe86c247a1c302ca6f31a34433c2969fb9603 SHA512 484aec1eedeb70fc0be89e87eda2ce44a368c2ff9a186957340200a7130ed63d351ad49c4e57685eca1d29ccd5e1f33a61e83c2ab603d081e2edc8d4787f0808
 EBUILD stripe-8.8.0.ebuild 2142 BLAKE2B bcc7dd630341fec24d7a7e6b3898ed74c7e2491698bec62dd4a3f7006a4e25d34a02871820df8b832eeaf0e52ecbe86c247a1c302ca6f31a34433c2969fb9603 SHA512 484aec1eedeb70fc0be89e87eda2ce44a368c2ff9a186957340200a7130ed63d351ad49c4e57685eca1d29ccd5e1f33a61e83c2ab603d081e2edc8d4787f0808
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-8.4.0.ebuild b/dev-python/stripe/stripe-8.4.0.ebuild
deleted file mode 100644
index 79c3e3bba170..000000000000
--- a/dev-python/stripe/stripe-8.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.182.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-8.6.0.ebuild b/dev-python/stripe/stripe-8.6.0.ebuild
index 5ed0d9dd1b63..79c3e3bba170 100644
--- a/dev-python/stripe/stripe-8.6.0.ebuild
+++ b/dev-python/stripe/stripe-8.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index 9c4dec9c6bc0..b1b5e04da688 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -1,6 +1,8 @@
 AUX time-machine-2.13.0-backport-pr400.patch 10411 BLAKE2B 85b9937d44e8d669672af1c0c00852ad52a9ac69fed348d42ed665b1ff1711d2cc2d04cbe9ee36413aee325ea28a99f4a562aac33273374ada5bf221347ce949 SHA512 efa8858d8a5cc2f60e8a125188c9dd0404d331e7ae98d46793241aa9f1a70b857265c6119549c1ce3e90df1b1dfefc00a6fbdb0323586e6f8e2eac6f2b08b405
 DIST time-machine-2.13.0.gh.tar.gz 28747 BLAKE2B 88836d2b9ad34c8d256b576ab6b2bfe263232fb50d2e95f13049f84dbc838283811ebc54c5bb68493ef966e64777983ab6bcb7fafccda6dc74e00d3bb6a2108f SHA512 26a852d93633e037585ec8fcd563c86af8d977a87633dbeb66cf23c9ca49ca0ae536bdcdcdf809ee2ab423c197610c630d506bc3bf4f13c373d806cee2d8c598
 DIST time-machine-2.14.0.gh.tar.gz 29270 BLAKE2B 55050879fe221204f14c77a90190c2ef5232e182d281885d60686230365b9249f8e90ec80e7a842d43a2c52b72bf463cd59b4a22fdc8b0cd25c5ad5b0306fc98 SHA512 7bc9d6d53da68c18ccdae1af6282ea482a0758a4fda9acabe9fa39bfe217a57e65b8041ae4436b7cef2c0b39835f3aae9590515d200b9b2962bd0610370e8454
+DIST time-machine-2.14.1.gh.tar.gz 29600 BLAKE2B b118e3a2f08f75cc6cd89181a9e533c89bc6e5312a520b2a854fb8aa7ac59f1570e48a85788261f781ef83f9864380318074724f6eadab9cda7a3374b2322e7d SHA512 42a127e2dc5a86e33896010e6d141fc9248fe685d3477ec71ec8a72315914cea99ae4a4d6623a59fd69505d935d2feadcfd831a7fff5617c3f98a93d48652ecf
 EBUILD time-machine-2.13.0.ebuild 734 BLAKE2B 36695c373b67cedc7b8de247905481d9c3fee32ed34ede6b9e5e75626b269f4c1cb763f0ed6f139cbd84bf9b879553ebbb16951c472bca40c430f7d7b5afec6a SHA512 a474a1eaf544fdd2aca9c09b44fe8f2db3f4c76e3cc32629d46686d9a70fef67a62942645b61cf7f0958d9169e45baf07e8d9b1861280778253c3c2bb29fc9c7
 EBUILD time-machine-2.14.0.ebuild 674 BLAKE2B d021f2ed299c55604b84431cff48c593ceacf623774d6e2e0f32f3df7e6833198a13f6536194c55f9d7b72e5b4452fcadbd6cd5ca5e87fae133cc6c4b48dde29 SHA512 4f2c4fad8f076b528e8f813a0b19836ea0648666acbf72856e738eef28c3ea494e9d5dfb9e6823aa8f790ebe20fd2e9769736ee99c9511235954335310c787ff
+EBUILD time-machine-2.14.1.ebuild 681 BLAKE2B 5446c58b6ec4ced662538074bfcd3638714c37b3791e0749bb3c8ad73c2035dc35d1d65eb8f05ed18d7af2da6bac76de60ad31aae254d0bf7a614da7dbf66b96 SHA512 50d5921265ed6f7670b785c03a2081f304f8bc35184119ca80727e1ba4202715c6b2c9590e18339dd816a2c9f4f49170e6609dc1bcf0db76426ac4d2d78a6874
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.14.1.ebuild b/dev-python/time-machine/time-machine-2.14.1.ebuild
new file mode 100644
index 000000000000..6e40b0484718
--- /dev/null
+++ b/dev-python/time-machine/time-machine-2.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Travel through time in your tests"
+HOMEPAGE="
+	https://github.com/adamchainz/time-machine/
+	https://pypi.org/project/time-machine/
+"
+SRC_URI="
+	https://github.com/adamchainz/time-machine/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 1c5846cc943e..1a61b6605edc 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-4.14.1.tar.gz 178268 BLAKE2B e30e2bfbf3ee70ff217dd482abfddfe271c5158ffda3639ed6cd400e75b2c8bdf494b0ca73039ea1e9eaafa0f8431b98250981c659ae68e92968865d0b2ef8d4 SHA512 6ad0f82fa7c9599ade526179ee6bd417bc2309b1b5cb002dac7f48032b8889eda9164f0d05724c8846ddf887029e55d1dab7ae220722fd02b42f89421bc43c52
+DIST tox-4.14.2.tar.gz 178515 BLAKE2B 812a4e0ffe218c5799a5bdf76cc5f1f99f60c7de464953349283e3951c91aded247941cb173bfdff670c9c079b9efb3645220ff7126b7e0cf341071d561a375b SHA512 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d
 EBUILD tox-4.14.1.ebuild 2799 BLAKE2B ad0a398168b082140f4d427b00440d4035fd6cfee4cebb862ca5c04fa4828a46b81580dbab259332c03a555a16a521cd143cc72fd6064074143d98fc5374dd40 SHA512 b305b5c5d41811ec6fb7040f51fec39fd9bf3aceb63b723fd09c4ab0fc1305db2fa5301812c4076968bc83876a48a8ecffbab01b6c970f25678b525a486f1fff
+EBUILD tox-4.14.2.ebuild 2807 BLAKE2B 4414565dedce0995d86e380eb8750ab2605dbe1caedc9d79e3a1909f49e5ebbcce4658dfb70adff4c92f829f6f5c1980d4f8c9ac9090856349532baea06095f7 SHA512 24e201053d9ddd01c6b08ba954bbf158bd66f2e115bb7aff2909b7f84b01be129d806e5138670d27f2bc9d36046b583bdd29449cc17d5dd0a76a922a80f3e657
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.14.2.ebuild b/dev-python/tox/tox-4.14.2.ebuild
new file mode 100644
index 000000000000..e80094cd0dd9
--- /dev/null
+++ b/dev-python/tox/tox-4.14.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pyproject-api[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{9..10})
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/distlib[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream lower bounds are meaningless
+	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
+	)
+
+	epytest
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 38346703942c..ff9aa724cd64 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,14 +1,23 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
+AUX tree-sitter-0.21.0-unbundle.patch 516 BLAKE2B 9bee97b5563088af7ff31aaa9da2e2a0a5ddb54b84d5520994df5a6e9e8472e166ce50c23c7c77e1f495cc3139a532c710dc95e17c5ddcb35c56072538931a99 SHA512 9a583f4c4eb614afb7e6d6961cdf0390a0d45f54b0860a59fe6f2dc4fe0fdce0767fb2c5bd809ffc5aa7ce153c79b162dcbb41e05e0d7540614ab23da5889c74
 DIST tree-sitter-0.20.1.gh.tar.gz 22013 BLAKE2B 961619ab28b71c4051708695f245246e9c9197987c3ce7f162c87af1cfeb2ae378301cce160c071d4df872124274c7984bcaf938c611a91f45515c44cea53e5a SHA512 d6db28fcfb0ea46840ae863a625ef1d8794015b147137e8ef1e113ea6d04e2b87a3bd44dcabe6e41a65230b8da09ce0563a5d9d5aeac30d279547a9085720da3
 DIST tree-sitter-0.20.4.gh.tar.gz 36177 BLAKE2B 617b649c33c73b313034269db7adb7eaf7294195d7c7eaf91182db6844111877fc9745f31185af1c6f2406fad3d0379c4776f76bfb6c43037be918fd34cef12a SHA512 28a2042fa9f7ed43202548b9844126383b36796650e1eb815c138a25538dae12b16512c3cd45f02fa99b32a29c8c7257bb84d901da1e5ebbf6445e3778d7dfa1
+DIST tree-sitter-0.21.0.gh.tar.gz 38263 BLAKE2B 27c1b52c40e94368c66e222fbc1f5e64734d7d9243e0b76d9607edebaee80211f228323db23cd83c6bc338e7d933a28be8eff13f7ee49495c282d8e9afed4bfb SHA512 f62896edebcb305d1216e540d4a10a2622228b12b1f969dd9722e2d56615f05aea4e681b6d933beaeed52ce59d36641c80c9a4a1ac79b038fb2a75e079987231
 DIST tree-sitter-embedded-template-0.20.0.tar.gz 11679 BLAKE2B 552c64a499b80f1648cd568fd87d5f2774a28cb3d2a61bfc0ec1f9a73910df41921e06c8f94ac5500a3a5b7668a2b8fe641b2ecf13a9b06b7a119daeef4e3b1a SHA512 1c4a63f85fae1ebb9fa90674a4c27d4402ae0957268faa08dd77c5ec6103720c80befd009d04090a80d994377676b103e2efcc25bd291186efc0c1f4962be086
+DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
 DIST tree-sitter-html-0.20.0.tar.gz 26098 BLAKE2B 524aed631fa7a2e6da59fae05af99b74019222d7c93c44f294af5f36c7f2c8582c847324bcef3b6bdc719e5fde1d015bb2633a81d3123eb1120ba0909282af28 SHA512 fa688d8c5487d894ff9bfdd549095cc9bf01dbf667cc3f05c07a1d10343178666802deae79ad1040866ba74d26bf415814bb5324632ce0ea8c1b4c663252e649
+DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-javascript-0.20.1.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
+DIST tree-sitter-javascript-de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz 396570 BLAKE2B d80cecb070bd1c82737ee1d38fff293ac4c96fde02563ecc910d30c920b902bd5c25a7ac50585f8cb7a26203d98f4a9e6feeebd4ac0d54bede9486ff642e03be SHA512 4a509a886ebeae0d960360113aff89fb56090f1fe4bb5a7866952736a04838a8b6421cc7d19473acc48b135bca4615325c59c0f0f7f3734f23a78fff9cc2050e
 DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5
+DIST tree-sitter-json-3b129203f4b72d532f58e72c5310c0a7db3b8e6d.tar.gz 15580 BLAKE2B d31b38f959fed785e8f26782e7de3da94502cd3c65de2caf4ad0621287d80e95dcc317b4f224461fa70b59f7a8ca933a235bdffbbcc1d9ca8d7cc0b31b3b2862 SHA512 90dd3e757d384d1b95cec892c5b465a0413ba61df35669fd7afc47037596c8d6b72b4f0fd9a39512ebda0d5d078ce7a408455ae11e535591e1515740cdcf9f6f
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
 DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
+DIST tree-sitter-python-03e88c170cb23142559a406b6e7621c4af3128f5.tar.gz 272632 BLAKE2B 72f2e7f48456bad7b495605171c1c5ed3aa2790e832a4bc152ef522ee2ce210a922f7d38ad1154c58a8c621f81739071ab3404135dbb79a12ba28ca7c97ff3c7 SHA512 7ed72e6ad464935423aaca1a829c51eefd4a4b5651eeda4b7f1ed2a67ec4088f17267796872a1e1cf5666fc8a920c2b1763a9cb4cd82924ee7214e01d7fe8ab8
 DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
+DIST tree-sitter-rust-3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz 419237 BLAKE2B 681b9656c872bcd15abbf11923d07df61b80b36b2972461a29f249dc53915e6d18a6dfdc65d71c863f7b38a27c8b3a47376f590d86afa44caa71f103e710fed5 SHA512 a8ce10080b984aa469d952ff8e862165676e10dc30c3d1762f7141d9fe83734aec3cb92c48552cb8f24575b538dd53fe0a80f1337f5d0d4c8767dd6bf564143e
 EBUILD tree-sitter-0.20.1-r1.ebuild 1472 BLAKE2B bfcd5ebcb8b1a1a1e799de1918da3c786e8da7e6a729f0054c1e49c0e0fdf273d58522896b54b385cea4733fefea5c01f39261de90156ef7dfd7a9503eb225a1 SHA512 2f9a69474f454d0e24e669f6bffc577ce5073cc20e8d8c3e609d048e8ef9e4eeaa6d3c8a39b3b9c066f8a67598aaf6171fb414cf20088f12d685127c515ddb5f
 EBUILD tree-sitter-0.20.4.ebuild 2136 BLAKE2B 80e60108f41f61da2709ff43f7163c4af34582c301d0291b6ac0fe37777f924b1a1e80e2a4938a46056b197dcd56ec00ddafd24a97ef679c86ec72b26e731a2c SHA512 cd290179f968897298c4f262ad68915dcfe4d8ff64f8b526752d6a8c208622bef6949d7c96b722819cfa16255713f44abfce72dc60ed52a22e92e781c6687c66
+EBUILD tree-sitter-0.21.0.ebuild 1979 BLAKE2B dab4bcd9a3fb43e539747b7ad95d9338d5f1320d870c4130d3856d51356151ef4f1e207c9b3bbcbc23380b8e1a8d9036b1af7305a7914309d75b416b2ba324c4 SHA512 a24a863fa9a956af6de13e064b9ebad67ebc3cca23c231f122dc51f7599db400b2f5b94422bb22210ab30f801cf850d382ed12ebccee3e257f2a5271cd064068
 MISC metadata.xml 393 BLAKE2B 15f673391ad9e9aab93808392449ddf99ccc35fe1b345010a4373b46a56c8dad461042e0a2dd735e4d53f77059a5f7920fc3215f939aacd1455c61f0ecdfa3c0 SHA512 519fc8d6fbbf3709820b26b1f4786b16f6679e569ae4adafdc5e37b2dfbc03351bfd9c6750264300a0309406ffe20868d48c3ff488dde22f900d59e1813c15ef
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
new file mode 100644
index 000000000000..69b50897d3aa
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
@@ -0,0 +1,17 @@
+--- a/setup.py
++++ b/setup.py
+@@ -14,13 +14,9 @@ setup(
+         Extension(
+             name="tree_sitter._binding",
+             sources=[
+-                "tree_sitter/core/lib/src/lib.c",
+                 "tree_sitter/binding.c"
+             ],
+-            include_dirs=[
+-                "tree_sitter/core/lib/include",
+-                "tree_sitter/core/lib/src"
+-            ],
++            libraries=["tree-sitter"],
+             define_macros=[
+                 ("PY_SSIZE_T_CLEAN", None),
+             ],
diff --git a/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild
new file mode 100644
index 000000000000..a4bc832418e6
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.21.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+# Use the versions from the submodules under "tests/fixtures/"
+declare -A TEST_FIXTURES=(
+	["embedded-template"]="6d791b897ecda59baa0689a85a9906348a2a6414"
+	["html"]="b5d9758e22b4d3d25704b72526670759a9e4d195"
+	["javascript"]="de1e682289a417354df5b4437a3e4f92e0722a0f"
+	["json"]="3b129203f4b72d532f58e72c5310c0a7db3b8e6d"
+	["python"]="03e88c170cb23142559a406b6e7621c4af3128f5"
+	["rust"]="3a56481f8d13b6874a28752502a58520b9139dc7"
+)
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="
+	https://github.com/tree-sitter/py-tree-sitter/
+	https://pypi.org/project/tree-sitter/
+"
+SRC_URI="
+	https://github.com/tree-sitter/py-tree-sitter/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+SRC_URI+=" test? ("
+for fixture in "${!TEST_FIXTURES[@]}" ; do
+	SRC_URI+="
+		https://github.com/tree-sitter/tree-sitter-${fixture}/archive/${TEST_FIXTURES[${fixture}]}.tar.gz
+			-> tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}.tar.gz
+	"
+done
+SRC_URI+=" )"
+S=${WORKDIR}/py-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# setuptools is needed for distutils import
+DEPEND=">=dev-libs/tree-sitter-0.22.1"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' 3.12)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/tree-sitter-0.21.0-unbundle.patch
+)
+
+src_unpack() {
+	default
+	rmdir "${S}/tree_sitter/core" || die
+
+	if use test; then
+		mkdir -p "${S}/tests/fixtures" || die
+		local fixture
+		for fixture in "${!TEST_FIXTURES[@]}" ; do
+			mv -T "tree-sitter-${fixture}-${TEST_FIXTURES[${fixture}]}" "${S}/tests/fixtures/tree-sitter-${fixture}" || die
+		done
+	fi
+}
+
+src_test() {
+	rm -r tree_sitter || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 1a2c92e484e9..e21cff96b5d3 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,5 @@
-DIST trimesh-4.1.5.gh.tar.gz 13440026 BLAKE2B bdf27c0ebfc24ede66ecd8ae94151cbf926e187112f096246080db34a43a23f950674a461c29d8b87a71d6b5bc8e3cc824007b54be90593ceb552e1669e41e36 SHA512 a62cdbad4a053fe6bf3d70285c2484600af09f9bc6a638214b10718bdf3c0901053bad0d25c4d7dc96f396c66fb3d438981d3fc96ea179bb078abb3d8b87695b
 DIST trimesh-4.1.8.gh.tar.gz 13440336 BLAKE2B aa4bddc3d613144a0e304ec320a2b38df213846260e2525dae0f0f35a4146561e7b81dc88e197a5b0f0a76ff4b757c30df2a68fe0db0d4a37cdc8a91aedc41ba SHA512 e20ca45f08a4d65c44c214b104af7c6d9d27121716ed7efd53a521c5b896ce788dba91b7794db518f26bb2ae86a1b8269af94f9b9381f8fdd342372b4ba86ce4
 DIST trimesh-4.2.0.gh.tar.gz 13553809 BLAKE2B 141aec46cb8bf2342251a72e5e4c1fbee1e33e4ff63d420cfa4db1758fc324d572d54932ce1526ba2df75d9770f001d9dbe41a79835837931c4c46221fbb6871 SHA512 75efd00ef5ff8f9c25bdfb06ab92fa09db154771356b18ebcf457cba4c2f366645084eb078e5e324cfb41fe101797694aa6b00005f7ccd1290ba4d2d6c088ebd
-EBUILD trimesh-4.1.5.ebuild 1907 BLAKE2B b02ee3321503fde8e19c486893bf21339dc410c850b1c2cab8b7640fe749dbedfe31e186b7ea9e5cb55f2ba3a387ee3830d9fcd8348d2627edecf444f07ba711 SHA512 9b70b481442dfc837368866e2a5ac26aa7d67ccb296b723e233b6006d25cd7f12478e4b5990c5839a2aeed76b69a0dd423a871a96f36d005a70c734e74867c3a
-EBUILD trimesh-4.1.8.ebuild 1952 BLAKE2B dfc4f8a737b468861e4a18b4d28a91a299b869bb2f236c1214230543b4f4f83ad773494a808eb63b2aca57bd82ec28a6ed7241c22bdca1b0ddf0ed5f8f4d0a4c SHA512 2c0531123d157cd0f3ddf4ee4da438ad06677d9549291ef0af0b08ff21819239ee152ee77651f8d770adca1f8dcf03b2070d63a6e844649ebe44c93b930abe13
+EBUILD trimesh-4.1.8.ebuild 1950 BLAKE2B 3a3263575955b65379e291313fda8e2cf49086d52db45133bea9f23a1294a486230331577776cd88205d131c745db82b20a8426b7bae94c4bc28fc2cb2bf1fd4 SHA512 223dcdb5a6b9bd2cbeeafb6d4dcfdcb8edce16ddd08406f194799772427340fc167a227649ea9c6c28e5a72097a7d1bf7d8013d3bc4cb80abebdd13a55898de3
 EBUILD trimesh-4.2.0.ebuild 1952 BLAKE2B dfc4f8a737b468861e4a18b4d28a91a299b869bb2f236c1214230543b4f4f83ad773494a808eb63b2aca57bd82ec28a6ed7241c22bdca1b0ddf0ed5f8f4d0a4c SHA512 2c0531123d157cd0f3ddf4ee4da438ad06677d9549291ef0af0b08ff21819239ee152ee77651f8d770adca1f8dcf03b2070d63a6e844649ebe44c93b930abe13
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-4.1.5.ebuild b/dev-python/trimesh/trimesh-4.1.5.ebuild
deleted file mode 100644
index c897b1b7aaa2..000000000000
--- a/dev-python/trimesh/trimesh-4.1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 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 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=1800
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.1.8.ebuild b/dev-python/trimesh/trimesh-4.1.8.ebuild
index fdbbaa5a2b10..22597eb9468e 100644
--- a/dev-python/trimesh/trimesh-4.1.8.ebuild
+++ b/dev-python/trimesh/trimesh-4.1.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest
index b302db792a03..51610ba1e4c7 100644
--- a/dev-python/types-docutils/Manifest
+++ b/dev-python/types-docutils/Manifest
@@ -1,15 +1,3 @@
-DIST types-docutils-0.20.0.20240309.tar.gz 16064 BLAKE2B c6695b4f3badf21ea2feded98b498985095e0962670af8068aa337b322775f9d3e6661e89ce4cf99d593f9b9bd627e01dfea0d79685f7fe59ed36ce8c28091ba SHA512 a29ca1c5080447f72eb484c7549a6c2306a668ac567b6a32e8a6a06d1e2db98ef01b45c0df79b3b7aa37edffbef5f362e1f0e69298b716228afcf1adc6b9581a
-DIST types-docutils-0.20.0.20240310.tar.gz 16336 BLAKE2B 5ca982bae4ccea8f1e8cc56c404917c17543f65f9f13b5f61d4a40957a017c31bbb67530e209357868ab47c3344736aa5b172ac5b211eba0fa0360accb79e655 SHA512 2d54be1ea12e2354ee53c9bb2496da912ac917016e12499635abc9da11a6f4878ca63da0b50d1a9f77fa4bd731c345605ead71038abeb739d5f7258d95e0c794
-DIST types-docutils-0.20.0.20240311.tar.gz 16388 BLAKE2B 4b22227a65fb1e3b86d27580292bc296b6a46d7ede27b509114de3db7666363c8b07780914c880d921aa85778e0eeae8b34fbd0e5593199623564d494c7f047d SHA512 55d406241540b7615e48647f4f7f85523952b9d5b6d9aeec7d0a2f6f0412936d2e52e535a6ba26c9f28cafa772abe26e37ccaf60f6168c1aa8313123a5fec9f8
-DIST types-docutils-0.20.0.20240314.tar.gz 18376 BLAKE2B 2e4b83673aa0e1940c89f8089330b13fa04830bc5bae2dfd24f18233041ac95ee95af5136634489328e679661fcab09f32cf729ea582ffc355b071f2b7a0c214 SHA512 4e17174e37d04f0eed82594487965e5a1a2c2016179dc2960420aaf7c2d1338608822304530530df3e87146ac6a2d8461d5110be5e13f1748a642476df03e1be
-DIST types-docutils-0.20.0.20240315.tar.gz 18709 BLAKE2B 0d94d136a7ed1998fb66927aef6a0490d10520837296b70b2a9d96881c67ef4a52812a2dc36fdef6ab6a81acdc8c047548b27b6df7978b3ad3ba98e7a41abd8b SHA512 c8fb82449be436bfa5621775ec04a730c06ec424e53d250801a9a2a3fce8e8f526ac2ff3057e88e59f54489645858b63758a26ccd988dc0513f7463bfd33eb71
-DIST types-docutils-0.20.0.20240316.tar.gz 18738 BLAKE2B 83c731a58bc39ee1c0fd12b98ae65eb91b82cc4391c820783252d6894202fafa4dcdc616afa3918ecde0198038e42310c4901a886e38be69748c43d7b596ec72 SHA512 8032dee8060c2eda09a53f7e4d7508e3f03256ecb821d3681f5a735ff534244b1a62de1d4e393e9726bf38eaee438224ab56887f2627c45533ade1e0e3243aa2
 DIST types-docutils-0.20.0.20240317.tar.gz 19250 BLAKE2B 8027b75cca44357b92c10e1c3543fb4624a62bd66862a4107a9e5e57db60dade31d1c25d7634a6417bba27d725fcca337c8159cb0bbec92f1823f84e249e0ebe SHA512 e7c32bcc7214be9e650f35a1b2cb019ff449e194bb74d3a087cba2a676240b741174541dd8c5d42c08bb734cc05a3789698b04de7dc87f897d9158ad769cc7aa
-EBUILD types-docutils-0.20.0.20240309.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
-EBUILD types-docutils-0.20.0.20240310.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
-EBUILD types-docutils-0.20.0.20240311.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
-EBUILD types-docutils-0.20.0.20240314.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
-EBUILD types-docutils-0.20.0.20240315.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
-EBUILD types-docutils-0.20.0.20240316.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
 EBUILD types-docutils-0.20.0.20240317.ebuild 374 BLAKE2B 4fef7d769f780f48dbe7c50c65f277035d8e07cbcf95e7a59c15d6ad49be6bc93098f12c1e84c73d6f68d9fefa9913726f07ec59969a7c368f4e376205c8d982 SHA512 49ee713f19131152e0aefc897c2c79d541fb9b46d367b20a3176a2b57307ebab295e51d3bb4d4a418fe3a674174e0498a06ef2e1e75be53779e0e55f19d9a2b3
 MISC metadata.xml 325 BLAKE2B 399aab1e8779e48d84998d6fdd595638aaf674b9a7076573aad7ade16855c4fc785dd45b1eff833c8ec7accda2a08cf561dfa14237e4edf6292fc7961ad76f7e SHA512 fb2768e73dd948c79654ab22c24d868a418576f2008153e45e4d0b42e2750872884bd35451ee3917203469d72d1c76f84d849e9d3534dc1006eb4d80b3ef04d7
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240309.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240309.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240309.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240310.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240310.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240310.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240311.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240311.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240311.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240314.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240314.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240314.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240315.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240315.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240315.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.20.0.20240316.ebuild b/dev-python/types-docutils/types-docutils-0.20.0.20240316.ebuild
deleted file mode 100644
index cb335ec2836f..000000000000
--- a/dev-python/types-docutils/types-docutils-0.20.0.20240316.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-gdb/Manifest b/dev-python/types-gdb/Manifest
index 6b17de35e281..76fecf69169a 100644
--- a/dev-python/types-gdb/Manifest
+++ b/dev-python/types-gdb/Manifest
@@ -1,5 +1,3 @@
-DIST types-gdb-12.1.4.20240311.tar.gz 10837 BLAKE2B 0c10bb70402a236589de9760f97310d977d10f9834761916ce5dcfacf8010b603f429e4eeb41a99efeabc6bae7a5937c667732094abd35b68fac8903f51b6d0a SHA512 1f8ef85ee7608dd5d94a9f0fd62b764081b211ae3664ca3a9585625c8ffba4b8cbc49da0201b2b4892474e84dfa7c12a60af35d167fb6a08322224faccbc0205
 DIST types-gdb-12.1.4.20240322.tar.gz 10912 BLAKE2B d9fbb963fa6110c5f1c38e483a8b75eb00fd28d5d97eace31006515bfe731a78b9e57f5ec7814f5281363c2e3179494fe54ca6ca86b4c030161122253423d7f3 SHA512 9424844c4ac7386729a6156479252031ce80e6ca58b56a12c224a6f66ce8ee436671a84d50ea57ab9a027a5ad0340b576ea295d117ccfe3cc39230ca4ff52e81
-EBUILD types-gdb-12.1.4.20240311.ebuild 364 BLAKE2B 7bcf0a14c1a0a165ec11195aa19d23e5ca6a723bc26f3a79e8bc79d936dd7d4ef9c71450279be0e2aa5654a2518b3ab2fa03a2ec29f66bcc5dc95030b2752c4e SHA512 62c99b1cae117a2aaef367ebfe277a7dd49b97d37ef25e1d306a8bfb763c33d26f35db5797bb8d3717e6824ea5a3c8f407c2ba9eabf3a2d3c0144d90091892f3
 EBUILD types-gdb-12.1.4.20240322.ebuild 364 BLAKE2B 7bcf0a14c1a0a165ec11195aa19d23e5ca6a723bc26f3a79e8bc79d936dd7d4ef9c71450279be0e2aa5654a2518b3ab2fa03a2ec29f66bcc5dc95030b2752c4e SHA512 62c99b1cae117a2aaef367ebfe277a7dd49b97d37ef25e1d306a8bfb763c33d26f35db5797bb8d3717e6824ea5a3c8f407c2ba9eabf3a2d3c0144d90091892f3
 MISC metadata.xml 320 BLAKE2B e7216faeb2957322c501efcfe35a1ddd197b253f74e4e1674f188d700c9ae765c94cd9609a1aa0c6033608b32e357a827e5ca906d0f4fdf6aeb9fefcdeb8c6ef SHA512 5ebabc196994d0616193657af0766733efc672cf823ac908df138fcad13c510716fd261bfced7986d6170044fa46cc3fbc42760ccb863e26b34ec3920b234061
diff --git a/dev-python/types-gdb/types-gdb-12.1.4.20240311.ebuild b/dev-python/types-gdb/types-gdb-12.1.4.20240311.ebuild
deleted file mode 100644
index bb9b717448e5..000000000000
--- a/dev-python/types-gdb/types-gdb-12.1.4.20240311.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for gdb"
-HOMEPAGE="https://pypi.org/project/types-gdb/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 9c196a0fcfc5..816d2fb1244a 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,7 +1,3 @@
-DIST types-psutil-5.9.5.20240205.tar.gz 14333 BLAKE2B 6f48c008ac634a761f7eb6ed94ef1d06933da803dc8ff3111826ff91cd23ed17bc9e7fc661ea9c52075a675f9a2e6129c555e334bdf758f86f412523e27c91c7 SHA512 a8be7698a6e5bb37d45ea0a81d925835a685e5be7390401fb659a1eab71c6bf9c8529c285bcb1382b61aca37d8b4b43921f9281831bd8099402ec0078cb7334c
-DIST types-psutil-5.9.5.20240311.tar.gz 14357 BLAKE2B ce80aeb6157486e212346e24275c03d2a149c4881d182c8a0dd76bb2bf7920701fa4a26e7c01672695d438ae1cd9e9fd21b28796da57b616d25785206d9238e0 SHA512 28a2f3ffaf0a76d54f33b6a96ba6804958be99229ffc0903ea497a56b9b1a5550e6a6d2f68be00fa29e8279f3e3b15de643c804dda6a3abc23430a5bf359eab3
 DIST types-psutil-5.9.5.20240316.tar.gz 14419 BLAKE2B f42116f8dc8dcec2fb224fa9a40e9cd7b4432c47d658e3e35cbf8d2c48c50b516116ddbe1fb3dd2ac37d05187adbcdeb75a3d303a6d8872dada76cc8820d1e93 SHA512 8d41ab6ab134f4e150fbc7529d153023ec63ab558db16e4693885a693c0956eaf9eb84e3a8a14e26549e21dfc3a999a6b9661d1930fc4ac2b0015e7e7c88f990
-EBUILD types-psutil-5.9.5.20240205.ebuild 438 BLAKE2B bb30699e8268e5cd529be4709ae687fa53749beed9af9183f070043accd58cc073fe82350755ae59a501969850fca6fa9a2436264c55dabfb24c1ba3f761b613 SHA512 e08129dc6b8edabe668bf0d147e910c13f91bb24bac4a36ca357b67c574ed3045d192d7dbf4c4d7786bda6bd418fee1532661276099912f5f432d30cc267bfa8
-EBUILD types-psutil-5.9.5.20240311.ebuild 446 BLAKE2B 6c2fae4d798cc9c70a43cc37c5eb4e35177611cd96fb239e17b00736277efaefd9ed4826ea912bb8c18f0306ee6a15b430c5d59151050cd1b5abf8b7ec316437 SHA512 38ec6459146b6afc2f8ac1e62c310db7da1266c244d1f73f32b78b91bc0e505cbf319095f479a86d580d2b31d30f7dbad0df6eb60b89f503691a258e3f6e2fd4
-EBUILD types-psutil-5.9.5.20240316.ebuild 446 BLAKE2B 6c2fae4d798cc9c70a43cc37c5eb4e35177611cd96fb239e17b00736277efaefd9ed4826ea912bb8c18f0306ee6a15b430c5d59151050cd1b5abf8b7ec316437 SHA512 38ec6459146b6afc2f8ac1e62c310db7da1266c244d1f73f32b78b91bc0e505cbf319095f479a86d580d2b31d30f7dbad0df6eb60b89f503691a258e3f6e2fd4
+EBUILD types-psutil-5.9.5.20240316.ebuild 438 BLAKE2B bb30699e8268e5cd529be4709ae687fa53749beed9af9183f070043accd58cc073fe82350755ae59a501969850fca6fa9a2436264c55dabfb24c1ba3f761b613 SHA512 e08129dc6b8edabe668bf0d147e910c13f91bb24bac4a36ca357b67c574ed3045d192d7dbf4c4d7786bda6bd418fee1532661276099912f5f432d30cc267bfa8
 MISC metadata.xml 395 BLAKE2B 58c240c13cad1e6840bfeab26f48efbe07b75fb432da70652802e95b7cace7013f72d6d8f4c17ea15620abde8cd9940a8f74842e72dd5a7831d552c614c37f18 SHA512 58f9782008175a716f07a26e3b24a10904d942cc8dad7bad13cba697da5c6701cc3a6b06823a303f73485d6abb78c245ed2599e8b015c146ba35fb2722191143
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240205.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240205.ebuild
deleted file mode 100644
index 2f3b385784e8..000000000000
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240205.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for psutil"
-HOMEPAGE="https://pypi.org/project/types-psutil/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240311.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240311.ebuild
deleted file mode 100644
index e4318bf1fdcf..000000000000
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240311.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for psutil"
-HOMEPAGE="https://pypi.org/project/types-psutil/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240316.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240316.ebuild
index e4318bf1fdcf..2f3b385784e8 100644
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240316.ebuild
+++ b/dev-python/types-psutil/types-psutil-5.9.5.20240316.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index 8f6dd51f01dc..e0de10d348d6 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,13 +1,5 @@
-DIST types-setuptools-69.1.0.20240302.tar.gz 34794 BLAKE2B 278be0abe3891e8436a2a583d7220d7e28e80606a7170bdc174aa184d43734f5c46c396a12122cbdfe593020fcd4e8851389f99ef0708226d2a47a547dc4b0e6 SHA512 9160098d6146f32069805a096d8c3418de1618748948ff813d0209071b28746bd526441e8e34d93b8e0ac9d5a9d22b6656a6a00377bd6599263fa13e3456189a
-DIST types-setuptools-69.1.0.20240308.tar.gz 34868 BLAKE2B 091073d8741f2d3d7a45cfe31ab07bbfc52a7a90b049d5bbe354fce9baaf8c45dacda70651f6b12a4e88a92e6f27a667075a96529583d688657357554a9e05e1 SHA512 326d304bb5c1fb8b6b95793e48da69ad3ee4fa1c87f45fd272d91502a69e65f354cc0806dacfe82122af13ee58de0d12eaec12f8a9cb20adaf4284794652e679
-DIST types-setuptools-69.1.0.20240309.tar.gz 34986 BLAKE2B e3ff6c1f30d5233841dea49799eb283e82f730fcb59bd4d548d42950f11e1d0586bb319f47bef45eaa753f9963dbea625a17d112df4a7ef6df495d76a5abf130 SHA512 9b2e000bca7e0103a0ca971dffbac6cf5c7ff8b0bed725dfba67a99aa51b0f85dd4a11fad25a97df7fc2a83b2557e75295bb4057ebabb1ebb1117da749795f21
 DIST types-setuptools-69.1.0.20240310.tar.gz 35216 BLAKE2B 90c64107c56c5a558a640ec5e63d1d2d2ba74287c804eda22109fbc68e9edf8af04f7012868c63696e0ce73ac7b4781151ccd49a0db74d7c479a776b3fb742a3 SHA512 5f27a71b44c5353648a634d812ea76e73e4e27a3408f7fd651e5e147cfba8ce51e55ea0773d550bb63e44fc15fb32fe824a558ba4a8e03ac6c7140c83ded35d5
-DIST types-setuptools-69.2.0.20240316.tar.gz 35324 BLAKE2B 067abd45f75cbecc2601b87a5e18c3099ad8030af86e8d0e1a39c3682adb8be1deba320bdaca58d567c58c72b7d907e9dc50497c00954a5cc967ebabfd97ab9b SHA512 d0fd1174755c81d9d92495515cd7ffbc4a69c2af4b756f48deeced9dcf421182b112e9b47931972a312cd9ec30e87379b373ab19f2c44140df37293e98d8bbd6
 DIST types-setuptools-69.2.0.20240317.tar.gz 36743 BLAKE2B 1e3a318993b3f802cb0fac94400d5859e57f009a26a1448586420e14a62b4296414c2d43ee860f53b65ddf6e5d42278a5757e96e62d0db2df1739f94d5974003 SHA512 58bd476d81a5f423b733efe5b7bd4a961849ec0cf558a45b52347bca3ae99692463ba26ae0fbc4df9a895ba88937393159541d2d00a2d026b9a5388beafcafbb
-EBUILD types-setuptools-69.1.0.20240302.ebuild 446 BLAKE2B 8806a9adda11fc518ce33033fd60775833ce2d57f071af516d0e5c81cf1cd87c522c7a74b02ee59c1690e8fd5548e21edc912bbc50cb5687946f111674e188a0 SHA512 d24926735e809294f4833c61fe86ae1044a34771b9c9adce44d56e61f576aff843a9b65147a1825da6e51bad40dba5a66b0ce4ab37c2e6037f283126952fb181
-EBUILD types-setuptools-69.1.0.20240308.ebuild 454 BLAKE2B 56ba14cfedf7dfb55df942bc6380bd9bc013815accba7ce87a864b1a8228fee49226edbab5a52c8f44e93c41f746d4fbc68bcae6f321ed66d650e321cc5ab71d SHA512 d32b4afaefd06267a20e4c5c168c47a1aa6fa4f1eee5eccec2e1fe38c67f599bfd9e040c00a36cf3b09c7cbe84d701b322fac982b88c9d1480032e56bddd67c0
-EBUILD types-setuptools-69.1.0.20240309.ebuild 454 BLAKE2B 56ba14cfedf7dfb55df942bc6380bd9bc013815accba7ce87a864b1a8228fee49226edbab5a52c8f44e93c41f746d4fbc68bcae6f321ed66d650e321cc5ab71d SHA512 d32b4afaefd06267a20e4c5c168c47a1aa6fa4f1eee5eccec2e1fe38c67f599bfd9e040c00a36cf3b09c7cbe84d701b322fac982b88c9d1480032e56bddd67c0
-EBUILD types-setuptools-69.1.0.20240310.ebuild 454 BLAKE2B 56ba14cfedf7dfb55df942bc6380bd9bc013815accba7ce87a864b1a8228fee49226edbab5a52c8f44e93c41f746d4fbc68bcae6f321ed66d650e321cc5ab71d SHA512 d32b4afaefd06267a20e4c5c168c47a1aa6fa4f1eee5eccec2e1fe38c67f599bfd9e040c00a36cf3b09c7cbe84d701b322fac982b88c9d1480032e56bddd67c0
-EBUILD types-setuptools-69.2.0.20240316.ebuild 454 BLAKE2B 56ba14cfedf7dfb55df942bc6380bd9bc013815accba7ce87a864b1a8228fee49226edbab5a52c8f44e93c41f746d4fbc68bcae6f321ed66d650e321cc5ab71d SHA512 d32b4afaefd06267a20e4c5c168c47a1aa6fa4f1eee5eccec2e1fe38c67f599bfd9e040c00a36cf3b09c7cbe84d701b322fac982b88c9d1480032e56bddd67c0
+EBUILD types-setuptools-69.1.0.20240310.ebuild 446 BLAKE2B 8806a9adda11fc518ce33033fd60775833ce2d57f071af516d0e5c81cf1cd87c522c7a74b02ee59c1690e8fd5548e21edc912bbc50cb5687946f111674e188a0 SHA512 d24926735e809294f4833c61fe86ae1044a34771b9c9adce44d56e61f576aff843a9b65147a1825da6e51bad40dba5a66b0ce4ab37c2e6037f283126952fb181
 EBUILD types-setuptools-69.2.0.20240317.ebuild 454 BLAKE2B 56ba14cfedf7dfb55df942bc6380bd9bc013815accba7ce87a864b1a8228fee49226edbab5a52c8f44e93c41f746d4fbc68bcae6f321ed66d650e321cc5ab71d SHA512 d32b4afaefd06267a20e4c5c168c47a1aa6fa4f1eee5eccec2e1fe38c67f599bfd9e040c00a36cf3b09c7cbe84d701b322fac982b88c9d1480032e56bddd67c0
 MISC metadata.xml 399 BLAKE2B 6e130dc38e0e0e0e6e02567d750d37c6f28ea40c4742a9247f347f29e1700fc420015e7ff951f4a11c156c2df88d7e3b7f03be7759d05872a7783a2d25e35b1e SHA512 bbc9cb552e652e7644d4d635cfd74fdfffcf6426160025411843d53d37b02fdd65f7e1fb435fee7b628033cef517e3f5a902466b5786b842592ccfad068edc15
diff --git a/dev-python/types-setuptools/types-setuptools-69.1.0.20240302.ebuild b/dev-python/types-setuptools/types-setuptools-69.1.0.20240302.ebuild
deleted file mode 100644
index 4ac1e9e449a5..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.1.0.20240302.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.1.0.20240308.ebuild b/dev-python/types-setuptools/types-setuptools-69.1.0.20240308.ebuild
deleted file mode 100644
index 69fd1036f5c6..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.1.0.20240308.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.1.0.20240309.ebuild b/dev-python/types-setuptools/types-setuptools-69.1.0.20240309.ebuild
deleted file mode 100644
index 69fd1036f5c6..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.1.0.20240309.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.1.0.20240310.ebuild b/dev-python/types-setuptools/types-setuptools-69.1.0.20240310.ebuild
index 69fd1036f5c6..4ac1e9e449a5 100644
--- a/dev-python/types-setuptools/types-setuptools-69.1.0.20240310.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-69.1.0.20240310.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.2.0.20240316.ebuild b/dev-python/types-setuptools/types-setuptools-69.2.0.20240316.ebuild
deleted file mode 100644
index 69fd1036f5c6..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.2.0.20240316.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index f9df540fbd17..428c9443d320 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,3 @@
-DIST weasyprint-60.2.tar.gz 442554 BLAKE2B 492f0cd3f155aa20e440e384930cff38e8674cc2430f134fdcce80e627997b0d752d6b585aaece6ff23505fed3ff45430c06c82763ca96ce30da38411e21721f SHA512 1da30b2626911c22a996cf7888edc86a7e3534d552325790c3bb06b29a7bedda8021680f5cac1acd6f0aba0658c64cda02cafa1fcba5f3a76bce6bb5fb229b71
-DIST weasyprint-61.1.tar.gz 446987 BLAKE2B f32e0ec4014d6bd023e5320de9c2878b529fe1725691bb8c73fe295784507a5e785938d043a3731f659fd2c49fe2413008264b8ca8748c451bd99ce07209c9ff SHA512 f7f0c84acc9a9eba61fc59c7f16eb9260ca93ba901905c3cdc1fb871f3646687eb9881dd486eeec5d98cebb5d1893f2fcdff585cdb356bdfb0e38fdd0167b316
 DIST weasyprint-61.2.tar.gz 447333 BLAKE2B 753f80ee0756e75b46023d29b8409599de9ff9f7f338a7800cf917a012f61c6a50857af813e4cbfe1ddfa913f95befc43719688468449d6f1b8d8df3714a7895 SHA512 62c3afba18bcc141bc013b95848b0e2426160123533509b6e353caa6c33173266524be84b0a50443ac2549b1b8013e5eb915f54a68168d65e98c9251c4fdf339
-EBUILD weasyprint-60.2.ebuild 979 BLAKE2B 11567941df8db10f5b1e81d60ba838cfccd589eece230abfc00bb9e87ee55662de25cd66e7279f81f09d264de8d4a185e9dcd4f37f62eb2ebd25faeca562318e SHA512 deedd5aba05d71cdd058fef72b4e70c02480853029e2a1db36fcbce4183e53b0e98aaa721395b878ab52f99059b48c28aa0676c9306c201d64071789448c7f73
-EBUILD weasyprint-61.1.ebuild 1051 BLAKE2B 644e8fc77a6420ee19ad23876e84ec4051ed6d286cb3a66a98ad6b90a5432369b538d902f183d5bdb31f05a8906cdf0d1f8e68e6805f0ca2cad4e9e819797b89 SHA512 c5e98f59fc0d06ece87b281c1e8fcd3ebb4d1b2ea3277e6637f3301fab3da68c7a5f7bb515f40b482a3a9f53ff4b6adda3d8d08fb8762b03b12790e4e7b93c17
-EBUILD weasyprint-61.2.ebuild 1051 BLAKE2B 644e8fc77a6420ee19ad23876e84ec4051ed6d286cb3a66a98ad6b90a5432369b538d902f183d5bdb31f05a8906cdf0d1f8e68e6805f0ca2cad4e9e819797b89 SHA512 c5e98f59fc0d06ece87b281c1e8fcd3ebb4d1b2ea3277e6637f3301fab3da68c7a5f7bb515f40b482a3a9f53ff4b6adda3d8d08fb8762b03b12790e4e7b93c17
+EBUILD weasyprint-61.2.ebuild 1050 BLAKE2B df79c698e88f8ad1471279bd4a5154d41613e83d2d0b86943f1b6153a027057f6154bdff7bf96993ee7fb6e8b5a7a54809848a1c28137c65df8b89b3fb824bf9 SHA512 6917ef0a37ed4beea27d7088526fce61cf2836084a2c7b0f397cc244aca1550969f7804753ff379ecf7d24fb0c314ff55b2ab3cc2485771fba5c7eefaf921eb0
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-60.2.ebuild b/dev-python/weasyprint/weasyprint-60.2.ebuild
deleted file mode 100644
index 7c6925e35573..000000000000
--- a/dev-python/weasyprint/weasyprint-60.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/weasyprint-61.1.ebuild b/dev-python/weasyprint/weasyprint-61.1.ebuild
deleted file mode 100644
index 9af57e769437..000000000000
--- a/dev-python/weasyprint/weasyprint-61.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/weasyprint/weasyprint-61.2.ebuild b/dev-python/weasyprint/weasyprint-61.2.ebuild
index 9af57e769437..77c5f6d2e533 100644
--- a/dev-python/weasyprint/weasyprint-61.2.ebuild
+++ b/dev-python/weasyprint/weasyprint-61.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index b3752527aabe..374de36c98d0 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,5 +1,3 @@
-DIST ytmusicapi-1.5.4.tar.gz 102675 BLAKE2B b1b278e9c8e91eb9982b462babc614bad2b92d1c77fd49e08cbaefdfb10657531bedeca5677ce80e7e0f51bf23482f8537fda97449e645009731b83a1deb6fdc SHA512 4eda0a61d6d6f58b7aed9e668816bd8917b9562f8770c58d6b837c3cb7801a7b5da03ecaf6d15b8bba17a343611f0225aa19c91fc4d69568d9acb38efdac440c
 DIST ytmusicapi-1.6.0.tar.gz 106624 BLAKE2B b7900f4fb9e863f694a06a9d85d479e13514d6f4a0ad86e923ccceb497ad9294e34d9b3914005063b272ef8582514a5ea7c173864d38a2b6ec166bcf1199560e SHA512 9886c0b4ec29bf9b676b4c77f9e84ca6c7a0f1b4da264d589aed19d50c8be6ef3718185af755d8a9f652d425ae98603fff09ea8d84ec839756dab43181eb9f4c
-EBUILD ytmusicapi-1.5.4.ebuild 520 BLAKE2B f013e079cc3f63124096120069e5f648ba5d87892d3ccd767cf8e6e1d522404cd3ac7d3d0d2e02afa73f9ef74a4902daeafbf32d283b58b7e4d8ee01f1545c22 SHA512 dfc612a3c72aeb3e6914c7393aedc4602cb58bb8da5b218fa66752a52e2b1be3c7fc37ed439798b78334ff22e7cb756af4cece092ba8b79c7723d381ee7f5488
-EBUILD ytmusicapi-1.6.0.ebuild 521 BLAKE2B 6de42dfb36c4020602998b6c399bdce29071ca6117d137e528ca7a419bf403e40a5f97ed7fd7ba11e4ea0db396dc865fdc529726083690f68376e157ea725792 SHA512 4eb82c225a52fc44a77085c99373872b77ac6494d7dcb54ec513cde19f1c7d16ce2c9823d5e5dab9e5bc5ac50e733c670de8ba2963964fcbe9b3729fcaceafcb
+EBUILD ytmusicapi-1.6.0.ebuild 520 BLAKE2B f013e079cc3f63124096120069e5f648ba5d87892d3ccd767cf8e6e1d522404cd3ac7d3d0d2e02afa73f9ef74a4902daeafbf32d283b58b7e4d8ee01f1545c22 SHA512 dfc612a3c72aeb3e6914c7393aedc4602cb58bb8da5b218fa66752a52e2b1be3c7fc37ed439798b78334ff22e7cb756af4cece092ba8b79c7723d381ee7f5488
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.5.4.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.5.4.ebuild
deleted file mode 100644
index 5fa2d4f3374a..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.6.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.6.0.ebuild
index 1537ab0e5d66..5fa2d4f3374a 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.6.0.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.6.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 24608db4dcdc..db9ff9453c49 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/console/Manifest b/dev-ruby/console/Manifest
index 3f45addc7258..61858ce508b6 100644
--- a/dev-ruby/console/Manifest
+++ b/dev-ruby/console/Manifest
@@ -1,11 +1,9 @@
-DIST console-1.17.2.tar.gz 24861 BLAKE2B c738249eadafe43c4528ebf75d30b51aa1d015fb9fa6cefaa7302bce0d81ab431b4e84ed3d25b8c5376e64b5b1fb8154b91858e15ad72ce6cb746fd18818bb33 SHA512 1c734d335d3928ca580e274857df1d18c05ce254bfdf8401b7c40b391db7d134b6b6b0327e7bb29d5f7c37522335a33cb58a29cf53aabb36279fa601e581a891
 DIST console-1.23.2.tar.gz 27339 BLAKE2B 46d411a63934673bb956d9e898c00db08d16e0aec9d036f767d7dc078240934cc26695bada687a2cc7656d736d7d2622e3727470d6c864c19a85cbab586d2c9c SHA512 6dc0cc934e4f28fc196d9861676e8d4cf8f601d5ad779146b594f5847818b76620d434c9817a9944872371031d012eafe5a3b1ccb82807449584aa9c5af5282b
 DIST console-1.23.3.tar.gz 27768 BLAKE2B e421b6fd7ff0490dcdf9096843be9770b3a87e811ee6e222a45d92d3bebf3f4359428f268a82b6565eb68b9b4f37b136d8d36d9dd3d89b84b541d1ee914283af SHA512 2a1e5f1c8a589493138e1099aa985627314f1e938e7f98415b9cffb37d71dc58f9a6e40ea4d52c0f3be005b9ddb4ad5818ed4eab91b9528058d0ae270375abee
-DIST console-1.23.4.tar.gz 27764 BLAKE2B 6bdffaadecff42d4038ec4a83106e55fe8ef444547dd062df597a07db4c186dffc187e9f8024e000a8d540015c98ecfad1f19545e5d6cbfe86a354501dda3394 SHA512 382478f356a00a6b09ba14befdf11f432418824be525f0841ab7616439d5c10205280315b59b229d26d93e520c3de1f68afb262b20bd15dff917f6ea3cab896b
 DIST console-1.23.5.tar.gz 27830 BLAKE2B fe90b745cc8db2e0b03589afd0c237ec5819547376384a86d5f06882148718cc0f7de2fcc1b72241e616d70feea3f2d8a4d675fb605986bf54224b374b2c116d SHA512 7425a226f6f8b9504ba58dcce5a7c879a320e4565277c0f70aec0d811db3b132be1e0e21c03e42321438602758f12a328258ebf7ad9719bf84572760f816989e
-EBUILD console-1.17.2.ebuild 919 BLAKE2B 75d3df61682f12248257159abf539df3435a9489957c6e16a26f527f7b099cc73e7d580f867186ae2d8d0f8f8b3c791a8652d14d0a62caf3237de0157fdf110d SHA512 c393c89bffc774abf17e1472ca7867642bd1a3b73779916c1f544f147759564372a95bf443d150a7007ce47beb535c953313f8e6cb81cec4e960249a4d35962c
+DIST console-1.23.6.tar.gz 27883 BLAKE2B e70ddeb8625fb4b8f700f7e1b60295dcf2ddbd1b7cc666975aa883fccbd1cf8e3c2f177938c536e696e95bb8fa3153ce61f70710cbf5dfda6058ce085ec18792 SHA512 0ae48383dedb176bdff5ead3db97a228cee498e5f6a6938e4d9882b3c363ea8b9286bb7089806f664df635d98039c9dca52c8d8afece505d38b12af5ee3aa41c
 EBUILD console-1.23.2.ebuild 919 BLAKE2B 9e2adb530432855475cc17855b693e3bcc53665378498f1810f7cdf3eb7a04cd6a13f5667549cc5c50e4cd4f2d8772f2d7a65d4a8f1febd259afc24f8ca35f95 SHA512 92b500a0c4f5f9bda6e7d6e5d27ef8c7c4da00d756061d8f9865ce2188be252d0e229dffaa687764d937e347205ec4574ac181249e84d1eb61b332a26527ea06
 EBUILD console-1.23.3.ebuild 921 BLAKE2B 4c6dc0d7d511c07d24dd83a55469386d085f1c70d6121f3ceb354287385249d7448d05a03a6b88d4bf79c1e2a6b7cb6a2d0fa1e005a33d917a431f39b801dd57 SHA512 d079b8fdb549962c69a12fb40b96e55bd01ae4a37c5e5b5ee95c3be1fc930097af60beff9019c390dc819f149d44510d407d439f009ca4edf3ae2008c4bfc19d
-EBUILD console-1.23.4.ebuild 936 BLAKE2B b9cf7174c57c7102e7eb396c7df589547eb65b540d2702738f9b83eb52f530c0f86a12156c3b9d90577860f1c5435f3084226fbe0fc3f002014c91cf67b90ad1 SHA512 7c2e99fc76df556ab30fd3a29b6b44d3d561cbaf403453cdd890d808fc78a66ea59208b0dfbe91437026b5a21e63fa8468d7ab94c47c76207200059bcdf00942
 EBUILD console-1.23.5.ebuild 936 BLAKE2B b9cf7174c57c7102e7eb396c7df589547eb65b540d2702738f9b83eb52f530c0f86a12156c3b9d90577860f1c5435f3084226fbe0fc3f002014c91cf67b90ad1 SHA512 7c2e99fc76df556ab30fd3a29b6b44d3d561cbaf403453cdd890d808fc78a66ea59208b0dfbe91437026b5a21e63fa8468d7ab94c47c76207200059bcdf00942
+EBUILD console-1.23.6.ebuild 928 BLAKE2B fb35cd969308850872c3ec68376070e5c36925730ec4bfd285fc51308214008dfd834c9ae68f2e05d79ff5646fdbda111439cc8fb5049b31656be2c727a9a387 SHA512 2200e87e3f7b3db35e8b700397c89fde876f8e8259e0145fd7c116ad6eae60fef68346a5affadd3e27dd84c1776592de8d5986fa887ec26cfc1fcfb7bf24d52e
 MISC metadata.xml 343 BLAKE2B 949f3fccd0b08a5699c083eb21c119af6104cd470fe4f22f2771f5262eddf9a9819a630146ef4cf0636d52be9cca982ab73fd4443e1fb0f4ae77b5223949ed38 SHA512 f243fe8cf5c9d29a4c4f95cd9bce18f8a0ca191b7c62c1644c0b4ec4f4d14d355bc0b564a571b057eb42960997958157bca027b86917a2c43d6ec651f1804302
diff --git a/dev-ruby/console/console-1.17.2.ebuild b/dev-ruby/console/console-1.17.2.ebuild
deleted file mode 100644
index 9e555ad6ae93..000000000000
--- a/dev-ruby/console/console-1.17.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="sus"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful logging for Ruby"
-HOMEPAGE="https://github.com/socketry/console"
-SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/fiber-annotation
-	dev-ruby/fiber-local
-"
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Avoid dependency on covered.
-	rm -f config/sus.rb || die
-
-	# Avoid sandbox violation during tests
-	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
-}
diff --git a/dev-ruby/console/console-1.23.4.ebuild b/dev-ruby/console/console-1.23.6.ebuild
index 6fd98395ebfd..3ddf1603f2f0 100644
--- a/dev-ruby/console/console-1.23.4.ebuild
+++ b/dev-ruby/console/console-1.23.6.ebuild
@@ -18,7 +18,6 @@ SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
 
 ruby_add_rdepend "
 	dev-ruby/fiber-annotation
diff --git a/dev-ruby/csv/Manifest b/dev-ruby/csv/Manifest
index cd52f48def24..31fc8965d781 100644
--- a/dev-ruby/csv/Manifest
+++ b/dev-ruby/csv/Manifest
@@ -1,3 +1,5 @@
 DIST csv-3.2.8.tar.gz 91194 BLAKE2B 827adb228acaaae30f090d0547d1d59ef6237546aff462e9d812bb854f3b331feecea9b2657acf8aad17c9ac76aad7754b2f22ae8d2e067c2d45f8cf648491a8 SHA512 87072aaca62e5d95eeb1b916eff497b2b2029efd9be6b29c9d3c4435dbfcd64a1ed045b8b3bec106ea35e11aa05f3a3d5f9f6c09c12a97bc157648be5cd2fcf7
+DIST csv-3.3.0.tar.gz 91569 BLAKE2B cacdf60e279277f7d69fd62d6cea62ce80843addab7b9f81749fabde9133d2b40b2a961b548bd55918bacbe89fe8754af87569a117d4f43a88d3ef49a792da1f SHA512 676f6c34c1466c0edb412aeba9e955cc0070c201a21e6ffe2fd47a3ad4bd7322d561c612695317e5ef34195bcc8bc7a63f3de8c55fbdcb116890a59b867c20d9
 EBUILD csv-3.2.8.ebuild 959 BLAKE2B 97d9cd22fb270779d5e1915c291493de373810dfebea52f00341764e9be0e52488d70d4e5f5793e1f478bb70dab09dd08561e6efc14e9f4145d9b0c4ba50a8bf SHA512 b91b22e7e063717b9d9df7d1636967768be1bc88955fba5cfc4eadcebcc9f7e2d750136f37fc6dfc07e36f803e02f59d8a34384b02a44d97d4090c5568704f37
+EBUILD csv-3.3.0.ebuild 959 BLAKE2B 6d125bcac2b46b43ff1258d78af24f6cf6179cee531b9245cd2d36cb594a898830b2f7fbf501a577655fa231bd1266e24a6c659f18dc42c1ffc1f9c6a5e98fb7 SHA512 ac44ef9cb86db19b8be9e95cc97e033cca669a7421cd59072e08ce981693ac4de27fa65507a12e0a70b654a64fe83d31ad2bb7c525dd101a060cdb0c86fe9321
 MISC metadata.xml 335 BLAKE2B 1e3cf2858f9ee05cde5bc950d0a9709655f37f69f0b0402b1bcdf0d3de9308aef87185b61c427dfe0097956f4fdaeb583b2a9847352abf741b47f6dfeee89641 SHA512 da554bc73353c247b33bbe184a1bc1207ee7dd83ae76f8bb7520fbfc3d1091838173f48a3b45c9578419a7fa67cf6cc1c8e4f55784a3cd709058b31bc2015cf6
diff --git a/dev-ruby/csv/csv-3.3.0.ebuild b/dev-ruby/csv/csv-3.3.0.ebuild
new file mode 100644
index 000000000000..a989a2e126c6
--- /dev/null
+++ b/dev-ruby/csv/csv-3.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
+HOMEPAGE="https://github.com/ruby/csv"
+SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} run-test.rb || die
+}
diff --git a/dev-ruby/dry-inflector/Manifest b/dev-ruby/dry-inflector/Manifest
index e8159a7d676a..5c349e785a8f 100644
--- a/dev-ruby/dry-inflector/Manifest
+++ b/dev-ruby/dry-inflector/Manifest
@@ -1,3 +1,3 @@
 DIST dry-inflector-1.0.0.tar.gz 25030 BLAKE2B 628f5af9ac1517e6711242b6678808c0b64f1f1bb3391e0792fe85ccebfe4c334e2ee62370bd3a13f842a435028b684c09b8215c78ab7fbe2742679863f8e27d SHA512 34b5e723982621e3e090fe9273310d6dfd6e8145c274d7eefe2e7c3bdcc2c6222c2a6bc6e0bbd70d79226b81f1cd89d8364692421ef3dd361432a03b1a8d1c06
-EBUILD dry-inflector-1.0.0.ebuild 650 BLAKE2B 1aa5ea536507008e24f1346c554232c9ed46b62b401ae0752d1fd96cfde2d42c2e6b9996d91cc00313fb729e0786c456650baa0108d8b03a8d67fd75a3244dd1 SHA512 e5e0842afacb9aca707f700d9fa852e49094a853754c17c236c4840b758863f7eb7709f898b5544d39b6a1f83e46efd5bbb2c82603fac09eff1dfdf851f3ab06
+EBUILD dry-inflector-1.0.0.ebuild 709 BLAKE2B 1d645d23575101e96f0e7d74297602a0b3940d9e787d1b559f635ce87a85d2896b03c4ada40c7440ea41cca7813078d243c13115251d04b025ebb90de510c1a4 SHA512 2b15219e0f123248baf399f61e96dde477fcc605c9dde3b06595a75baac99da27cddb631e6eeebc98978798f070b033eea863744df4f8b0cfb1c522838043a6c
 MISC metadata.xml 347 BLAKE2B 1fc8ca9f3b5e176cdfa13daf3239d31063b6c895ccc03ffa8156db69678bbc25a7fd29555823cb1937ab9f7c562478fd67e92d550803857c2768c8c580c1c9d7 SHA512 29cecad4cc1dc5dced92dc35006f93557a0426dacab1d454fdd0d539d3648cc40f0f475f173a44e6db3309417f914dbfa53ffafff497c3da9d673f79356f2868
diff --git a/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild b/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
index 490b27fb08db..d51c485abdbd 100644
--- a/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
+++ b/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
@@ -21,6 +21,9 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64"
 SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
 
 all_ruby_prepare() {
 	sed -i -e '/\(bundler\|coverage\)/ s/^/#/' spec/spec_helper.rb || die
diff --git a/dev-ruby/dry-logic/Manifest b/dev-ruby/dry-logic/Manifest
index 06f59447c7fa..d43aca7a2f0a 100644
--- a/dev-ruby/dry-logic/Manifest
+++ b/dev-ruby/dry-logic/Manifest
@@ -1,3 +1,3 @@
 DIST dry-logic-1.5.0.tar.gz 38438 BLAKE2B 9b00ac4bed7c400858554b3485f0bce04633caaac2b70bd0c76c1d11cb20b1ab34136a3e2189e247b012833f10219140366c18faa7af09d603b3b8cca4778dda SHA512 cde3a01c0c16af1bd40f6c0c39b8777e464d6796f5c1eb52297453bb4301934c23ec48ac0e2bcc023844252b5da38687ae0bb8977f99c7f656d3fe18708bb7b8
-EBUILD dry-logic-1.5.0.ebuild 740 BLAKE2B cde8450ccc9aa12d51396019b8f3a9cb9d9aa91ec83a210e84da584b958a24fe3d24a6bf3be11b47e93bc4f4cefe09b3680bc6dec748298d850ea25187dd4e14 SHA512 b846c704514f2f1ebf175f7977ef157775145c63f41a944d522ca601a8543b6366171d29d2359b6497edd7fdf24a95fdeec58368bbeb306168bee5e827e67931
+EBUILD dry-logic-1.5.0.ebuild 788 BLAKE2B 27bc1c6bbeacc262d6b756e8911cfb8949951261288342fd3340477b181e0f41df7e5ad1859bc5cbfeba6121f2332822a6d36e16e57efd56efb013d8d33dc9f6 SHA512 7c21f11af72df39dc0f0a30f2ed5f90ee526028fc59e66d5055bdc7a1fab55a61c585d53663a3186c8bef21a20715bc213563c381529968780d957cc0c1b4d84
 MISC metadata.xml 343 BLAKE2B cb1f8af707498a13d3d9a94c34f93f13d61bb1a2005783cb5884076f3cce35d130f51aba13d6c5a765892b8927ee43cb2c39c02165fc8bce90db2d5b92fb0fd9 SHA512 4ab2a3be708baacc48b3e95ddad89b1fe03a79c1b387505984488985abdf23b5769d1aeaed6116fae5004df008a3398c62dd4f7df9afaf9794aaa6ba7ddb5c9c
diff --git a/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild b/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild
index 51e15e3e5fc0..e6064b73df3f 100644
--- a/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild
+++ b/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild
@@ -28,6 +28,9 @@ ruby_add_rdepend "
 	dev-ruby/dry-core:1
 	>=dev-ruby/zeitwerk-2.6:2
 "
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
+
 all_ruby_prepare() {
 	sed -e '3irequire "uri"' -i spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 997ff1b6f66b..6838c32c66c1 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,11 +1,7 @@
 DIST rdoc-6.5.0.tar.gz 762645 BLAKE2B cecade491f0d18b2c50ec710cb27a28b6cb946f321503e0508e8d4802e93033a78867346eb1d68ca56884ea0d68d51d6fdb92eb61fa63034a01332e8b572dbcf SHA512 10382e66ca778f85f236614fe071b2b0d598065d3aab8f5a89cb0839da7713b5e16a66e3f7a2bff2e2125d26a42f088a86c6d339dc36479a943bb7023c1cad0c
-DIST rdoc-6.6.0.tar.gz 764785 BLAKE2B 85bd4b4ece07ae95c9afb6521ba42c1e016f75ef439c71512024ccf2f0ad47f603944aee1aeb28c76c74d59352ae673825c7d7f6bfe46b2ad3e2bafe406feb68 SHA512 fb4c58bb19652a090f45c85fec47be52e2474854ab9ae6705e9a3f6b2ac3381af4aca89b8a39ee5906bab6ff6c63a384d4a12dc6aa19024cc335df18cc92aab7
-DIST rdoc-6.6.1.tar.gz 766276 BLAKE2B 480f26688dfa03ac60278b66934f599a2f695787c9c1394b5ea596977c5dc94699429c921cb98fa0faf8aa0b3fd6598441e18cb379886ad152d34eae92206377 SHA512 9baa6fa467c3d4b5dea34a199ca697124bce7ead3bd3a11eb1c28d6a246bf5317331008dde0595baf382a6e05e9bde752008ecb29fe271df1eef3e7875115bd5
 DIST rdoc-6.6.2.tar.gz 765932 BLAKE2B 39bcb0f1af6ee4d53b9011179556d8f1a6b09e20716e60a5d57ca7dcede54797946517e7321004e41d440f26d39e9f3c7c80aaf3b24212ce6a650cddc23d69f3 SHA512 326ead5d4ec5b9328f9feaf3434351911a3dda18d739c8657d9025f7b3387139e1b63ea8fc649870ca474e4a0560ad87cb9e2a13fbbecd240a8aad652d061d42
 DIST rdoc-6.6.3.1.tar.gz 766103 BLAKE2B 15cef9df763e40e105155d49c6c0c1a449c366ac35ab6036c43773c52114f00b19109b056033366b873b5b3317a3bf11c574dd76094d8f606fa0916a84257d0a SHA512 c6f3aae83e895e2de28e5a7c27456160dd53007ceb4464a045e0211473eb3d51f49a7c2ac28f2e44e807c5b36447140d15eadff65bfa52335e94adc9c8b56d2e
 EBUILD rdoc-6.5.0.ebuild 2732 BLAKE2B 254a80d4442f1179852aaed6a98aa7ff488c1f87cc8c37ecde832f4954979091ea17b9b6e9bcc12fb649cb257803e58a5aed549e37664458be9c5672d5a41fc2 SHA512 1d5db6b03b09668ec089ca199cbe0a1b7ded3d7a1bd5e3abd40e2ce67381289f16e88d056eaf8ca2c5d446e714c066d98edc299a84f8bc68b705640ad04f86f6
-EBUILD rdoc-6.6.0.ebuild 2726 BLAKE2B 589396ce3fa6b00199053ade4c65870e1e9d9c0538599af7e5a438bf124924be3fd47ce7539ccdbbd90c9ad89f74bbd94915e4ad060f6719f42216abd2674ec8 SHA512 0e235da8448b62968cce7f30c53f73df470323c2186944d5b2a483dd93779c63d757e312806a4a73bbaeb41f7b357ecb2365f7d005cdd01b1b4efe45ecad57b5
-EBUILD rdoc-6.6.1.ebuild 2726 BLAKE2B 589396ce3fa6b00199053ade4c65870e1e9d9c0538599af7e5a438bf124924be3fd47ce7539ccdbbd90c9ad89f74bbd94915e4ad060f6719f42216abd2674ec8 SHA512 0e235da8448b62968cce7f30c53f73df470323c2186944d5b2a483dd93779c63d757e312806a4a73bbaeb41f7b357ecb2365f7d005cdd01b1b4efe45ecad57b5
 EBUILD rdoc-6.6.2.ebuild 2733 BLAKE2B f859027cb05db8bbc6904bbe093f7c8be893986a7c1ea397db826f16957b964b16c67c2aab1ca0050b7e1832507dc8ecb999611d0abe0ec23a0bbaa0ae3e5482 SHA512 710cc66d453aa88622f1c0890bab5cd439c2c9ca2e95e868f3ff720bd77a2d3fed936d26d30062e671e3b268fcab743c09f9b6a500c5ea2fb01b8e9a7402a837
 EBUILD rdoc-6.6.3.1.ebuild 2733 BLAKE2B 95dd6b0869e8999771bdc8964e691eaf20c947aae15d23d28bd5eb0ebebf6ccd63b8202fa73dddbb99b29831f05e4e7b540232ece475b188e1784b681c0d5623 SHA512 6042ac4069413dad8de68e8bde53c3cee2b4d903668679af5c278d6ace6c1942cab09b617175b50ed9731960037ce0d2cec3dc858d3c6a3826fd66846304a30a
 MISC metadata.xml 336 BLAKE2B 142894745c624081f44dfccc6509273287120a43ceb8d7471634d92ab970bbc7747ce12b3a770b085c8c55a30f2c52ee34e0f27ba4be804ee2056150fb3b035f SHA512 438973812b1541e96ffd4add9422bd19e2c09f3f5b8ddc3ef86a670827c6bce9ed9c1bf9df0601927c959584b63a9d0986d0377807856ab8301fc8a8176922e1
diff --git a/dev-ruby/rdoc/rdoc-6.6.0.ebuild b/dev-ruby/rdoc/rdoc-6.6.0.ebuild
deleted file mode 100644
index 7ea9b73b0177..000000000000
--- a/dev-ruby/rdoc/rdoc-6.6.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
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_rdepend "
-	>=dev-ruby/psych-4.0.0
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
-	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -S exe/rdoc --force-output || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_compile() {
-	LANG=C.UTF-8 ${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.6.1.ebuild b/dev-ruby/rdoc/rdoc-6.6.1.ebuild
deleted file mode 100644
index 7ea9b73b0177..000000000000
--- a/dev-ruby/rdoc/rdoc-6.6.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
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_rdepend "
-	>=dev-ruby/psych-4.0.0
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
-	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -S exe/rdoc --force-output || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_compile() {
-	LANG=C.UTF-8 ${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 91dbe84d8cab..f6a6e8459bfc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 7c705c7a8cbb..7f5df5ea9ea8 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -178,6 +178,8 @@ DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e557791
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
+DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
+DIST tree-sitter-cli-0.22.1-crates.tar.xz 21952352 BLAKE2B 6c097ce2cd58495cb0cfb3760f0c4b59b863b2e9eb6af25a178218a82c55b80f2b98bfa18899314b078df68f252aec159d26925abce767afc039c0ee19630026 SHA512 9380762b0217a0b90c9f21c3bc680e0778c09111fc48ff73e2e51534ff62266c69978af5cb758aec353275033935607607c28d24e380d7d2a5ac5d8573c94a19
 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
@@ -242,4 +244,5 @@ DIST zerocopy-0.7.15.crate 106053 BLAKE2B 6d9757a0ad44d88fbd5945b62964e09d802f4a
 DIST zerocopy-derive-0.7.15.crate 527188 BLAKE2B 14f407cd48136c8a003084485de2aa79c2405a294e7b46425c669f533bbcbe5180c8161fc464a262eb0a2818c217ec34b496e22dc7080a0d77a06891df7d2aea SHA512 a3ee47781616b2aaceee230b76535ccc6adf354db1952bdbfdd73ab3746a47fbcb7b9a7abe6456b030facc63713d40cf2d0831e357e8ddc088cc1524f92f2e35
 EBUILD tree-sitter-cli-0.20.8.ebuild 3231 BLAKE2B 42d9b3c7bbba49dd2e9efadb378394b19f2f2b6c567f811eeb20ddb50333bedfcc42623c9dd613d08fb0d8a13ed34bedad6416f4897f1106655d90c8286ef622 SHA512 37fa95719188ca6b5ac045ab4e51154493928516d914df2a435b0d6ec3c87501caf7da5b6f1b1be028a0e78cbcd7a57d1037596191f8b0a37fe80aa199e6a516
 EBUILD tree-sitter-cli-0.20.9.ebuild 4770 BLAKE2B aca22dea8174bce156a8276635ce47724bdc22eba998cff3c3ea0e1bb378cadb333670517e0a6fc3672d638b3bf95cd617e4252206eabdf2364b1c20a4b94f8b SHA512 1aab05f8512bda8e9a12538c7840cc37c7d867e31bb46dc087de8c8114e3451bded81451ac749aa800c57e6d3d4b948c22cac82d3a6d0e49d84057b4f4203735
+EBUILD tree-sitter-cli-0.22.1.ebuild 945 BLAKE2B 8b8e9bd6dd4c489e681313858e58bb1689e5ea6f6496d6e4b836487f0d187d0cd9ae234719d769dc0c094fcc6aea698f7a142cb0e829a7172368c9fef9771402 SHA512 13042e2dabde7fadcd92f8e88f46bed6cdee85c1ea08c0e24e3afe8d7972062b3ed81132e028e28e1390dd2d52f2a68445224a8823dcb77edcd523dc8853e031
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.1.ebuild
new file mode 100644
index 000000000000..73a7e65e1384
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=tree-sitter
+MY_P=${MY_PN}-${PV}
+
+CRATES=""
+inherit cargo
+
+DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+	${CARGO_CRATE_URIS}
+	https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Test seems to require files (grammar definitions) that we don't have.
+RESTRICT="test"
+
+BDEPEND="~dev-libs/tree-sitter-${PV}"
+RDEPEND="${BDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 2bc4dd2b9cb6..b2fe7df20efb 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 2086d44e7576..bd1b726a9a4e 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -75,12 +75,6 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 				19.0.0_pre20240316)
 					EGIT_COMMIT=6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e
 					;;
-				19.0.0_pre20240309)
-					EGIT_COMMIT=1c7607e8ee6ec4ca3abce1561dd39a98d4efac96
-					;;
-				19.0.0_pre20240302)
-					EGIT_COMMIT=597f9761c3a5ba278fa930d2fac13f156287d505
-					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass
index b2563220cfc2..74443e213b89 100644
--- a/eclass/tree-sitter-grammar.eclass
+++ b/eclass/tree-sitter-grammar.eclass
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: tree-sitter-grammar.eclass
 # @MAINTAINER:
 # Matthew Smith <matthew@gentoo.org>
 # Nick Sarnie <sarnex@gentoo.org>
+# Arthur Zamarin <arthurzam@gentoo.org>
 # @AUTHOR:
 # Matthew Smith <matthew@gentoo.org>
 # @SUPPORTED_EAPIS: 8
@@ -22,7 +23,7 @@ inherit edo multilib toolchain-funcs
 
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/${TS_PV:-v${PV}}.tar.gz
 	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${TS_PV:-${PV}}/src
+S="${WORKDIR}"/${PN}-${TS_PV:-${PV}}
 
 BDEPEND+=" test? ( dev-util/tree-sitter-cli )"
 IUSE+=" test"
@@ -35,6 +36,44 @@ RESTRICT+=" !test? ( test )"
 # Used to override upstream tag name if tagged differently, e.g. most releases
 # are v${PV} but some are tagged as rust-${PV}.
 
+# @ECLASS_VARIABLE: TS_BINDINGS
+# @PRE_INHERIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of bindings language to build. Currently only "python" is supported.
+
+for _BINDING in "${TS_BINDINGS[@]}"; do
+	case ${_BINDING} in
+		python)
+			DISTUTILS_EXT=1
+			DISTUTILS_OPTIONAL=1
+			DISTUTILS_USE_PEP517=setuptools
+			PYTHON_COMPAT=( python3_{10..12} )
+			inherit distutils-r1
+
+			IUSE+=" python"
+			REQUIRED_USE+=" python? ( ${PYTHON_REQUIRED_USE} )"
+
+			DEPEND+=" python? (
+				${PYTHON_DEPS}
+			)"
+			RDEPEND+=" python? (
+				${PYTHON_DEPS}
+				>=dev-python/tree-sitter-0.21.0[${PYTHON_USEDEP}]
+			)"
+			BDEPEND+=" python? (
+				${PYTHON_DEPS}
+				${DISTUTILS_DEPS}
+				dev-python/wheel[${PYTHON_USEDEP}]
+			)"
+			;;
+		*)
+			die "Unknown binding: ${_BINDING}"
+			;;
+	esac
+done
+unset _BINDING
+
 # @FUNCTION: _get_tsg_abi_ver
 # @INTERNAL
 # @DESCRIPTION:
@@ -44,33 +83,62 @@ _get_tsg_abi_ver() {
 	# This sed script finds ABI definition string in parser source file,
 	# substitutes all the string until the ABI number, and prints remains
 	# (the ABI number itself)
-	sed -n 's/#define LANGUAGE_VERSION //p' "${S}"/parser.c ||
+	sed -n 's/#define LANGUAGE_VERSION //p' "${S}"/src/parser.c ||
 		die "Unable to extract ABI version for this grammar"
 }
 
-# @FUNCTION: tree-sitter-grammar_src_compile
-# @DESCRIPTION:
-# Compiles the Tree Sitter parser as a shared library.
-tree-sitter-grammar_src_compile() {
+tree-sitter-grammar_src_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	default
+
+	local binding
+	for binding in "${TS_BINDINGS[@]}"; do
+		case ${binding} in
+			python)
+				use python && distutils-r1_src_prepare
+				;;
+		esac
+	done
+}
+
+tree-sitter-grammar_src_configure() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local binding
+	for binding in "${TS_BINDINGS[@]}"; do
+		case ${binding} in
+			python)
+				use python && distutils-r1_src_configure
+				;;
+		esac
+	done
+}
+
+# @FUNCTION: _tree-sitter-grammar_legacy_compile
+# @INTERNAL
+# @DESCRIPTION:
+# Compiles the Tree Sitter parser as a shared library, the legacy way.
+_tree-sitter-grammar_legacy_compile() {
+	cd "${S}/src" || die
+
 	# Grammars always contain parser.c, and sometimes a scanner.c,
 	# or scanner.cc.
 
 	tc-export CC CXX
 	# We want to use the bundled parser.h, not anything lurking on the system, hence -I
 	# See https://github.com/tree-sitter/tree-sitter-bash/issues/199#issuecomment-1694416505
-	export CFLAGS="${CFLAGS} -fPIC -I. -Itree_sitter"
-	export CXXFLAGS="${CXXFLAGS} -fPIC -I. -Itree_sitter"
+	local -x CFLAGS="${CFLAGS} -fPIC -I. -Itree_sitter"
+	local -x CXXFLAGS="${CXXFLAGS} -fPIC -I. -Itree_sitter"
 
 	local objects=( parser.o )
-	if [[ -f "${S}"/scanner.c || -f "${S}"/scanner.cc ]]; then
+	if [[ -f "${S}"/src/scanner.c || -f "${S}"/src/scanner.cc ]]; then
 		objects+=( scanner.o )
 	fi
 	emake "${objects[@]}"
 
 	local link="$(tc-getCC) ${CFLAGS}"
-	if [[ -f "${S}/scanner.cc" ]]; then
+	if [[ -f "${S}/src/scanner.cc" ]]; then
 		link="$(tc-getCXX) ${CXXFLAGS}"
 	fi
 
@@ -84,10 +152,33 @@ tree-sitter-grammar_src_compile() {
 	edo ${link} ${LDFLAGS} \
 			-shared \
 			*.o \
-			${soname_args} \
+			"${soname_args}" \
 			-o "${WORKDIR}"/${soname}
 }
 
+tree-sitter-grammar_src_compile() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	# legacy grammars don't have a pyproject.toml
+	if [[ -f "${S}/pyproject.toml" ]]; then
+		sed -e "/SONAME_MINOR :=/s/:=.*$/:= $(_get_tsg_abi_ver)/" -i "${S}/Makefile" || die
+		emake \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	else
+		_tree-sitter-grammar_legacy_compile
+	fi
+
+	local binding
+	for binding in "${TS_BINDINGS[@]}"; do
+		case ${binding} in
+			python)
+				use python && distutils-r1_src_compile
+				;;
+		esac
+	done
+}
+
 # @FUNCTION: tree-sitter-grammar_src_test
 # @DESCRIPTION:
 # Runs the Tree Sitter parser's test suite.
@@ -95,22 +186,37 @@ tree-sitter-grammar_src_compile() {
 tree-sitter-grammar_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	(cd .. && tree-sitter test) || die "Test suite failed"
+	tree-sitter test || die "Test suite failed"
 }
 
-# @FUNCTION: tree-sitter-grammar_src_install
-# @DESCRIPTION:
-# Installs the Tree Sitter parser library.
 tree-sitter-grammar_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
+	# legacy grammars don't have a pyproject.toml
+	if [[ -f "${S}/pyproject.toml" ]]; then
+		emake \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+			DESTDIR="${D}/" \
+			install
+		find "${D}" -name '*.a' -delete || die "failed to remove static libraries"
+	else
+		local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
+
+		dolib.so "${WORKDIR}/${soname}"
+		dosym "${soname}" /usr/$(get_libdir)/lib${PN}$(get_libname)
+	fi
 
-	dolib.so "${WORKDIR}/${soname}"
-	dosym "${soname}" \
-		  /usr/$(get_libdir)/lib${PN}$(get_libname)
+	local binding
+	for binding in "${TS_BINDINGS[@]}"; do
+		case ${binding} in
+			python)
+				use python && distutils-r1_src_install
+				;;
+		esac
+	done
 }
 
 fi
 
-EXPORT_FUNCTIONS src_compile src_test src_install
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 734588fa6688..ccf34e5190a1 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/ponysay/Manifest b/games-misc/ponysay/Manifest
index fee4b9666258..60b59e6abc40 100644
--- a/games-misc/ponysay/Manifest
+++ b/games-misc/ponysay/Manifest
@@ -1,4 +1,5 @@
+AUX ponysay-3.0.3-pr313.patch 16799 BLAKE2B 72f32e2e0dfe7829b313a500fdb7cd30a2630721431c603d5005d985b78baa7d4bcee1d7a9dc0b0bc262c7fd55f72e1e1727befdb165af324e41812631bd802e SHA512 06e62dde5b4c1cd3245f7a0ac0b6d0272ce6a458c2468c39a25a52aac89e96ff363f66041e6d5360c96a74dfb2f726f764258f1e634a3fa97c6f3b8c963d32d1
 AUX ponysay-3.0.3-python-syntax.patch 1584 BLAKE2B 5f13613d7a43df44662ebe9d6cb995bba3ee8629cdf45546e895bbda64bea03029db25d0dc75c2263f77fd51c3b8d2d43f5aa7d48c02089b1413f191e7888a29 SHA512 d28d85313881e2e48c3648db0f99686a2d5facd82cb771219737075043d162047190a4e7a9cadac15b20c6081add90029535e8b1e17dfdca191f6d8e994c25ed
 DIST ponysay-3.0.3.tar.gz 2139074 BLAKE2B 3ba477268d68ff9a92bad8028d0b960a2a6152057146368723fea432100a71517c0c343d34b2b1c580fcfa1945bdc273fed276cf4a10c702514e6699cda87a2c SHA512 d6ff905404192bdc207952a4a914458d7f25ddcfcea95763ae277a2a3bc7ab33e86a0a229c1b10ff7295b7a89d6e1b61406feefb6bdf9026f4076d0ed70dbe93
-EBUILD ponysay-3.0.3.ebuild 1533 BLAKE2B 8b7264309c1d0f044f26456f865d6b0a66012735f8e65bee48e0375af3fabe422cfc22a42a886db77c63876d953e2cc37702717b8145380902b8ff63a8f62ac0 SHA512 c2212eb72412a80bddf2bbe77e8f577efb021e7adedbd6ffb78f9ab21f0910958ecb54894986fc6915e10e1de81fc2f50d745716650e81115dee42a5b6bcb072
+EBUILD ponysay-3.0.3.ebuild 1573 BLAKE2B 9d2e3d5b82d5037683251d6641699cf90c2cef438c1674a4d22a3e8f9f3c6bf909a9515af43feb7e3ba4d6725369e77579bcb62f9648d93c3d7d90c1723cfc14 SHA512 6568993a8922966e620c9cfcb10cfea79cecf47397e19e9fadf5e18c85fc3bd2d4f6c4c63a9b84eb5981f1ece2589294ef2fe7fe77ef4f93d0c615161e6c9841
 MISC metadata.xml 501 BLAKE2B 635e60befc4dd4592e1b31c261eeefe207ffc41818df2c5fdcb04d775d35522a9513a871d1e1066715dd87373e259cd036fb5523d81c09cce163a0ec776c3cc1 SHA512 94c2a5bb13b2ee021c02489199c2decf82fbd17ccfba999a0ca80437271516c8fc41cebf6aab56332ddc43e75a5b22734333ecd7ade4ab484f3d16221578fa55
diff --git a/games-misc/ponysay/files/ponysay-3.0.3-pr313.patch b/games-misc/ponysay/files/ponysay-3.0.3-pr313.patch
new file mode 100644
index 000000000000..b2f8d2b9b426
--- /dev/null
+++ b/games-misc/ponysay/files/ponysay-3.0.3-pr313.patch
@@ -0,0 +1,355 @@
+From 1d898ec29946725d53a47515d413d845d192b51e Mon Sep 17 00:00:00 2001
+From: Tonyl <git@tonyl.eu>
+Date: Fri, 10 Nov 2023 19:21:43 +0100
+Subject: [PATCH 1/3] escape backslashes
+
+---
+ src/balloon.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/balloon.py b/src/balloon.py
+index 0f1909e4..3fa10ef2 100644
+--- a/src/balloon.py
++++ b/src/balloon.py
+@@ -43,9 +43,9 @@ def __init__(self, link, linkmirror, linkcross, ww, ee, nw, nnw, n, nne, ne, nee
+         '''
+         Constructor
+         
+-        @param  link:str        The \-directional balloon line character
++        @param  link:str        The \\-directional balloon line character
+         @param  linkmirror:str  The /-directional balloon line character
+-        @param  linkcross:str   The /-directional balloon crossing a \-directional ballonon line character
++        @param  linkcross:str   The /-directional balloon crossing a \\-directional ballonon line character
+         @param  ww:str          See the info manual
+         @param  ee:str          See the info manual
+         @param  nw:list<str>    See the info manual
+
+From 8bf2602d281b5d6b20eb60e84f8b42e35beec8d6 Mon Sep 17 00:00:00 2001
+From: Tonyl <git@tonyl.eu>
+Date: Fri, 10 Nov 2023 20:40:46 +0100
+Subject: [PATCH 2/3] fix default ANSI code
+
+---
+ setup.py           | 26 +++++++++++++-------------
+ src/__main__.py    |  2 +-
+ src/argparser.py   |  8 ++++----
+ src/backend.py     |  4 ++--
+ src/lists.py       | 12 ++++++------
+ src/ponysaytool.py | 14 +++++++-------
+ 6 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 5728a23f..9b9f3e28 100755
+--- a/setup.py
++++ b/setup.py
+@@ -48,7 +48,7 @@
+ 
+ class Setup():
+     def __init__(self):
+-        usage_script = '\033[34;1msetup.py\033[21;39m'
++        usage_script = '\033[34;1msetup.py\033[0;39m'
+         usage_help   = '(--version | --help)'
+         usage_proc   = '[\033[4mconfigurations\033[24m] ([build] | prebuilt | install | (uninstall|clean)[-old] | view)'
+ 
+@@ -358,9 +358,9 @@ def viewconf(self, conf):
+         print('Using system configuration directory: ' + conf['sysconf-dir'])
+         print('Prefered linking style: ' + self.linking)
+         print('Using umask: 022 (only owner can do modifications)')
+-        if self.free is None:                      print(YELLOW % ('\033[01m--freedom is manditory and has not be specified\033[21m'))
++        if self.free is None:                      print(YELLOW % ('\033[01m--freedom is manditory and has not be specified\033[0m'))
+         elif self.free:                            print(GREEN  % ('', 'Installing only fully free parts of the package'))
+-        else:                                      print(RED    % ('Installing \033[1mnot\033[21m only fully free parts of the package'))
++        else:                                      print(RED    % ('Installing \033[1mnot\033[0m only fully free parts of the package'))
+ 
+         print()
+     
+@@ -369,7 +369,7 @@ def build(self, conf):
+         Compile ponysay
+         '''
+         
+-        print('\033[1;34m::\033[39mCompiling...\033[21m')
++        print('\033[1;34m::\033[39mCompiling...\033[0m')
+ 
+         def compressCommand(ext):
+             if ext == 'gz':  return 'gzip -9 -f'
+@@ -575,7 +575,7 @@ def install(self, conf):
+         Install compiled ponysay
+         '''
+         
+-        print('\033[1;34m::\033[39mInstalling...\033[21m')
++        print('\033[1;34m::\033[39mInstalling...\033[0m')
+ 
+         dests = []
+         for command in commands:
+@@ -665,7 +665,7 @@ def uninstall(self, conf):
+         Uninstall ponysay
+         '''
+         
+-        print('\033[1;34m::\033[39mUninstalling...\033[21m')
++        print('\033[1;34m::\033[39mUninstalling...\033[0m')
+ 
+         (files, dirs, infos) = ([], [], [])
+ 
+@@ -723,7 +723,7 @@ def uninstallOld(self, conf):
+         Uninstall file ponysay no longer uses
+         '''
+         
+-        print('\033[1;34m::\033[39mUninstalling old files...\033[21m')
++        print('\033[1;34m::\033[39mUninstalling old files...\033[0m')
+ 
+         instdir = conf['~prefix~'] + '/usr'
+         files = [instdir + f for f in ['bin/ponysaylist.pl', 'bin/ponysaytruncater', 'bin/ponysay.py', 'bin/ponythink.py']]
+@@ -744,7 +744,7 @@ def clean(self):
+         Remove compiled files
+         '''
+         
+-        print('\033[1;34m::\033[39mCleaning...\033[21m')
++        print('\033[1;34m::\033[39mCleaning...\033[0m')
+ 
+         files = ['ponysay.info', 'ponysay.info.gz', 'ponysay.info.xz',  'ponysay.pdf.gz', 'ponysay.pdf.xz', 'ponysay.install', 'ponysay.zip']
+         files += ['src/%s.install' % file for file in ponysaysrc]
+@@ -771,7 +771,7 @@ def cleanOld(self):
+         Remove compiled files ponysay is no longer compiling
+         '''
+         
+-        print('\033[1;34m::\033[39mCleaning old files...\033[21m')
++        print('\033[1;34m::\033[39mCleaning old files...\033[0m')
+ 
+         files = ['truncater', 'ponysaytruncater', 'ponysay.py.install', 'ponysay.install~', 'ponysay.zip']
+         dirs = []
+@@ -1199,7 +1199,7 @@ def usage(self):
+         if self.__longdescription is not None:
+             print(self.__longdescription)
+             print()
+-        print('\n\033[1mUSAGE:\033[21m', end='')
++        print('\n\033[1mUSAGE:\033[0m', end='')
+         first = True
+         for line in self.__usage.split('\n'):
+             if first:  first = False
+@@ -1214,11 +1214,11 @@ def help(self):
+         '''
+         
+         # The usage should be terse so this header is only included in the help command.
+-        print('\033[1m{}\033[21m - {}\n'.format(self.__program, self.__description))
++        print('\033[1m{}\033[0m - {}\n'.format(self.__program, self.__description))
+         
+         self.usage()
+         
+-        print('\033[1mCONFIGURATIONS:\033[21m\n')
++        print('\033[1mCONFIGURATIONS:\033[0m\n')
+         for opt in self.__arguments:
+             (opt_type, opt_alts, opt_arg, opt_help) = opt[0:4]
+             if opt_help is not None:
+@@ -1229,7 +1229,7 @@ def help(self):
+                         print('\t\033[2m' + opt_alt + '\033[22m')
+                 first = True
+                 for line in opt_help.split('\n'):
+-                    print(('\t\t\033[32;1m%s\033[21;39m' if first else '\t\t%s') % (line))
++                    print(('\t\t\033[32;1m%s\033[0;39m' if first else '\t\t%s') % (line))
+                     first = False
+                 print()
+         print()
+diff --git a/src/__main__.py b/src/__main__.py
+index 3b084e93..6aa5e793 100644
+--- a/src/__main__.py
++++ b/src/__main__.py
+@@ -66,7 +66,7 @@
+         isthink = isthink[:isthink.find(os.extsep)]
+     isthink = isthink.endswith('think')
+     
+-    usage_saythink = '\033[34;1m(ponysay | ponythink)\033[21;39m'
++    usage_saythink = '\033[34;1m(ponysay | ponythink)\033[0;39m'
+     usage_common   = '[-c] [-W\033[33mCOLUMN\033[39m] [-b\033[33mSTYLE\033[39m]'
+     usage_listhelp = '(-l | -L | -B | +l | +L | -A | + A | -v | -h)'
+     usage_file     = '[-f\033[33mPONY\033[39m]* [[--] \033[33mmessage\033[39m]'
+diff --git a/src/argparser.py b/src/argparser.py
+index 7b13b3cc..6898c710 100644
+--- a/src/argparser.py
++++ b/src/argparser.py
+@@ -254,7 +254,7 @@ def help(self, use_colours = None):
+         if use_colours is None:
+             use_colours = sys.stdout.isatty()
+         
+-        print(('\033[1m%s\033[21m %s %s' if use_colours else '%s %s %s') % (self.__program, '-' if self.linuxvt else '—', self.__description))
++        print(('\033[1m%s\033[0m %s %s' if use_colours else '%s %s %s') % (self.__program, '-' if self.linuxvt else '—', self.__description))
+         print()
+         if self.__longdescription is not None:
+             desc = self.__longdescription
+@@ -265,7 +265,7 @@ def help(self, use_colours = None):
+             print(desc)
+         print()
+         
+-        print('\033[1mUSAGE:\033[21m' if use_colours else 'USAGE:', end='')
++        print('\033[1mUSAGE:\033[0m' if use_colours else 'USAGE:', end='')
+         first = True
+         for line in self.__usage.split('\n'):
+             if first:
+@@ -291,7 +291,7 @@ def help(self, use_colours = None):
+                 maxfirstlen.append(first)
+         maxfirstlen = len(max(maxfirstlen, key = len))
+         
+-        print('\033[1mSYNOPSIS:\033[21m' if use_colours else 'SYNOPSIS')
++        print('\033[1mSYNOPSIS:\033[0m' if use_colours else 'SYNOPSIS')
+         (lines, lens) = ([], [])
+         for opt in self.__arguments:
+             opt_type = opt[0]
+@@ -337,7 +337,7 @@ def help(self, use_colours = None):
+             for line in opt_help.split('\n'):
+                 if first:
+                     first = False
+-                    print('%s' % (line), end='\033[21;39m\n' if use_colours else '\n')
++                    print('%s' % (line), end='\033[0;39m\n' if use_colours else '\n')
+                 else:
+                     print(('%s\033[%sm%s\033[39m' if use_colours else '%s%s%s') % (' ' * col, colour, line))
+             index += 1
+diff --git a/src/backend.py b/src/backend.py
+index 82ff1496..4111f822 100644
+--- a/src/backend.py
++++ b/src/backend.py
+@@ -118,7 +118,7 @@ def parse(self):
+                 printinfo(info)
+                 self.pony = self.pony[infoend:]
+         elif self.infolevel == 2:
+-            self.message = '\033[01;31mI am the mysterious mare...\033[21;39m'
++            self.message = '\033[01;31mI am the mysterious mare...\033[0;39m'
+         elif self.infolevel == 1:
+             self.pony = 'There is not metadata for this pony file'
+         self.pony = self.mode + self.pony
+@@ -149,7 +149,7 @@ def formatInfo(info):
+                     test = test.replace(c, '')
+                 if (len(test) == 0) and (len(key.replace(' ', '')) > 0):
+                     value = line[sep + 1:].strip()
+-                    line = '\033[1m%s\033[21m: %s\n' % (key.strip(), value)
++                    line = '\033[1m%s\033[0m: %s\n' % (key.strip(), value)
+                     tags += line
+                     continue
+             comment += '\n' + line
+diff --git a/src/lists.py b/src/lists.py
+index 6a8c4a71..dc0cb10e 100644
+--- a/src/lists.py
++++ b/src/lists.py
+@@ -125,8 +125,8 @@ def simplelist(ponydirs, quoters = [], ucsiser = None):
+         ## If ther directory is not empty print its name and all ponies, columnised
+         if len(ponies) == 0:
+             continue
+-        print('\033[1mponies located in ' + ponydir + '\033[21m')
+-        _print_columnised([(pony, '\033[1m' + pony + '\033[21m' if pony in quoters else pony) for pony in ponies])
++        print('\033[1mponies located in ' + ponydir + '\033[0m')
++        _print_columnised([(pony, '\033[1m' + pony + '\033[0m' if pony in quoters else pony) for pony in ponies])
+ 
+ 
+ def linklist(ponydirs = None, quoters = [], ucsiser = None):
+@@ -145,7 +145,7 @@ def linklist(ponydirs = None, quoters = [], ucsiser = None):
+         ## If there are no ponies in the directory skip to next directory, otherwise, print the directories name
+         if len(ponies) == 0:
+             continue
+-        print('\033[1mponies located in ' + ponydir + '\033[21m')
++        print('\033[1mponies located in ' + ponydir + '\033[0m')
+         
+         ## UCS:ise pony names
+         pseudolinkmap = {}
+@@ -179,7 +179,7 @@ def linklist(ponydirs = None, quoters = [], ucsiser = None):
+         ponies = {}
+         for pony in ponymap:
+             w = UCS.dispLen(pony)
+-            item = '\033[1m' + pony + '\033[21m' if (pony in quoters) else pony
++            item = '\033[1m' + pony + '\033[0m' if (pony in quoters) else pony
+             syms = ponymap[pony]
+             syms.sort()
+             if len(syms) > 0:
+@@ -190,9 +190,9 @@ def linklist(ponydirs = None, quoters = [], ucsiser = None):
+                     w += UCS.dispLen(sym)
+                     if first:  first = False
+                     else:      item += ' '
+-                    item += '\033[1m' + sym + '\033[21m' if (sym in quoters) else sym
++                    item += '\033[1m' + sym + '\033[0m' if (sym in quoters) else sym
+                 item += ')'
+-            ponies[(item.replace('\033[1m', '').replace('\033[21m', ''), item)] = w
++            ponies[(item.replace('\033[1m', '').replace('\033[0m', ''), item)] = w
+         
+         ## Print the ponies, columnised
+         _print_columnised(list(ponies))
+diff --git a/src/ponysaytool.py b/src/ponysaytool.py
+index 574a2baa..aef0c0c6 100755
+--- a/src/ponysaytool.py
++++ b/src/ponysaytool.py
+@@ -275,7 +275,7 @@ def browse(self, ponydir, restriction):
+         ponies.sort()
+         
+         if len(ponies) == 0:
+-            print('\033[1;31m%s\033[21m;39m' % 'No ponies... press Enter to exit.')
++            print('\033[1;31m%s\033[0m;39m' % 'No ponies... press Enter to exit.')
+             input()
+         
+         panelw = Backend.len(max(ponies, key = Backend.len))
+@@ -338,7 +338,7 @@ def findcolumn(line, column):
+                     elif px > 0:
+                         ponyprint = [px * ' ' + line for line in ponyprint]
+                     ponyprint = [(line if Backend.len(line) <= termw else line[:findcolumn(line, termw)]) for line in ponyprint]
+-                    ponyprint = ['\033[21;39;49;0m%s\033[21;39;49;0m' % line for line in ponyprint]
++                    ponyprint = ['\033[0;39;49;0m%s\033[0;39;49;0m' % line for line in ponyprint]
+                     return '\n'.join(ponyprint)
+                 
+                 if quotes:
+@@ -774,7 +774,7 @@ def isatty(self):
+             buf += c + colourstack.feed(c)
+         modprintpony = buf.replace(AUTO_PUSH, '').replace(AUTO_POP, '')
+         
+-        printpony = [('\033[21;39;49;0m%s%s\033[21;39;49;0m' % (' ' * (termsize[1] - ponywidth), line)) for line in modprintpony.split('\n')]
++        printpony = [('\033[0;39;49;0m%s%s\033[0;39;49;0m' % (' ' * (termsize[1] - ponywidth), line)) for line in modprintpony.split('\n')]
+         
+         
+         print(preprint, end='')
+@@ -922,9 +922,9 @@ def alert(text):
+                 else:
+                     print('\033[%i;%iH\033[34m%s:\033[39m' % (self.top + oldy, self.left, leftlines[oldy]), end='')
+                 if (y > 0) and (leftlines[y - 1] == leftlines[y]) and (leftlines[y] == leftlines[-1]):
+-                    print('\033[%i;%iH\033[1;34m%s\033[21;39m' % (self.top + y, self.left, '>'), end='')
++                    print('\033[%i;%iH\033[1;34m%s\033[0;39m' % (self.top + y, self.left, '>'), end='')
+                 else:
+-                    print('\033[%i;%iH\033[1;34m%s:\033[21;39m' % (self.top + y, self.left, leftlines[y]), end='')
++                    print('\033[%i;%iH\033[1;34m%s:\033[0;39m' % (self.top + y, self.left, leftlines[y]), end='')
+                 print('\033[%i;%iH' % (self.top + y, innerleft + x), end='')
+             (oldy, oldx, oldmark) = (y, x, mark)
+             if edited:
+@@ -1080,7 +1080,7 @@ def alert(text):
+                         leftline = leftlines[row] + ':'
+                         if (leftlines[row - 1] == leftlines[row]) and (leftlines[row] == leftlines[-1]):
+                             leftline = '>'
+-                        print('\033[%i;%iH\033[%s34m%s\033[%s39m' % (self.top + row, self.left, '1;' if row == y else '', leftline, '21;' if row == y else ''), end='')
++                        print('\033[%i;%iH\033[%s34m%s\033[%s39m' % (self.top + row, self.left, '1;' if row == y else '', leftline, '0;' if row == y else ''), end='')
+                     for row in range(0, len(datalines)):
+                         print('\033[%i;%iH%s\033[49m' % (self.top + row, innerleft, datalines[row]), end='')
+                     print('\033[%i;%iH' % (self.top + y, innerleft + x), end='')
+@@ -1206,7 +1206,7 @@ def alert(text):
+ '''
+ 
+ 
+-usage_program = '\033[34;1mponysay-tool\033[21;39m'
++usage_program = '\033[34;1mponysay-tool\033[0;39m'
+ 
+ usage = '\n'.join(['%s %s' % (usage_program, '(--help | --version | --kms)'),
+                    '%s %s' % (usage_program, '(--edit | --edit-rm) \033[33mPONY-FILE\033[39m'),
+
+From eaeb08cf7a619982c41e0dab679f77868e8478af Mon Sep 17 00:00:00 2001
+From: Tonyl <git@tonyl.eu>
+Date: Fri, 10 Nov 2023 21:16:43 +0100
+Subject: [PATCH 3/3] fix bracket
+
+---
+ ponies/raritysdad.pony | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ponies/raritysdad.pony b/ponies/raritysdad.pony
+index f683c54e..9dec8afe 100644
+--- a/ponies/raritysdad.pony
++++ b/ponies/raritysdad.pony
+@@ -12,7 +12,7 @@ KIND: earth
+ LINK: regular
+ MANE: black
+ NAME: (not mentioned)
+-OTHER NAMES: Magnum (official, in Gameloft game), Hondo Flanks (official. on Trading Card Game}, Carlton (unofficial)
++OTHER NAMES: Magnum (official, in Gameloft game), Hondo Flanks (official, on Trading Card Game), Carlton (unofficial)
+ POSE: stand
+ SOURCE: (Bot-chan) Desktop ponies
+ WIDTH: 41
diff --git a/games-misc/ponysay/ponysay-3.0.3.ebuild b/games-misc/ponysay/ponysay-3.0.3.ebuild
index becb6fdc94a2..8c803cdffed7 100644
--- a/games-misc/ponysay/ponysay-3.0.3.ebuild
+++ b/games-misc/ponysay/ponysay-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 python-single-r1
 
 DESCRIPTION="cowsay reimplemention for ponies"
@@ -24,6 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.3-python-syntax.patch"
+	"${FILESDIR}/${PN}-3.0.3-pr313.patch"
 )
 
 setup_py() {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 7f292a91b712..c8b3fcdc52d0 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk-layer-shell/Manifest b/gui-libs/gtk-layer-shell/Manifest
index 02d2778b1c14..debce432e1ca 100644
--- a/gui-libs/gtk-layer-shell/Manifest
+++ b/gui-libs/gtk-layer-shell/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-layer-shell-0.8.1.tar.gz 136156 BLAKE2B 19c16d49d119572b0a3ef9bf0aee2341dedb4b2e5afedee16b9817e16fcd2adba7696a9d6f2f01b4ebaa3636c116d8977079a9b83ed1941f9d97df9389425780 SHA512 070673a73166c9fd0ea10e6aa98c480318fbf8a6c2dff2a9b4900aea40bb59680d41d9bba9917953fabe4358c0dfa6c3d0221c579ada37cee72ce23433b40329
 DIST gtk-layer-shell-0.8.2.tar.gz 137693 BLAKE2B 8c36e37fe0e675bfa9f3bfb6c4013ac7b137d27615cb29bd750c4cbbff36754986d0608cb97e427972e9108b048b6bca5611e89c01275aabec05c0b1fc9b7e62 SHA512 e3b56612dab2527d5242b8305362c88100de3eac76cee32ce51791cbc77df38a5052143bf4bf5781a90fa62e026a758ef9d10dc5b4292b0b334983842fad632c
-EBUILD gtk-layer-shell-0.8.1.ebuild 1325 BLAKE2B 3e543ab808cc5655932da8c34dc379c520acb662b31b429a097dcab5a6f79c1d40e9bd6393b27cf5169131029ca9af6bb0bdd3e926960d5009523d573db4c6cb SHA512 690e9a750ab3bbe8671f5de189bef9a1d1163a12f8b8ee0139872fd03f42a6c2070d43d99965300205df0e3bd98538bd342e92f999ee2e9e621eb8a7218a928a
-EBUILD gtk-layer-shell-0.8.2.ebuild 1342 BLAKE2B 392080248c980dcb8319b7c942c1a2b282e26673bf76b32764b05a1c5d367e0e187e1d99d6b6197cfdee8dbb50d21363c944e3cfcbdfa45a7f2a15a1e4faeb5b SHA512 e1a38c5d80b2cbc31494263bb6a906f6c32146d0e2b0d4aaef82233dafc963e675e5235adc8913fffaf22f1a7751fa12e659a7a895a3fd60d6fb3ec032e22243
+EBUILD gtk-layer-shell-0.8.2.ebuild 1343 BLAKE2B f7aa39b3f76a6f73f766d54d89212af24dad5589a468ca5a73ac83cef9f92723fa356978f77483a324fdd833d7f04ff5375289337f01078ebea739340a965482 SHA512 13178846cdbc05a00be5e2464145e56ec8515679696e0dfa83ed5b541b8bd30bcef3910245c016c9cbe929b104f4635bf33dd068c972dc39276da1b8c370fb8d
 MISC metadata.xml 495 BLAKE2B 59bee54b6a6cc173655e2b482873f3ec5a21854a7dfcde8f6073a3c003642802978b182db94dae86c82c0b2409a153691b83720471530e4435ce0eebc5833f19 SHA512 625076c53f3dafb1812000eb3d50a68a837d751e53697429fabc6369161056f8ec16db584e830848cf57b659a10b8ece4b2cddeff1402ab42c4ff474aa954261
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.1.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.1.ebuild
deleted file mode 100644
index 02e8dcbdac99..000000000000
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-VALA_USE_DEPEND="vapigen"
-inherit vala meson python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wmww/${PN}"
-else
-	SRC_URI="https://github.com/wmww/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
-HOMEPAGE="https://github.com/wmww/gtk-layer-shell"
-
-LICENSE="MIT LGPL-3+"
-SLOT="0"
-IUSE="examples gtk-doc introspection test vala"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.37:3[introspection?,wayland]
-	>=dev-libs/wayland-1.10.0
-	>=dev-libs/wayland-protocols-1.16
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	gtk-doc? ( dev-util/gtk-doc )
-	test? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use examples)
-		$(meson_use gtk-doc docs)
-		$(meson_use test tests)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.2.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.2.ebuild
index 9044b9706980..b185c66bb840 100644
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.2.ebuild
+++ b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VALA_USE_DEPEND="vapigen"
 inherit vala meson python-any-r1
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9ea93a07c7e7..ea3410351ef7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 09e8007b6d76..e1b6f904e905 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -9,9 +9,9 @@ AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
 DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
-EBUILD freecad-0.20.2-r1.ebuild 10408 BLAKE2B 503eb47d56c92d9a95727825366a7b16a03f6df378e6a0fe300bed5300ccce77af5d13c09fb797cc6b0deed46747001ded8f439331e34e373e4bfd5ba59cf74a SHA512 ea4520aeb24c1baa91469b5f2f672d8d52217a31901600a8f3f4dbb9a7dff3faf9724e9dd79c39b36ff08d5a63f8acce6779eb1ebae004f951a5a857df522a8d
-EBUILD freecad-0.20.2-r2.ebuild 10385 BLAKE2B df9d6c357735e35016585e4514a28f3819fff42b9090dda6fc00c3aa41523985fe249e935b858a4bf39b1faf226712b191db62d27ffc77fbf44bc18abe28ca4c SHA512 fc19d0fd6bdcd1abc0dc8f99ced84e39842d4c3f9289a9d5d544da06799aae400f9d91ab607db02bd96e52dd658fba8b70a18fc96114a5b563eba4b6dbc26ff4
-EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb
-EBUILD freecad-0.21.2-r2.ebuild 11611 BLAKE2B 2490ec4fc5768af96fea39379a9036b080bbe8346f91d5a1419195d802c218db16f3ea20f27e368e8e2a027cafe016ed16c70a1c53af20914a2a0f5f0480b7c1 SHA512 8b0b517d38d490e6b66f8b5af041cbba1fdc4e40fb2363abb2fe1622287ccc875ab1715149c90f3686f7cf58bf909de0fd86b1b467ec94b490bd038d3d50322c
-EBUILD freecad-9999.ebuild 11806 BLAKE2B b8e736cfd141ea76dfd110b851b7d97c55eddfeffb1bf646d9765971a9d233996163d737e85036d572aba1db51e6e94d40693a3b4a1374c6e7b1eec522f0ea61 SHA512 941f25542b702f0d7fd1d617d966a3358edb51ecf9d401195cd73bdb520255c5fa196632f86acec2b32a88fe5aa1b2ab56fe5efb95c4154d465a0a6c51bbcab9
+EBUILD freecad-0.20.2-r1.ebuild 10415 BLAKE2B 373a0531382c60e43474b8c55b6bd6857ba3b54d2bff97dee4d6a63c3b5f1480541dcac1d1f26511bcf3756f239b9a14ab045d20e81b833f36bbcba4e8e1a8cf SHA512 171b0c34fc8f114853bbd6d31474618c5fa23aacd142e55d8f4d4353645587d4ca1a67933adace40e4027b06a2e18e9eebaaf6a644139f2f5bc9b9cd4fd6f969
+EBUILD freecad-0.20.2-r2.ebuild 10392 BLAKE2B ba48c450e77b3b33ca6c9e02658d27eee17e4d2a72383a85540c8c055b3d2c56b56d1bb3cf7aaa799657647cfa07b31b68dd2ca86964e0d43eb59a9813cd26b7 SHA512 a2b8acb55e76b3a7b259cd56479186636aecc4aa6e889dc6d7bf1ce6bb564a9bae574bd36fc8a1ea0e9d11ee091df67ce256c09fcda3a48207e8b3b5e84db839
+EBUILD freecad-0.20.2.ebuild 9865 BLAKE2B c2d93cd32145eb5b3c36e0aeecd3c3fd796afb028ecfa9a798bbc1c3ac6b9e0c1d441a137b1bd67758336164c47a07d68e10d65beefbcf04841470926daf37fd SHA512 4090841bd5473aa4271207271e0faf7f2244ad8b11df376b64c70ade5f4dc2c9408694b7062d400acc59188134db969093e02364336990ed7f84a5f2a3860a2d
+EBUILD freecad-0.21.2-r2.ebuild 11625 BLAKE2B f0e254f75cd460b0a7078f5978645e083251006a3a61c875f7c63da8d6d8816d62ef8b4a7897d22dce4d7983fb6d50803b99c8bde8a99f6b51f965b35c799263 SHA512 75d652c686716156b7ec7c499a4b33e9792a8c0805b757f4dd581e303ecc05b350ec48c0875059a8e5f19df8c4fcf1c40121742ce4b6719adc1e95bf4ee0e7b0
+EBUILD freecad-9999.ebuild 11820 BLAKE2B f206280657cbff35f1bb1a5331926e5f181e87c896d6051290b021590880a29b8a6e491a1f86ebed2498d2f534abf7b2fc4ae5d380398f722c56ec86bc18dbd2 SHA512 c4772c534dc4975ee8a82206ee16a9d00959b22f1797c3755f446f44e96e4ffd9a2e3cff09be47ef31ef671a6d0968140f36985701ae97bdb9ae462ddb5cfc48
 MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042
diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index a0b180e9df32..56776f593336 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,7 +67,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[qt5,rendering] )
+	fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
 	gui? (
 		dev-qt/designer:5
 		dev-qt/qtgui:5
diff --git a/media-gfx/freecad/freecad-0.20.2-r2.ebuild b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
index f7c6b0fa93f8..4e0963bd788f 100644
--- a/media-gfx/freecad/freecad-0.20.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[qt5,rendering] )
+	fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
 	gui? (
 		dev-qt/designer:5
 		dev-qt/qtgui:5
diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild b/media-gfx/freecad/freecad-0.20.2.ebuild
index c34c4c9425e3..77d95697d916 100644
--- a/media-gfx/freecad/freecad-0.20.2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -77,7 +77,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk:=[qt5,rendering] )
+	fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
 	$(python_gen_cond_dep '
diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 6f67542fe86c..f92180406ef2 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -73,8 +73,8 @@ RDEPEND="
 		net-misc/curl
 	)
 	fem? (
-		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+		!qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
+		qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] )
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 05acf4426854..804b83dc404f 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -74,8 +74,8 @@ RDEPEND="
 		net-misc/curl
 	)
 	fem? (
-		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+		!qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] )
+		qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] )
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0b4e4a46b8e5..73bf9abd9371 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 33cb56c1a67b..3432c46ec8ea 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -7,7 +7,7 @@ DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f69
 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384
-EBUILD libjxl-0.10.2.ebuild 2758 BLAKE2B 66335ca59cc71eacd27bf5e029b741820cd443966ffbcd94043be5a973f3076e7153b8778416ea4e27544ba2a12e67322bc515e93b2c10ba989259beaf36641b SHA512 bcaab793183d517ace2c6b720b87bfcc950765883994ed3b71582d773b7972785a83628998e0285cfe866000e2c8fa23f4cce2ba3bdee989217f70164c1bb987
+EBUILD libjxl-0.10.2.ebuild 2754 BLAKE2B f55be3fd81d12e6779a85ca54a53c3767ce48d3aee52d8f348a44602cf1b9942f1ef45314f3c9127cedbfd34a7379d7ceaa64014d4e1c9f3349e1d89a76e7b11 SHA512 d4072c37dc1874b47ab6f497481b30dd9c075d13d3fde1da974944b657eb8dda458b4253b9f57161ea0c080443ff04c760f393d4d17e3d5cd501e1854a3c1aa2
 EBUILD libjxl-0.8.2-r1.ebuild 2370 BLAKE2B d5f0f655767280985420ed7e338748ddbc55589003c9427aa086295d12a91c9fb907c982ed88849471a76991879f0352c1fef2b682a1b64a3b03e43e9d93a018 SHA512 97750abe5bde3c0ad3a785f65250930f3312458c0b0b23bf00163c2ffed7cbdb148d43bbd8a768d283380fdf1794eece03a2b1adab97d4d9fb53e31b65dec614
 EBUILD libjxl-0.9.2.ebuild 2815 BLAKE2B def834ea227c984fbd6268dab52f945530c1fe172f631074954075e1d7b270047d2ea980b7dcb6d5b4f4e7a2385a893c16c788b7fd9e579aed3a31d5e6cd4190 SHA512 510301e17eea19786a5a490efe98b706c452a9729172d5713e9f540ad3fc2e82b2fca84f3d2656990470f617438a7491f97c3911b6ebad5221facb32df3d02f7
 EBUILD libjxl-9999.ebuild 2443 BLAKE2B 97af04661d52c6c2a1f4cddde89a90ef8c673efeb18c906bdf32fc66900c7c201a0119bf13a2ce65e663985108e6fc41526bcbbd723a2091cbdc6f512a072edc SHA512 60a0324c66c794e06c51b6a7bfe2095681ab5c1caea6de0c4f2a1de15e9781d608151038337874624b219419d3568fcd1f768a9e11d9d5650935f0a02d3e4223
diff --git a/media-libs/libjxl/libjxl-0.10.2.ebuild b/media-libs/libjxl/libjxl-0.10.2.ebuild
index 67dbdcfaaaf5..93f65488f933 100644
--- a/media-libs/libjxl/libjxl-0.10.2.ebuild
+++ b/media-libs/libjxl/libjxl-0.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 018d49e10675..3bd9a474979e 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index d60af13d3caf..e0824fdf4c6b 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,4 +1,4 @@
-AUX cqrlog-2.5.2-makefile.patch 2147 BLAKE2B 5bdb29c577da7f293d5962f6b7cd469b15ec26d442aae45520b52c146815db477c368a832934cd4b658f6fc46334850c764da1e853bfc38eacd4ed5065a5960d SHA512 a2c564d5ef939c7ad1ad6291cb230221e5fa83b051c951cf61f7d057c59c274648979b3d0cdce825d33ed3b096873f4fd3fe9f2583d13d501630209c6083c43b
+AUX cqrlog-2.5.2-makefile.patch 2443 BLAKE2B d84f8cfbc2a1381f38e945cfddad38d1be63614dd8c05df0584d2773c7d798c99144fe45b356851919e1b41ce08b75b5324f42b69d2fce1b0d3a6a660dafa33c SHA512 18bf96a97766cd05c394eea3182062c766957b3fe40479243ed4fb9c02f7410e1d76dd5bd6bd8c8963e4e420a963bf56b87273a45559614eabc8e55024453c58
 DIST cqrlog-2.5.2.tar.gz 14469864 BLAKE2B 3e978733d79e3563ed815296393a6fa0f681f79e7ee612a01183c25bf5ba431025dbc6a50a128a30f9be79f90a352cead904bfcde9b95669c14ba8c97a3ac1b8 SHA512 5546117f0dcec7529505d6f979be2c9eeebdcf499493971b19d4301296b52a0612d490b6e3f1f4fa759d9f3d2fc0b9b42fbf0e8de862b25ddc75819855dfb407
 EBUILD cqrlog-2.5.2.ebuild 744 BLAKE2B 0a235be9d8620a6f8a734546057f769f35fed9a862411219500b4ca5ce45f8e967aaa3a238565e77bf952d3945a64d0e88e5a6e0b3cfacd6ff5735cba0ed7ed5 SHA512 868571f34c4ef985ac5c9aa5808538fd6d262b4fe7aa9f4a8475acfde36a693ea69665d1c4684b9c3bfa346f1a46b1bb515c6121fea034461a63ea34840ea9c9
 MISC metadata.xml 246 BLAKE2B 2adee89bec0a5c14403bb3c987964c83c2d67671b520d75c829e216b33d2bb67448d4af1a50f98ab96040ff8eb812735972fa0148a51c047b93bb106deb459fa SHA512 6750c978adc7c091932f664a114bc941757560e8c6776c29d66751f00f69243d52a5ee06bb8d687ef6141a2cf8bef6b48ce215e62955fbc4eef60f6974e120d5
diff --git a/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch b/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch
index a580df8bf7c5..fac5fa556cb9 100644
--- a/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch
+++ b/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch
@@ -1,6 +1,8 @@
+diff --git a/Makefile b/Makefile
+index 5e09eeb..e7fbeb3 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -3,12 +3,10 @@
+@@ -3,12 +3,10 @@ ST=strip
  datadir  = $(DESTDIR)/usr/share/cqrlog
  bindir   = $(DESTDIR)/usr/bin
  sharedir = $(DESTDIR)/usr/share
@@ -15,7 +17,7 @@
  
  clean:
  	rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled src/ipc/*.o src/ipc/*.ppu src/cqrlog.or
-@@ -37,7 +35,7 @@
+@@ -37,7 +35,7 @@ install:
  	install -d -v         $(sharedir)/pixmaps/cqrlog
  	install -d -v         $(sharedir)/icons/cqrlog
  	install -d -v         $(sharedir)/applications
@@ -24,7 +26,7 @@
  	install -d -v         $(sharedir)/man/man1
  	install    -v -m 0755 src/cqrlog $(bindir)
  	install    -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
-@@ -60,7 +58,7 @@
+@@ -60,11 +58,11 @@ install:
  #	install    -v -m 0644 images/icon/256x256/*   $(datadir)/images/icon/256x256/
  #	install    -v -m 0644 images/*   $(datadir)/images/
  	install    -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop
@@ -33,7 +35,12 @@
  	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
  	install    -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
  	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html
-@@ -74,9 +72,8 @@
+-	install    -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz
++	install    -v -m 0644 tools/cqrlog.1 $(sharedir)/man/man1/cqrlog.1
+ deb:
+ 	dpkg-buildpackage -rfakeroot -i -I
+ deb_src:
+@@ -74,9 +72,8 @@ debug:
  	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
  
  cqrlog_qt5: src/cqrlog.lpi
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 94013891e859..72e57233717b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0d2e843d0132..bfce6db23973 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -9,8 +9,6 @@ AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e
 AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e
 AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e13356e9c8103b7edb239a55e89975e455eb82efa6c0bf348aa2be6eedb10ae95753d3f104d7646cbe21a7dcc45e1274928e2a SHA512 b1f7449d13961f3e5d073f2f8cc0443f5e050733d76cbd94dc2dd764b7b1438339cc9155765637767f692c6781760a8b3776bbdaf36c57f4af7cbc7ca51d81fd
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
-AUX audacity-3.2.5-gcc13-deux.patch 2531 BLAKE2B 5fbd985902facc87db733c7db3981f67d5232c1a40259eec5831ad7142c065831ec64f5167a587a7a83736225965d2e4159615845c952cb4a6b5f7a46e9218e7 SHA512 45722981858006be507cb2f9212d34626a40554eb75a6397b1073019433ae16689345ce8b4062b18ee61907f5dd9b51e4f250211b16183a0e82ab6ca32f44366
-AUX audacity-3.2.5-gettext-0.22.patch 1193 BLAKE2B 9410d92db9b6a4b06e91cbae5ba25ec5dc16ee3421c511468a55e0038ed2db70c9d195f7eca894503c1bec023e0efc1006ac36eada4f1e87567828f4288b23c9 SHA512 f8a3187343f11875840d605da11a021d7e1f25fa5cb361432863d3933a3880a5e8df63d6feb6706e88bdb5e0f0e4e5c77ec8d21806003abf66166fe8a28e02b2
 AUX audacity-3.3.3-Findlibmad.patch 1758 BLAKE2B c1e0ef6734f925127b0be9abc84fb1b6411d15b8b973683f84f54d9c0e557c7b4dcc786baa9962ff039529f9306144008f1f12b1edb8f519df5a0f0c4d06d9de SHA512 0724cabecd37e2c740227fdc6f0144d97d68bd9846609aea25dfaa41289e8eea790487af320e784e1e6e8c3c2e27689af9643bcc2114c9e5f9d09d679f4ed754
 AUX audacity-3.3.3-fix-includes.patch 1764 BLAKE2B ea7f73f60b8b5ffc42218b65d8148273689d2460b97e4728adf878cb3980762375615cf6b29e205945b69dd36f17b760e949d8805f4bd2d867d0b37133290c6e SHA512 d3dd1c39bfda4146b315f923fb6ecda07ad30d77dae7d930e315a4aae8e2a45de04c217b982aa719d8579c3933bd3843ca42095c1ddc161860a204f8d94dcb12
 AUX audacity-3.3.3-fix-rpaths.patch 3819 BLAKE2B 29079fb4fd63b383546b1f82c08fb98b16eba0588da99b936f7de104bcb826fd6a0dc7f63fd379e44ace9d80ea612d86deda9f68980e3cd5c0874f1925b35b91 SHA512 d05868e7adf91c613534aa965059da5e393582bbaee0b49605c2e270d528dfd8fa882ce356e5fed38752afbbb09539165ea566b13c13df4bc949ed8c5f2617e1
@@ -18,14 +16,14 @@ AUX audacity-3.3.3-gettext-0.22.patch 872 BLAKE2B 5de981a0b86606f688ca9fa8f036d5
 AUX audacity-3.3.3-local-threadpool-libraries.patch 1377 BLAKE2B 6031d9e3f9b4e11a2d16fe96dc261254dbba62dcb461d9c395f9e8d61cb46176680f3eb3f63a0bb5b581bcf35e9c6c7ab954177476c08d0118c0f0d41a34b496 SHA512 1d61c9fbeaae67fff1c02bc84c6791abab5fcdd886c729caf4cd87ecd8d1ede58bd634cebce133d3209212939603aba5a05c5b8cee762a8b2c2bda10a2c11888
 AUX audacity-3.3.3-remove-conan-test-dependency.patch 1140 BLAKE2B 8c74631de260406f47f1d1b5bd869e726ec086eaca143f747f7c0dfd8e0c193c86de44a5ace3e69d85a6dfb7a0ee755ba5defd79bbc114f46974cf6ba7f74f5a SHA512 bfc0b07f03a530486a496447a235384c018dc7a284aa6660e22c6540648be15264e92cb1151f40fe198b46576f0a63b86e6042bb9ccfce32036c596510fbc2c1
 AUX audacity-3.3.3-upstream-fix-rapidjson.patch 2461 BLAKE2B d59077e4729aa5702db6181eb3dac9a9c98f6f64c3b4e61c87c6856c76b8ddb2d9f9036db07efe8263619fa5a9b14fd1ae4be380df34a5483f102b2bde809a18 SHA512 67c6760c472c4161335f9c65129a28495ad9e8605a1f17cd1570037fc4767c9d326221598c93e0e1595bd10d6044a1d7b8dcac9b6c29babecee60a526ef6dd92
+AUX audacity-3.4.2-audiocom-std-string.patch 898 BLAKE2B 697c0ce279a2d0618a7be3dc64d5b54b864516e9ddc1493244d4f555eca270057f0d4e2472ad77c897a810f262a5e8af8c86d738e59063ed5eb5b977406c708d SHA512 438c72c1139180218012c1bdebcb33a5bfd1851beef4ceeb8d60bbc64348f760710b0f64644f9aeed841bd929d3cc07f0dd302567d65fa8d37cdbb48557d56bc
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
+DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3926 BLAKE2B b62459d874285eabace837ac9b2f324574ea1418a6d6396c27de531177c3f9e20511488b7d8fd22e4d8febb75ff3c706eccfd26053ec64e43f82f6906a5bc06b SHA512 0036524556974517dc0ea9427664db5564e8f9312c627a8ddf70850ba457beef51b46666fb3693cbc67b75c3775c86b90a500d7d50a515fafb6536c592d1e49b
-EBUILD audacity-3.2.5-r1.ebuild 7014 BLAKE2B 3d63b714a6bf4e3c3acf81d85eeecc0e9bf4f0ecd3b426502e87532fb32355b0de5274b6a511b6a978724dd4963defc87496db0268c1deddfb4401b64025bf41 SHA512 3338a4437856e1446ed5efe971d2824543b9fa4a96ae8c26c7e5ab7092ace0ce4d2c035a4e56f0e968142c606171b87b93d8e93841431c6b370cd92c7b0cc070
 EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
-EBUILD audacity-9999.ebuild 6918 BLAKE2B a7251b4b663d994c768b13a19534826533b59878601de805cda126f971c4be38ad35c9c3d9b6d388caea40c8f97affaecaa5234e78e12c55727c83c2c6cf763e SHA512 a0d1bf849f5480c27b06a36eb65b7877e33f99e8a84a0683e688ea0aa3a072a10a14b4902768dd2ec9294fcca672d386ab7e32a5660e45d9364809019a1847bd
+EBUILD audacity-3.4.2.ebuild 6631 BLAKE2B 109402f706bf0cf6f6211466809cc6765124add5f4dfdc16b4908fad038ce84a8803df4918f5b660c9149f10c19e8db916043372a62a6b57665916c9f94d4562 SHA512 e63a58b74b9a1d32d86de75180c5262375a46ef1fe514e759f662ef41b4093fb35d02ee68ac2bbe63fede4ca293c6794480d8da96fd585dde43bb13af777d8ff
+EBUILD audacity-9999.ebuild 6866 BLAKE2B 951ac9b256237f8498f37d8e2acd3058885de8a07ce7f8e1e3d11588def2e358b6a0979b5f9b4945657eb881e2971763cfd44020afffd4a645ca6e859af2b1ed SHA512 b1d1a8aae8a442ecb938f6d45b38e956ef51f7a53b54e2ede7dab703b24cf5ac139937bfe186d5a762531a5265a7416cb0789ef41283e4bd1ed466e31894d156
 MISC metadata.xml 1646 BLAKE2B af82a110327cebf9311bec6c360e3765101c09c917925d505ddfbd27f060feb923e621f37e47da27aead1b7951dcc4140e07e54213b6dc3e0abc6178506ce94b SHA512 ebc43bf8a79c77f4b7b999ddf619d99f85a58688ddacdc1a3bfdab431f28f97818effaf6ff1972fe3b81dcd42223e72d02a96ba3b29f2aa7bc6b8ea354265b2d
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild b/media-sound/audacity/audacity-3.4.2.ebuild
index 2eb91ea6190a..27f06abecfde 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -5,10 +5,8 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/"
 
@@ -17,26 +15,30 @@ HOMEPAGE="https://www.audacityteam.org/"
 # cmake-proxies/CMakeLists.txt and search for "ThreadPool".
 MY_THREADPOOL_DATE=20140926
 MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )
-	audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
 
 # GPL-2+, GPL-3 - Audacity itself
 # ZLIB - The ThreadPool single-header library
 # CC-BY-3.0 - Documentation
 LICENSE="GPL-2+
 	GPL-3
-	doc? ( CC-BY-3.0 )
 	audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-	opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -63,6 +65,9 @@ RESTRICT="test"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
+	dev-libs/rapidjson:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -70,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/portsmf:=
 	media-libs/soxr
 	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
 	alsa? ( media-libs/alsa-lib )
 	audiocom? (
-		dev-libs/rapidjson
 		net-misc/curl
 	)
 	ffmpeg? ( media-video/ffmpeg )
@@ -90,7 +95,6 @@ RDEPEND="dev-db/sqlite:3
 		media-libs/sratom
 		media-libs/suil
 	)
-	mad? ( media-libs/libmad )
 	mpg123? ( media-sound/mpg123 )
 	ogg? ( media-libs/libogg )
 	opus? ( media-libs/opus )
@@ -100,80 +104,75 @@ RDEPEND="dev-db/sqlite:3
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	mad? ( !mpg123 )
-"
-
 PATCHES=(
 	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
 	# From Debian
-	"${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
 
 	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
 
 	# For has_networking
-	"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
-	"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
 
-	# GCC 13
-	"${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch"
+	# Allows running tests without conan
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
 
-	# gettext 0.22
-	"${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch"
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	local header_subs="${S}/lib-src/header-substitutes"
-	cat <<-EOF >"${header_subs}/allegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
 	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
 	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
 	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
 }
 
 src_configure() {
 	setup-wxwidgets
 
 	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
 	# * USE_VST was omitted, it appears to no longer have dependencies
 	#   (this is different from VST3)
 	local mycmakeargs=(
 		# Tell the CMake-based build system it's building a release.
 		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
 
-		-Daudacity_conan_enabled=OFF
+		-Daudacity_conan_enabled=off
 
 		-Daudacity_has_networking=$(usex audiocom on off)
 		# Not useful on Gentoo.
 		-Daudacity_has_updates_check=OFF
 		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
-		-Daudacity_has_threadpool=local
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
 
 		# The VST3 SDK is unpackaged, and it appears to be under a breed
 		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
+		-Daudacity_has_vst3=off
+
 		-Daudacity_lib_preference=system
 		-Daudacity_obey_system_dependencies=ON
 		-Daudacity_use_expat=system
@@ -182,27 +181,27 @@ src_configure() {
 		-Daudacity_use_ladspa=$(usex ladspa)
 		-Daudacity_use_lame=system
 		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libmp3lame=system
 		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_libmad=$(usex mad system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
 		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
 		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
 		-Daudacity_use_sbsms=$(usex sbsms system off)
 		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
 		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
 
 		# See the allow-overriding-alsa-jack.patch patch
 		-DPA_HAS_ALSA=$(usex alsa on off)
@@ -214,16 +213,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
+src_test() {
+	virtx cmake_src_test
 }
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index be537c7c96c0..9246a3ee4e7c 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -20,10 +20,10 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
 else
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	MY_P="Audacity-${PV}"
-	S="${WORKDIR}/${PN}-${MY_P}"
-	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
 fi
 
 SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
@@ -39,7 +39,6 @@ SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
 	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( mpg123 )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -66,7 +65,9 @@ REQUIRED_USE="test? ( mpg123 )"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
-	dev-libs/rapidjson
+	dev-libs/rapidjson:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -74,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/portsmf:=
 	media-libs/soxr
 	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
 	alsa? ( media-libs/alsa-lib )
 	audiocom? (
-		dev-libs/rapidjson
 		net-misc/curl
 	)
 	ffmpeg? ( media-video/ffmpeg )
@@ -105,42 +106,44 @@ RDEPEND="dev-db/sqlite:3
 "
 DEPEND="${RDEPEND}
 	test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="app-arch/unzip
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
 PATCHES=(
 	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
 	# From Debian
-	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
 
 	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
 
 	# For has_networking
-	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
 
 	# Allows running tests without conan
-	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	local header_subs="${S}/libraries/lib-note-track"
-	cat <<-EOF >"${header_subs}/WrapAllegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
 	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
 	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
 	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -154,28 +157,29 @@ src_configure() {
 	setup-wxwidgets
 
 	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
 	# * USE_VST was omitted, it appears to no longer have dependencies
 	#   (this is different from VST3)
 	local mycmakeargs=(
 		# Tell the CMake-based build system it's building a release.
 		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
 
-		-Daudacity_conan_enabled=OFF
+		-Daudacity_conan_enabled=off
 
 		-Daudacity_has_networking=$(usex audiocom on off)
 		# Not useful on Gentoo.
 		-Daudacity_has_updates_check=OFF
 		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
 
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
+
 		# The VST3 SDK is unpackaged, and it appears to be under a breed
 		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
+		-Daudacity_has_vst3=off
+
 		-Daudacity_lib_preference=system
 		-Daudacity_obey_system_dependencies=ON
 		-Daudacity_use_expat=system
@@ -184,34 +188,33 @@ src_configure() {
 		-Daudacity_use_ladspa=$(usex ladspa)
 		-Daudacity_use_lame=system
 		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libmp3lame=system
 		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
 		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
 		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
 		-Daudacity_use_sbsms=$(usex sbsms system off)
 		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
 		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
 
 		# See the allow-overriding-alsa-jack.patch patch
 		-DPA_HAS_ALSA=$(usex alsa on off)
 		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
 		## AFAICT it introduces no deps as-is, but that could change.
 		## Similar goes for PA_HAS_JACK.
-
-		-Daudacity_has_tests=$(usex test ON OFF)
 	)
 
 	cmake_src_configure
@@ -220,10 +223,3 @@ src_configure() {
 src_test() {
 	virtx cmake_src_test
 }
-
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-}
diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
deleted file mode 100644
index c9fdad5fbafd..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/audacity/audacity/issues/4489
-https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7
-https://bugs.gentoo.org/899764
-
---- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t;
- */
- #endif
- 
--#include <stddef.h>
-+#include <cstddef>
-+#include <cstdint>
- #include <string>
- #include <iostream>
- #include <sstream>
-@@ -355,10 +356,6 @@
- typedef signed int SINT32;
- typedef float FLOAT32;
- typedef double FLOAT64;
--// added by RBD
--#ifdef __linux__
--#define intptr_t long
--#endif
- 
- // The default sampling rate.
- const StkFloat SRATE = 44100.0;
---- a/src/effects/LoadEffects.cpp
-+++ b/src/effects/LoadEffects.cpp
-@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
-       if (rediscoverAll ||
-          !pm.IsPluginRegistered(path, &pair.second->name.Msgid())
-       ){
--         DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident)
-+         DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
-          {
--            const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
-+            const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
-             if(pair.second->excluded)
-                PluginManager::Get().EnablePlugin(pluginId, false);
-             return pluginId;
---- a/libraries/lib-module-manager/PluginHost.cpp
-+++ b/libraries/lib-module-manager/PluginHost.cpp
-@@ -37,11 +37,11 @@ namespace
-             TranslatableString errorMessage{};
-             auto validator = provider->MakeValidator();
-             auto numPlugins = provider->DiscoverPluginsAtPath(
--               pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident)
-+               pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
-             {
-                //Workaround: use DefaultRegistrationCallback to create all descriptors for us
-                //and then put a copy into result
--               auto id = PluginManager::DefaultRegistrationCallback(provider, ident);
-+               auto& id = PluginManager::DefaultRegistrationCallback(provider, ident);
-                if(const auto ptr = PluginManager::Get().GetPlugin(id))
-                {
-                   auto desc = *ptr;
diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
deleted file mode 100644
index f84508a2c903..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/909201
-upstream fix: https://github.com/audacity/audacity/pull/4866
-
---- a/locale/be.po
-+++ b/locale/be.po
-@@ -3097,7 +3097,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "Памылка (магчыма, файл не запісаны): %hs"
-+msgstr "Памылка (магчыма, файл не запісаны): %s"
- 
- #: src/FileFormats.cpp
- #, fuzzy
---- a/locale/fa.po
-+++ b/locale/fa.po
-@@ -3053,7 +3053,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
-+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
- 
- #: src/FileFormats.cpp
- msgid "&Copy uncompressed files into the project (safer)"
---- a/locale/fr.po
-+++ b/locale/fr.po
-@@ -3142,7 +3142,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs"
-+msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s"
- 
- # trebmuh to check (accélérateur)
- #: src/FileFormats.cpp
diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
new file mode 100644
index 000000000000..f06799030b4b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
@@ -0,0 +1,30 @@
+From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 18 Feb 2024 23:16:28 +0300
+Subject: [PATCH] Fix compilation with audiocom
+
+Fix error `OAuthService.h: error: field mAccessToken has incomplete type
+std::string {aka std::_cxx11::basic_string<char>}`
+
+See: https://bugs.gentoo.org/920363
+
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+---
+ libraries/lib-cloud-audiocom/OAuthService.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h
+index bd01f1656..18761df6d 100644
+--- a/libraries/lib-cloud-audiocom/OAuthService.h
++++ b/libraries/lib-cloud-audiocom/OAuthService.h
+@@ -12,6 +12,7 @@
+ 
+ #include <chrono>
+ #include <functional>
++#include <string>
+ #include <string_view>
+ #include <mutex>
+ 
+-- 
+2.43.0
+
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4ffd2a36920a..f0636014d9e8 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/v4l2loopback/Manifest b/media-video/v4l2loopback/Manifest
index fec6e14fc2af..cbab8d094929 100644
--- a/media-video/v4l2loopback/Manifest
+++ b/media-video/v4l2loopback/Manifest
@@ -1,6 +1,6 @@
-DIST v4l2loopback-0.12.5.tar.gz 51468 BLAKE2B 514f686fc6f87feebedb1b047e764fa03938c265c88db0fedfb6aba3544f5b8b495631fc0bcdf4b88c1c4d522f6b4d7546b4d0d10381f6be2efc7f405511033a SHA512 5fd2affbb4a7f38bb78f996179de6570b2bd69cfed2a79c4505e7ea2cdf5b65c0a6807f1f4e03f320b667f5cbe62f26fadd412bc0fec5944e4e394635bf5fb3d
 DIST v4l2loopback-0.12.7.tar.gz 52145 BLAKE2B 08b0dd6dfd065f8bc450aad8d711d1723fe65bbee6be4624038f34e8ad8bc2ed6e544fc5771fb42b0e8c92213c2db71aff5857c0b1fd6343c6900bf27df618d7 SHA512 fcfe55396e9ddad56e592ffccd955c8ceff49c11cfbc5af382123ee0c15b41729b78cb763acbb17d288c48498f2183a4b24f146758ae67e1982b7ab2b07ff973
-EBUILD v4l2loopback-0.12.5-r1.ebuild 1111 BLAKE2B 31929aa7ccf2fc89409ee34e02d365f3937a624ee4de351ebe64677b9dba4a8218c5e97b85357cecdea5a4a9062537cd12b6262ecbd77eb42dfa76242b3addce SHA512 51e911a9ebd032b97a5d19ad4c781b808c66a61f23ce6ccd73bca73d4595b0ac36b0447d84afb27e424281f600724f4140b04691fe6d8a6af7696cb623b27729
+DIST v4l2loopback-0.13.1.tar.gz 84323 BLAKE2B ad84826791763107c29ecc79435eb5e6d5bd1c18a18cfeabebaffd2c6f00a17564e8cb2773c35aba40cc181d06a21b2aafc86910b1d160adee98c015497cda7f SHA512 28b8c90f1e5fe48d19f41dbc188bf383ce8a6db33707ef161b55cae3217704a7e45e91a782bc3bf08db338f8ba0f045afd52899026be7e2e9bfeb6799a876628
 EBUILD v4l2loopback-0.12.7.ebuild 1110 BLAKE2B 7862b24e98ba06af078b331025d269ba2fed15b537c514cc6a9e80c42b0d3bab6a8c28a20c952a6959c5888d5f53d4bf701be7fcc56f412ea934c6bfa28286a9 SHA512 63dacd6350c4398b2294f497c5ebf63371edbb4153baa1f4cd713bdae1eca880baab672e612c7d11eaad626c60e121eab2e8ef958d7c82effa1280fe49a0b19f
-EBUILD v4l2loopback-9999.ebuild 1110 BLAKE2B 7862b24e98ba06af078b331025d269ba2fed15b537c514cc6a9e80c42b0d3bab6a8c28a20c952a6959c5888d5f53d4bf701be7fcc56f412ea934c6bfa28286a9 SHA512 63dacd6350c4398b2294f497c5ebf63371edbb4153baa1f4cd713bdae1eca880baab672e612c7d11eaad626c60e121eab2e8ef958d7c82effa1280fe49a0b19f
+EBUILD v4l2loopback-0.13.1.ebuild 1115 BLAKE2B fd19fb36e230a4b8e9da62b860be67cdd752e72503feb3cda789c74c996826fde9d65c22d5ff4e7f9a00183f2ec1e2f776a5e5bb2169efc79b1620c20ffbcfc5 SHA512 bde64090cff217b095c1bde8ae30d27821671a2f232a90003db857c857d837333bf0b19e8e0105f14f0af291c2cd01f98f7b80b1e444eb248296adf4f846f810
+EBUILD v4l2loopback-9999.ebuild 1115 BLAKE2B fd19fb36e230a4b8e9da62b860be67cdd752e72503feb3cda789c74c996826fde9d65c22d5ff4e7f9a00183f2ec1e2f776a5e5bb2169efc79b1620c20ffbcfc5 SHA512 bde64090cff217b095c1bde8ae30d27821671a2f232a90003db857c857d837333bf0b19e8e0105f14f0af291c2cd01f98f7b80b1e444eb248296adf4f846f810
 MISC metadata.xml 350 BLAKE2B d9a59e7368e495faf38e1663514d9ab1b0b152b0154f3b513ccc08770f4ca3dcc3236010431101e8bd279594c60fe5afa26a1be886d5eb5ecfc54b3a5fc27ffa SHA512 0a86fe8cb27cd34495a9e9baab914faf53ea652befce624d8494864cd86276c6b648f09b9f75a191e3f4b1f7a3d84622db5eacd628ccbe689b9e516b12a48c88
diff --git a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild b/media-video/v4l2loopback/v4l2loopback-0.13.1.ebuild
index 6c4fb6dc4f4b..545a948b1fb4 100644
--- a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-0.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-mod toolchain-funcs
+inherit linux-mod-r1 toolchain-funcs
 
 case ${PV} in
 9999)
@@ -24,11 +24,9 @@ SLOT="0"
 IUSE="examples"
 
 CONFIG_CHECK="VIDEO_DEV"
-MODULE_NAMES="v4l2loopback(video:)"
-BUILD_TARGETS="all"
 
 pkg_setup() {
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 	export KERNELRELEASE=${KV_FULL}
 }
 
@@ -38,14 +36,18 @@ src_prepare() {
 }
 
 src_compile() {
-	linux-mod_src_compile
+	local modlist=(
+		v4l2loopback=video:::all
+	)
+
+	linux-mod-r1_src_compile
 	if use examples; then
 		emake CC="$(tc-getCC)" -C examples
 	fi
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 	dosbin utils/v4l2loopback-ctl
 	dodoc doc/kernel_debugging.txt
 	dodoc doc/docs.txt
diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
index 20dda14f748d..545a948b1fb4 100644
--- a/media-video/v4l2loopback/v4l2loopback-9999.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ src_prepare() {
 
 src_compile() {
 	local modlist=(
-		v4l2loopback=video:
+		v4l2loopback=video:::all
 	)
 
 	linux-mod-r1_src_compile
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ec3d2cb5f1ed..7760bde6928f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cd3d1d77cbd0..a5d2dfe27b95 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Mar 2024 06:10:06 +0000
+Sat, 23 Mar 2024 12:10:10 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 03913ba28341..4c8db87a530b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569335 BLAKE2B 07f6153cc527f8ef0be40a2cc21b4fbdd6901249b5c3c569cd1c78321017cd55d98800cf292cc33ffbd6842d685a59c8343e534c4ede0d598730df983a8c33f4 SHA512 5d341348a510bcd14cd0388e2d6bdaccf622bfa08eed783dcee916769bbf2f8d31fa0fb57d0f3bfcce315df08c0e1c93572bfdc703a005d69ab200628e23c99b
-TIMESTAMP 2024-03-23T06:10:10Z
+TIMESTAMP 2024-03-23T12:10:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+ckJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+xqVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBbsw/+IFDDKE5nk5N/dE/7XrDe8t9Lb+rRmrbflppTtgYtJBCKePWuJ1ORCVMu
-B7Hz5cNK2hKbPQosz6TiZ1ArPCEWkZ7evn8gJcEoILXoEBPxxhttA5o9Reo+HRdW
-va4HXpDangJIj7tv8aL1j9ie11eayKmMLTERG3kAWmAVq0qQ0Hjo75PFZEBiiCiD
-wLx+a8akvXirapWzkEopvyN3l0+BjY1kr0Itjto70pl/SSw2jxlUHKOQkC28VNAB
-l5FqU3cgiTCN1oOOE1V4ty3svuHSw/I/gzUjV3bCqWGHCTVO9+ZFY1cVXGEQ1ii0
-4XD2+g4OZnd8BGQhcHxVwVUy4yb0h6FdkMAC2ORMDNHOfNygW0/Xj5VruEwfAO1B
-1r4HWld39ewdrCv29HCqfkd2NmMZhKlzvY6dU9+g8pkSw06dO0683xZ6YoDtwkAX
-hMnVn8sJFOgCgJK6F7xb9MVtFHjH6aT84wOVGl1NOxjRpgC6iIv3dsBXYCpij1rs
-oD+upm9epXuZIsNl2EANUERGCgeSsz/JPZsjjXyMaL4Role66SiKL8Ed41bZF3GI
-N0KwtSBK1bFCPwRVDEF/K1CcddCyalUGEGyavF7k6scGxi5rJx37KdnWxqSNVq85
-Ha0DPdUNp9v3g/sSXbaY/pCBt4uoMy6k2IShmwVwHeb3PgVog8g=
-=mjti
+klA46hAAtKVTlepn3/oCEtZiQ3irZcq8ovQivlluCrjvnDCfAe4g2uxVzvrXCt/u
+BfqLeiXUt2DN3wv414OHP0m1N40s7Ybr/oNtK1ZyMUjZKUw6zWJSr25zleM1Q2QJ
+1Qj1napr2raJMZSb0+yhTL60csnOjQtj2sxp8Vb3fTY+JUHKbbmOzC2LPvMV5jfh
+WSVwaeTPAMi0SUDinYiOP//nf3N/fQLQZ8aptTAda1aZjgIrLG63bdowV4Le7Riz
+3sFp5mkUwF2p4uMMzX7lmO9ZvcNd775cC/vhDWTbCPTOiQb3W8IlIqqGN2qxCXvX
+qVyBEgYVyuuXreu6GvrevrQVNd5jf5pzAf1AzMmOIxPlS3kV/+Qn54duf6BFysaJ
+OHr78fQrJPXn57I8jTy5O84jmk4weK1b3kbuM95NmQIImwy7V47ISjaqkMsp3juH
+yyqa2esj078f8sEpbGpwk1sCanwOfxgc8CgQLRC9SYKrcLHRY20PmgsXaJHdg9xc
+vveBOv9VOHbYEDUZMReJMcodEtR7gBWJO9/vTtcng1uxOYT4D06l0eLGz4t6Vyjl
+eAjyIMFP+fD3H7njfQHmiO48aWUEHkkz67DpR7TF8h/BfkWJr+yjZwnOT/FAPuVu
+zJamKwL+S+2+yhg1mUu/HzwhMSGN4JPMRMkqYw24LJtimHxFSCY=
+=UkAO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1cef230a942b..a5d2dfe27b95 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Mar 2024 06:10:07 +0000
+Sat, 23 Mar 2024 12:10:10 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5aea8774b9c8..f34628c02ece 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 232637cf86ee..2e26e9e7f950 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.32.54 b/metadata/md5-cache/app-admin/awscli-1.32.54
deleted file mode 100644
index 85d47d474674..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.32.54
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.32.54.tar.gz -> aws-cli-1.32.54.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f8e728f1052de3bb635a1292740d7bb5
diff --git a/metadata/md5-cache/app-admin/awscli-1.32.59 b/metadata/md5-cache/app-admin/awscli-1.32.59
index 304398b317db..01de49f42316 100644
--- a/metadata/md5-cache/app-admin/awscli-1.32.59
+++ b/metadata/md5-cache/app-admin/awscli-1.32.59
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-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.34.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.32.59.tar.gz -> aws-cli-1.32.59.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=26d79af710d57f697ff897857cc16d28
+_md5_=f8e728f1052de3bb635a1292740d7bb5
diff --git a/metadata/md5-cache/app-admin/awscli-1.32.65 b/metadata/md5-cache/app-admin/awscli-1.32.65
deleted file mode 100644
index 289249c7c538..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.32.65
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.65[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.65[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.32.65.tar.gz -> aws-cli-1.32.65.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=26d79af710d57f697ff897857cc16d28
diff --git a/metadata/md5-cache/app-admin/awscli-1.32.66 b/metadata/md5-cache/app-admin/awscli-1.32.66
deleted file mode 100644
index 06c9e72d84d9..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.32.66
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.66[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.66[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.32.66.tar.gz -> aws-cli-1.32.66.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=26d79af710d57f697ff897857cc16d28
diff --git a/metadata/md5-cache/app-admin/awscli-1.32.67 b/metadata/md5-cache/app-admin/awscli-1.32.67
deleted file mode 100644
index fa18d3095e52..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.32.67
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.67[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.67[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.32.67.tar.gz -> aws-cli-1.32.67.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=26d79af710d57f697ff897857cc16d28
diff --git a/metadata/md5-cache/app-admin/awscli-1.32.68 b/metadata/md5-cache/app-admin/awscli-1.32.69
index 5b97cb0a45d7..bb2267677d31 100644
--- a/metadata/md5-cache/app-admin/awscli-1.32.68
+++ b/metadata/md5-cache/app-admin/awscli-1.32.69
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.68[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.69[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.68[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=>=dev-python/botocore-1.34.69[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.32.68.tar.gz -> aws-cli-1.32.68.gh.tar.gz
+SRC_URI=https://github.com/aws/aws-cli/archive/1.32.69.tar.gz -> aws-cli-1.32.69.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=26d79af710d57f697ff897857cc16d28
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index cf5be2704814..dc45d0be43bf 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/lzip-1.24.1 b/metadata/md5-cache/app-arch/lzip-1.24.1
index b1dad3bce640..0fc26ab00cef 100644
--- a/metadata/md5-cache/app-arch/lzip-1.24.1
+++ b/metadata/md5-cache/app-arch/lzip-1.24.1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
 INHERIT=toolchain-funcs verify-sig
 IUSE=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 ~x64-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 ~x64-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzip-1.24.1.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzip-1.24.1.tar.gz.sig )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=5190440498c659ed5310eaa82035f3d0
+_md5_=9012b168141000b779a269cc7ee4786c
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 8feeab7f2e61..d7d3d3677c64 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/buildah-1.35.0 b/metadata/md5-cache/app-containers/buildah-1.33.7
index 4b29a94d9e42..8e7d0639bfb1 100644
--- a/metadata/md5-cache/app-containers/buildah-1.35.0
+++ b/metadata/md5-cache/app-containers/buildah-1.33.7
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.35.0.tar.gz -> buildah-1.35.0.tar.gz
+SRC_URI=https://github.com/containers/buildah/archive/v1.33.7.tar.gz -> buildah-1.33.7.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=59fb2b4adf58b38a87bde3f8afceb727
diff --git a/metadata/md5-cache/app-containers/buildah-1.34.1 b/metadata/md5-cache/app-containers/buildah-1.34.3
index 8164c8b942cb..b5a59d35aa03 100644
--- a/metadata/md5-cache/app-containers/buildah-1.34.1
+++ b/metadata/md5-cache/app-containers/buildah-1.34.3
@@ -5,12 +5,12 @@ DESCRIPTION=A tool that facilitates building OCI images
 EAPI=8
 HOMEPAGE=https://github.com/containers/buildah
 INHERIT=go-module linux-info
-IUSE=apparmor btrfs +seccomp systemd doc test
+IUSE=apparmor btrfs +seccomp systemd test
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.34.1.tar.gz -> buildah-1.34.1.tar.gz
+SRC_URI=https://github.com/containers/buildah/archive/v1.34.3.tar.gz -> buildah-1.34.3.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a9a182c7a0ab98f9b6bde75691467108
+_md5_=59fb2b4adf58b38a87bde3f8afceb727
diff --git a/metadata/md5-cache/app-containers/buildah-1.35.1 b/metadata/md5-cache/app-containers/buildah-1.35.1
new file mode 100644
index 000000000000..94f2bbf91f4d
--- /dev/null
+++ b/metadata/md5-cache/app-containers/buildah-1.35.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install prepare pretend setup test unpack
+DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=8
+HOMEPAGE=https://github.com/containers/buildah
+INHERIT=go-module linux-info
+IUSE=apparmor btrfs +seccomp systemd test
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.35.1.tar.gz -> buildah-1.35.1.tar.gz
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=59fb2b4adf58b38a87bde3f8afceb727
diff --git a/metadata/md5-cache/app-containers/buildah-9999 b/metadata/md5-cache/app-containers/buildah-9999
index 763a6c623771..56bf32e410c1 100644
--- a/metadata/md5-cache/app-containers/buildah-9999
+++ b/metadata/md5-cache/app-containers/buildah-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
+DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
 DESCRIPTION=A tool that facilitates building OCI images
 EAPI=8
 HOMEPAGE=https://github.com/containers/buildah
@@ -8,8 +8,8 @@ INHERIT=go-module linux-info git-r3
 IUSE=apparmor btrfs +seccomp systemd test
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 PROPERTIES=live
-RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
+RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
 RESTRICT=test strip
 SLOT=0
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=59fb2b4adf58b38a87bde3f8afceb727
+_md5_=733801fcd1d7f7fcc8860e2b6132e6d9
diff --git a/metadata/md5-cache/app-containers/containers-common-0.58.0-r1 b/metadata/md5-cache/app-containers/containers-common-0.58.0-r1
new file mode 100644
index 000000000000..e9a6bc965f7e
--- /dev/null
+++ b/metadata/md5-cache/app-containers/containers-common-0.58.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-go/go-md2man-2.0.3
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Common config files and docs for Containers stack
+EAPI=8
+HOMEPAGE=https://github.com/containers/common
+INHERIT=readme.gentoo-r1
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=>=app-containers/aardvark-dns-1.10.0 >=app-containers/crun-1.14.3 >=app-containers/containers-image-5.30.0 >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] >=net-misc/passt-2024.03.20 >=sys-fs/fuse-overlayfs-1.13
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/common/archive/v0.58.0.tar.gz -> containers-common-0.58.0.tar.gz
+_eclasses_=readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=3a9ac430e8e799082697839c27998271
diff --git a/metadata/md5-cache/app-containers/containers-common-9999 b/metadata/md5-cache/app-containers/containers-common-9999
index 092445573112..8871ef09cd7e 100644
--- a/metadata/md5-cache/app-containers/containers-common-9999
+++ b/metadata/md5-cache/app-containers/containers-common-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-go/go-md2man-2.0.3 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Common config files and docs for Containers stack
 EAPI=8
 HOMEPAGE=https://github.com/containers/common
-INHERIT=git-r3
+INHERIT=readme.gentoo-r1 git-r3
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=app-containers/containers-image app-containers/containers-storage app-containers/containers-shortnames net-firewall/nftables net-firewall/iptables[nftables] || ( app-containers/crun app-containers/runc ) || ( ( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 ) >=app-containers/cni-plugins-0.9.1 )
+RDEPEND=>=app-containers/aardvark-dns-1.10.0 >=app-containers/crun-1.14.3 >=app-containers/containers-image-5.30.0 >=app-containers/containers-storage-1.53.0 app-containers/containers-shortnames >=app-containers/netavark-1.10.3 net-firewall/nftables net-firewall/iptables[nftables] >=net-misc/passt-2024.03.20 >=sys-fs/fuse-overlayfs-1.13
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
-_md5_=c0c5897e9b4dc2f470c54a7e827eaffb
+_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=3a9ac430e8e799082697839c27998271
diff --git a/metadata/md5-cache/app-containers/podman-4.8.3 b/metadata/md5-cache/app-containers/podman-4.8.3
deleted file mode 100644
index 1b0bb1c9c4ed..000000000000
--- a/metadata/md5-cache/app-containers/podman-4.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
-EAPI=8
-HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
-INHERIT=go-module tmpfiles linux-info
-IUSE=apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd
-KEYWORDS=amd64 arm64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v4.8.3.tar.gz -> podman-4.8.3.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=70b5812522028b68c435a4b331e96af1
diff --git a/metadata/md5-cache/app-containers/podman-5.0.0 b/metadata/md5-cache/app-containers/podman-5.0.0
new file mode 100644
index 000000000000..3a7d9eec1d33
--- /dev/null
+++ b/metadata/md5-cache/app-containers/podman-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 ) dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=app-containers/catatonit >=app-containers/conmon-2.1.10 >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) wrapper? ( !app-containers/docker-cli ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
+INHERIT=go-module python-any-r1 tmpfiles linux-info
+IUSE=apparmor btrfs +seccomp selinux systemd wrapper
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-containers/catatonit >=app-containers/conmon-2.1.10 >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) wrapper? ( !app-containers/docker-cli ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/podman/archive/v5.0.0.tar.gz -> podman-5.0.0.tar.gz
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=618f4d7f64cb156cd1e2c99d4ba560f2
diff --git a/metadata/md5-cache/app-containers/podman-5.0.0_rc5 b/metadata/md5-cache/app-containers/podman-5.0.0_rc5
deleted file mode 100644
index 7b857da16b43..000000000000
--- a/metadata/md5-cache/app-containers/podman-5.0.0_rc5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
-EAPI=8
-HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
-INHERIT=go-module tmpfiles linux-info
-IUSE=apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v5.0.0-rc5.tar.gz -> podman-5.0.0_rc5.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=421c6bb1047a17222c6945573d587bd4
diff --git a/metadata/md5-cache/app-containers/podman-5.0.0_rc7 b/metadata/md5-cache/app-containers/podman-5.0.0_rc7
deleted file mode 100644
index 208ae307f235..000000000000
--- a/metadata/md5-cache/app-containers/podman-5.0.0_rc7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
-EAPI=8
-HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
-INHERIT=go-module tmpfiles linux-info
-IUSE=apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/podman/archive/v5.0.0-rc7.tar.gz -> podman-5.0.0_rc7.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=384f6b9f8dc12be991bf9bcac47a4064
diff --git a/metadata/md5-cache/app-containers/podman-9999 b/metadata/md5-cache/app-containers/podman-9999
index 032796d46e00..6479251b6ea8 100644
--- a/metadata/md5-cache/app-containers/podman-9999
+++ b/metadata/md5-cache/app-containers/podman-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 ) dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=app-containers/catatonit >=app-containers/conmon-2.1.10 >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) wrapper? ( !app-containers/docker-cli ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
 EAPI=8
 HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
-INHERIT=go-module tmpfiles linux-info git-r3
-IUSE=apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd
+INHERIT=go-module python-any-r1 tmpfiles linux-info git-r3
+IUSE=apparmor btrfs +seccomp selinux systemd wrapper
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 PROPERTIES=live
-RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) cron? ( virtual/cron ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
+RDEPEND=app-containers/catatonit >=app-containers/conmon-2.1.10 >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) wrapper? ( !app-containers/docker-cli ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
 RESTRICT=test strip
 SLOT=0
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=384f6b9f8dc12be991bf9bcac47a4064
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=618f4d7f64cb156cd1e2c99d4ba560f2
diff --git a/metadata/md5-cache/app-containers/podman-tui-1.0.0 b/metadata/md5-cache/app-containers/podman-tui-1.0.0
new file mode 100644
index 000000000000..79be15474f6e
--- /dev/null
+++ b/metadata/md5-cache/app-containers/podman-tui-1.0.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Terminal UI frontend for Podman
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman-tui
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD MIT MPL-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/podman-tui/archive/v1.0.0.tar.gz -> podman-tui-1.0.0.tar.gz
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=fa56bc6d8cf4dd31d746b1338339cb66
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 32f3ffacd0c5..b75db89034fe 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.22-r2 b/metadata/md5-cache/app-crypt/libscrypt-1.22-r2
index cf4d8687a4bd..4732284d88c6 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.22-r2
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.22-r2
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/technion/libscrypt/archive/v1.22.tar.gz -> libscrypt-1.22.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=09796c38ce31fa7d3e2acec769ef91ff
+_md5_=62847db36962e79d9396ebb7fd260af4
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index c1f7a8748521..22b9a6d9da50 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/audacity-3.3.3 b/metadata/md5-cache/app-doc/audacity-3.3.3
new file mode 100644
index 000000000000..92cc4534944f
--- /dev/null
+++ b/metadata/md5-cache/app-doc/audacity-3.3.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML reference manual for Audacity
+EAPI=8
+HOMEPAGE=https://www.audacityteam.org/
+KEYWORDS=~amd64
+LICENSE=CC-BY-3.0
+SLOT=0
+SRC_URI=amd64? ( https://github.com/audacity/audacity-manual/releases/download/v3.3.3/audacity-manual-3.3.3.tar.gz )
+_md5_=3b5c11a3242dad556168679af0166045
diff --git a/metadata/md5-cache/app-doc/audacity-3.4.2 b/metadata/md5-cache/app-doc/audacity-3.4.2
new file mode 100644
index 000000000000..f44cdaf453e6
--- /dev/null
+++ b/metadata/md5-cache/app-doc/audacity-3.4.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML reference manual for Audacity
+EAPI=8
+HOMEPAGE=https://www.audacityteam.org/
+KEYWORDS=~amd64
+LICENSE=CC-BY-3.0
+SLOT=0
+SRC_URI=amd64? ( https://github.com/audacity/audacity-manual/releases/download/v3.4.2/audacity-manual-3.4.2.tar.gz )
+_md5_=3b5c11a3242dad556168679af0166045
diff --git a/metadata/md5-cache/app-doc/audacity-9999 b/metadata/md5-cache/app-doc/audacity-9999
new file mode 100644
index 000000000000..7064269e7d53
--- /dev/null
+++ b/metadata/md5-cache/app-doc/audacity-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install unpack
+DESCRIPTION=HTML reference manual for Audacity
+EAPI=8
+HOMEPAGE=https://www.audacityteam.org/
+INHERIT=git-r3
+LICENSE=CC-BY-3.0
+PROPERTIES=live
+SLOT=0
+_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_md5_=3b5c11a3242dad556168679af0166045
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index fc46bf0e6f5c..8f54920379dd 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-8.1.5 b/metadata/md5-cache/app-emulation/qemu-8.1.5
index cd515a44c8da..391e4c3df480 100644
--- a/metadata/md5-cache/app-emulation/qemu-8.1.5
+++ b/metadata/md5-cache/app-emulation/qemu-8.1.5
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
 DEPEND=dev-libs/glib:2 sys-libs/zlib python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( >=net-libs/gnutls-3.0:= dev-libs/nettle:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( sys-libs/libcap-ng ) keyutils? ( sys-apps/keyutils ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) pipewire? ( >=media-video/pipewire-0.3.60 ) png? ( >=media-libs/libpng-1.6.34:= ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.14.0 >=app-emulation/spice-0.14.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2:1 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-user? ( dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-8.1.5.tar.xz !doc? ( https://dev.gentoo.org/~sam/distfiles/app-emulation/qemu/qemu-8.1.0-docs.tar.xz )
 _eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6f4bd4b48a89f6bc7a029a4ac9454cc8
+_md5_=e6ddb294cc5036847ea3cb9afeebf8b4
diff --git a/metadata/md5-cache/app-emulation/qemu-8.2.2 b/metadata/md5-cache/app-emulation/qemu-8.2.2
index 6324fbde1809..0ed7c47db6e7 100644
--- a/metadata/md5-cache/app-emulation/qemu-8.2.2
+++ b/metadata/md5-cache/app-emulation/qemu-8.2.2
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-libs/glib:2 sys-libs/zlib python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( >=net-libs/gnutls-3.0:= dev-libs/nettle:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( sys-libs/libcap-ng ) keyutils? ( sys-apps/keyutils ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) pipewire? ( >=media-video/pipewire-0.3.60 ) png? ( >=media-libs/libpng-1.6.34:= ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.14.0 >=app-emulation/spice-0.14.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2:1 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-user? ( dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-8.2.2.tar.xz !doc? ( https://dev.gentoo.org/~sam/distfiles/app-emulation/qemu/qemu-8.2.0-docs.tar.xz )
 _eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0d5924c20f948de59aaeae233bcd587b
+_md5_=06b78188037624f08889ad443e3fd83f
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index b7549f457908..fff198d71d88 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] app-alternatives/bc ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-libs/glib:2 sys-libs/zlib python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( >=net-libs/gnutls-3.0:= dev-libs/nettle:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( sys-libs/libcap-ng ) keyutils? ( sys-apps/keyutils ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) pipewire? ( >=media-video/pipewire-0.3.60 ) png? ( >=media-libs/libpng-1.6.34:= ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.14.0 >=app-emulation/spice-0.14.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2:1 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-user? ( dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses,readline] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses,readline] ) ) systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/qemu-project/berkeley-softfloat-3/-/archive/b64af41c3276f97f0e181920400ee056b9c88037/berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 https://gitlab.com/qemu-project/berkeley-testfloat-3/-/archive/40619cbb3bf32872df8c53cc457039229428a263/berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 https://gitlab.com/qemu-project/keycodemapdb/-/archive/f5772a62ec52591ff6870b7e8ef32482371f22c6/keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2
 _eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	linux-info	7ca3057b277f1e5978947b4cc289ce62	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7b2ae3790064ac7c803986f6423473eb
+_md5_=6404080a85bad2af75067279f6d22fee
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 9229079fa7cb..b5cb2bb02d7b 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/prometheus-podman-exporter-1.11.0 b/metadata/md5-cache/app-metrics/prometheus-podman-exporter-1.11.0
new file mode 100644
index 000000000000..9f7b85455cf2
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-podman-exporter-1.11.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Exporter for podman giving containers, pods, images, volumes & networks metrics
+EAPI=8
+HOMEPAGE=https://github.com/containers/prometheus-podman-exporter
+INHERIT=go-module systemd
+IUSE=btrfs systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v1.11.0.tar.gz -> prometheus-podman-exporter-1.11.0.tar.gz
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=92b15bc5fd1f30db5cf57292d7bddf6d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index a98e4d50edb6..fc7e859e67ab 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/nattka-0.4.1-r1 b/metadata/md5-cache/app-portage/nattka-0.4.1-r1
deleted file mode 100644
index 0b0072d93162..000000000000
--- a/metadata/md5-cache/app-portage/nattka-0.4.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit-core-3.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/vcrpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-util/pkgcheck[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
-EAPI=8
-HOMEPAGE=https://github.com/projg2/nattka/ https://pypi.org/project/nattka/
-INHERIT=distutils-r1
-IUSE=depgraph-order doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-util/pkgcheck[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/nattka/archive/v0.4.1.tar.gz -> nattka-0.4.1.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cf14909102f518ffe5e5aae9ade0dedb
diff --git a/metadata/md5-cache/app-portage/nattka-0.4.2 b/metadata/md5-cache/app-portage/nattka-0.4.2
index ade5f30eb617..190fe7fbe3e0 100644
--- a/metadata/md5-cache/app-portage/nattka-0.4.2
+++ b/metadata/md5-cache/app-portage/nattka-0.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/nattka/ https://pypi.org/project/nattka/
 INHERIT=distutils-r1
 IUSE=depgraph-order doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-util/pkgcheck[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/nattka/archive/v0.4.2.tar.gz -> nattka-0.4.2.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=46e40f694348b459fa38fe284222ce8f
+_md5_=167a979e6d2554819714d13b84582829
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index e64541c93237..88f6e5ae5e4f 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r6 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r6
index 820d4e045933..0f66a56a353a 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r6
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/docbook-tools/
 INHERIT=autotools prefix
 IUSE=jadetex
-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=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e1a93b2357f45a53eae78397249e4809
+_md5_=9db4762285ed3bfe846332db71812907
diff --git a/metadata/md5-cache/dev-build/Manifest.gz b/metadata/md5-cache/dev-build/Manifest.gz
index e93e04bd4ed7..29a0ecb4ba31 100644
--- a/metadata/md5-cache/dev-build/Manifest.gz
+++ b/metadata/md5-cache/dev-build/Manifest.gz
diff --git a/metadata/md5-cache/dev-build/make-4.4.1-r1 b/metadata/md5-cache/dev-build/make-4.4.1-r1
index 690bb949b083..257212901b95 100644
--- a/metadata/md5-cache/dev-build/make-4.4.1-r1
+++ b/metadata/md5-cache/dev-build/make-4.4.1-r1
@@ -1,11 +1,11 @@
-BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
 DESCRIPTION=Standard tool to compile source trees
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 INHERIT=flag-o-matic verify-sig
-IUSE=guile nls static test verify-sig
+IUSE=doc guile nls static test verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/make/make-4.4.1.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.1.tar.gz.sig )
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=147d48676f19cc9716882a603a1ebc80
+_md5_=62abd9e003be8fde7b56f58cf4574125
diff --git a/metadata/md5-cache/dev-build/make-9999 b/metadata/md5-cache/dev-build/make-9999
index 58d8d7ea14ac..cb049d8aa5bf 100644
--- a/metadata/md5-cache/dev-build/make-9999
+++ b/metadata/md5-cache/dev-build/make-9999
@@ -1,15 +1,15 @@
-BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
 DESCRIPTION=Standard tool to compile source trees
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 INHERIT=flag-o-matic verify-sig autotools git-r3
-IUSE=guile nls static test verify-sig
+IUSE=doc guile nls static test verify-sig
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=ca4be98309d01e31ddf502001d00265b
+_md5_=a3d6d6101790cd310df86d8b7bdb08e9
diff --git a/metadata/md5-cache/dev-debug/Manifest.gz b/metadata/md5-cache/dev-debug/Manifest.gz
index 3d44517cff9d..721805608fc3 100644
--- a/metadata/md5-cache/dev-debug/Manifest.gz
+++ b/metadata/md5-cache/dev-debug/Manifest.gz
diff --git a/metadata/md5-cache/dev-debug/lldb-15.0.7 b/metadata/md5-cache/dev-debug/lldb-15.0.7
index 0a62f8352b70..82592d68ded5 100644
--- a/metadata/md5-cache/dev-debug/lldb-15.0.7
+++ b/metadata/md5-cache/dev-debug/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 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	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4ab3059e9dd3596d194750f5f9cd59e8
diff --git a/metadata/md5-cache/dev-debug/lldb-16.0.6 b/metadata/md5-cache/dev-debug/lldb-16.0.6
index 21b1fe852e5b..9a99fae82bd5 100644
--- a/metadata/md5-cache/dev-debug/lldb-16.0.6
+++ b/metadata/md5-cache/dev-debug/lldb-16.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8b139e791c89a2eddeb8b47bdeedc307
diff --git a/metadata/md5-cache/dev-debug/lldb-16.0.6-r1 b/metadata/md5-cache/dev-debug/lldb-16.0.6-r1
index ca1901addf14..c16289d39335 100644
--- a/metadata/md5-cache/dev-debug/lldb-16.0.6-r1
+++ b/metadata/md5-cache/dev-debug/lldb-16.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f79f13c0263ffa1db8b3fd868692b3a3
diff --git a/metadata/md5-cache/dev-debug/lldb-17.0.6 b/metadata/md5-cache/dev-debug/lldb-17.0.6
index 9af6b8e86e90..538a30dcda87 100644
--- a/metadata/md5-cache/dev-debug/lldb-17.0.6
+++ b/metadata/md5-cache/dev-debug/lldb-17.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e267b1544d62166a7961f5d2856db101
diff --git a/metadata/md5-cache/dev-debug/lldb-18.1.0 b/metadata/md5-cache/dev-debug/lldb-18.1.0
deleted file mode 100644
index 70d66b712d94..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-18.1.0[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.1.0[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.1.0[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-18.1.0 ~sys-devel/llvm-18.1.0[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=debug debuginfod +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-18.1.0 ~sys-devel/llvm-18.1.0[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c0200bacc0930c9bdb341de8abba7d6
diff --git a/metadata/md5-cache/dev-debug/lldb-18.1.2 b/metadata/md5-cache/dev-debug/lldb-18.1.2
index e7754db9073a..f999581b710a 100644
--- a/metadata/md5-cache/dev-debug/lldb-18.1.2
+++ b/metadata/md5-cache/dev-debug/lldb-18.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/18.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5c0200bacc0930c9bdb341de8abba7d6
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0.9999 b/metadata/md5-cache/dev-debug/lldb-19.0.0.9999
index 8489e5cbe909..94365a9b1591 100644
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0.9999
+++ b/metadata/md5-cache/dev-debug/lldb-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-lib
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test !test? ( test )
 SLOT=0/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240302 b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240302
deleted file mode 100644
index 9157f2d22973..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-19.0.0_pre20240302[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-19.0.0_pre20240302[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-19.0.0_pre20240302[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-19.0.0_pre20240302 ~sys-devel/llvm-19.0.0_pre20240302[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=+debug debuginfod +libedit lzma ncurses +python test +xml test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-19.0.0_pre20240302 ~sys-devel/llvm-19.0.0_pre20240302[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240309 b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240309
deleted file mode 100644
index 86b02d14c130..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-19.0.0_pre20240309[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-19.0.0_pre20240309[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-19.0.0_pre20240309[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-19.0.0_pre20240309 ~sys-devel/llvm-19.0.0_pre20240309[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=+debug debuginfod +libedit lzma ncurses +python test +xml test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-19.0.0_pre20240309 ~sys-devel/llvm-19.0.0_pre20240309[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240316 b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240316
index 7c3af2cc3aa1..ed3cd6921b4b 100644
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240316
+++ b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 232b95bfdb26..b7853fe05a6b 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/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index 0d2f7bf62d94..0d49b80b7246 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	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d1b95418d66b7940177352663526f1c3
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.6 b/metadata/md5-cache/dev-libs/libclc-16.0.6
index db8405e4aacf..70bbbd587806 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.6
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60cec33a95d6e032d0564390f85e4b74
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.6 b/metadata/md5-cache/dev-libs/libclc-17.0.6
index bdde1b8a620d..4c62f0daee6b 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.6
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b47e6a9d06021f1da5fe066f85a10430
diff --git a/metadata/md5-cache/dev-libs/libclc-18.1.0 b/metadata/md5-cache/dev-libs/libclc-18.1.0
deleted file mode 100644
index 48523c593c05..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig +llvm_slot_17
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_17 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=915a303e30a224a45c680df44fd5a0db
diff --git a/metadata/md5-cache/dev-libs/libclc-18.1.2 b/metadata/md5-cache/dev-libs/libclc-18.1.2
index 4617ae0802a2..78793a722fb4 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.1.2
+++ b/metadata/md5-cache/dev-libs/libclc-18.1.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=^^ ( llvm_slot_17 )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=915a303e30a224a45c680df44fd5a0db
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-19.0.0.9999
index 7552b98b834d..d15c9bfed5b2 100644
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-19.0.0.9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
 SLOT=0
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a5135efa59170b03becf82061fec0260
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240302 b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240302
deleted file mode 100644
index b32de2d66cf6..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240302
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_15? ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) llvm_slot_16? ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi +llvm_slot_17 llvm_slot_15 llvm_slot_16
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5135efa59170b03becf82061fec0260
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240309 b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240309
deleted file mode 100644
index 0eabfdaf2ad7..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240309
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_15? ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) llvm_slot_16? ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi +llvm_slot_17 llvm_slot_15 llvm_slot_16
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5135efa59170b03becf82061fec0260
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240316 b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240316
index 9bd8934efce2..843a9180de07 100644
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240316
+++ b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240316
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-r1	2e652182b1f239b07688071f959f19e4	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a5135efa59170b03becf82061fec0260
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.22.1 b/metadata/md5-cache/dev-libs/tree-sitter-0.22.1
new file mode 100644
index 000000000000..fd584b0725ed
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.22.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+INHERIT=optfeature toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.22.1.tar.gz -> tree-sitter-0.22.1.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7de483153e8607b50c7bc10e431ef4f9
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
index 1f67cc768b25..2deebfd38279 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Bash grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.19.0.tar.gz -> tree-sitter-bash-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=744eddeb67559e8679fc07afec502a87
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.4-r1 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.4-r1
index 2da63060e6ce..5a90a7c7e9c5 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.4-r1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.4-r1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Bash grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.4.tar.gz -> tree-sitter-bash-0.20.4-2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=e9c46c6250db156eab9d06e2775be3de
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=bb5a0895d11fada24a909d0583fc5b8d
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.5 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.5
index 07dc423cf12e..31917e4dfcf1 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.5
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.20.5
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Bash grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.5.tar.gz -> tree-sitter-bash-0.20.5.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=e7f92e4028d88542c5721ca80bfe6603
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.21.0 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.21.0
new file mode 100644
index 000000000000..e46e22f443ee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-util/tree-sitter-cli ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
+DESCRIPTION=Bash grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
+INHERIT=tree-sitter-grammar
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test python
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/tree-sitter-0.21.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz -> tree-sitter-bash-0.21.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=455a37a7a8f7917e34f928657443c7fe
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
index c29854701993..2ed6b5e9e88c 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz -> tree-sitter-c-0.20.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=67b6ffbb6e32d2dd290b90099ce66f2f
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.6 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.6
index c74efaba9362..9d96c47aab75 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.6
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.6
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.6.tar.gz -> tree-sitter-c-0.20.6.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=abbd6737e612c7c50c8f3828eb43f47c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.7 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.7
index c8f574b1c4c8..0388c741b18e 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.7
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.7
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.7.tar.gz -> tree-sitter-c-0.20.7.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=03e4fb3a514f31aa1670c4c2d7f35203
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
index a4026899a6a4..d895b4b20b9f 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.19.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C# grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c-sharp
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c-sharp/archive/v0.19.1.tar.gz -> tree-sitter-c-sharp-0.19.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=67ab5e4cb0306f23c2e9099f23578230
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.20.0
index 70193efb7138..fe6755aa4655 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-sharp-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C# grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c-sharp
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-c-sharp/archive/v0.20.0.tar.gz -> tree-sitter-c-sharp-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=e47213b4ff51b8bdc083eadaeeb83fb2
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.1.0 b/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.1.0
index 50a864dfedd0..89ea214ff1c4 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.1.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.1.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CMake grammar for tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/uyha/tree-sitter-cmake
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uyha/tree-sitter-cmake/archive/0.1.0.tar.gz -> tree-sitter-cmake-0.1.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=63ca8944e85c0a6a4cbabe602c8b49e0
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.4.1 b/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.4.1
index 7e7f96f273d6..c53cbd9cc326 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.4.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cmake-0.4.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CMake grammar for tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/uyha/tree-sitter-cmake
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uyha/tree-sitter-cmake/archive/v0.4.1.tar.gz -> tree-sitter-cmake-0.4.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=b3e247eed4e87b166871a38dfdb25a41
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
index 74b006a2d8e8..ee8c493ffa14 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-cpp
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-cpp/archive/v0.20.0.tar.gz -> tree-sitter-cpp-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=9823070e40556dcdbf78252be2f40862
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0_p20230410 b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0_p20230410
index 586a7f63666f..a2ebd6780168 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0_p20230410
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.0_p20230410
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-cpp
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-cpp/archive/0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74.tar.gz -> tree-sitter-cpp-0.20.0_p20230410.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=d2e1086f4b2d760c16ac10da2069b3fe
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=22bea4b904fe53b40beb748603f68364
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.3 b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.3
index b1855b6b656b..c6b22587d306 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.3
+++ b/metadata/md5-cache/dev-libs/tree-sitter-cpp-0.20.3
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-cpp
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-cpp/archive/v0.20.3.tar.gz -> tree-sitter-cpp-0.20.3.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=5bcc66fa588352e31d505e38314a0d46
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
index de4b579fef9d..06d7afc6e8e9 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-css-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CSS grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-css
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-css/archive/v0.19.0.tar.gz -> tree-sitter-css-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=e3e8209552b5c8bee1b4b67aaf161889
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-css-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-css-0.20.0
index b59faaa05203..45ca491f9d95 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-css-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-css-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CSS grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-css
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-css/archive/v0.20.0.tar.gz -> tree-sitter-css-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=5d6487cc37a704da42a421c28212760c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
index 5e8e8c2c438a..b87d7a5487b7 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Embedded template languages (like ERB, EJS) grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-embedded-template
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-embedded-template/archive/v0.19.0.tar.gz -> tree-sitter-embedded-template-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=4e3b93c9b375d5f57f4245306352cfa9
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.20.0
index 9acfbc14a858..664e392b5bb5 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-embedded-template-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Embedded template languages (like ERB, EJS) grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-embedded-template
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-embedded-template/archive/v0.20.0.tar.gz -> tree-sitter-embedded-template-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=b6ed9852bebc04079fa59fb5d4a83b55
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-gleam-0.33.0 b/metadata/md5-cache/dev-libs/tree-sitter-gleam-0.33.0
index 22c18041d50c..19b634418ede 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-gleam-0.33.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-gleam-0.33.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Gleam grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/gleam-lang/tree-sitter-gleam
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gleam-lang/tree-sitter-gleam/archive/refs/tags/v0.33.0.tar.gz -> tree-sitter-gleam-0.33.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=1b8dc8a015cd5538779d511cdc58001f
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=8a372e326f484b5e9e297be2bf4c3cfa
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
index efdfc386f8c5..331d4e78a951 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-go-0.19.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Go grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-go
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-go/archive/rust-0.19.1.tar.gz -> tree-sitter-go-0.19.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=4575fd5c719b8123edf07c222d4d94e3
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-go-0.20.0-r1 b/metadata/md5-cache/dev-libs/tree-sitter-go-0.20.0-r1
index ab25dbdfd3aa..a2a6c094a83e 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-go-0.20.0-r1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-go-0.20.0-r1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Go grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-go
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-go/archive/v0.20.0.tar.gz -> tree-sitter-go-0.20.0-2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=2cf6ca5c23bc56772be2824d136d4e07
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=5dff0a2c15f4c60b86bb8e7bee997930
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114 b/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
index 5cd0d227a3e5..7b4929a10234 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
+++ b/metadata/md5-cache/dev-libs/tree-sitter-haskell-0.13.0_p20211114
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Haskell grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-haskell
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-haskell/archive/d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02.tar.gz -> tree-sitter-haskell-0.13.0_p20211114.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=dceb4227187cc2dc0ad63dd5038cc2ab
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
index 5c8172d30286..46c3190ff3cc 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-html-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HTML grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-html
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-html/archive/v0.19.0.tar.gz -> tree-sitter-html-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=3f6320588dc16bb6c7a7a46d8927926c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
index b2d92f7753ef..c7ea09133d84 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-java-0.19.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Java grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-java
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-java/archive/v0.19.1.tar.gz -> tree-sitter-java-0.19.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=0d6302ae7fcb2ec8f431baa9c5a5e5dc
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.0
index 2142fbfb9a9e..4887affae401 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Java grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-java
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-java/archive/v0.20.0.tar.gz -> tree-sitter-java-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=dd94ab60aa66169f35a36e6cc30161f8
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.1
index 34ee0c004409..8238215979bb 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Java grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-java
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-java/archive/v0.20.1.tar.gz -> tree-sitter-java-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=a3b986467b56083e0b256d6fe0eec56d
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.2
index 010879face34..5bb65a1ebb4b 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.2
+++ b/metadata/md5-cache/dev-libs/tree-sitter-java-0.20.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Java grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-java
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-java/archive/v0.20.2.tar.gz -> tree-sitter-java-0.20.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=12f5dcafa064aefdd98eb73993e03f31
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
index 1821ba7fb7fa..aac9e83479b7 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JavaScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-javascript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-javascript/archive/rust-0.20.0.tar.gz -> tree-sitter-javascript-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=36d5119f6110a12d3108ee3f40f79e39
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.1-r1 b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.1-r1
index bb764cc858a0..acdbc64c2ab2 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.1-r1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.1-r1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JavaScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-javascript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.20.1.tar.gz -> tree-sitter-javascript-0.20.1-2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=2372f44a72357a2e121adc9405b354eb
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=1fb08c9498a8bb1a23377ab6b4ce1e47
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.3 b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.3
index f79de2319592..3378fcf3dbfc 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.3
+++ b/metadata/md5-cache/dev-libs/tree-sitter-javascript-0.20.3
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JavaScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-javascript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.20.3.tar.gz -> tree-sitter-javascript-0.20.3.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=675263af2526ee5496218de7fb40657f
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
index dfb7e8c4581c..5041a43e3d8c 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-jsdoc-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSDoc grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-jsdoc
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-jsdoc/archive/v0.19.0.tar.gz -> tree-sitter-jsdoc-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=817d99f66e83804b59d95573f07cdd6a
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
index 0b23c1f102c8..c15be7c8947f 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-json-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-json
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-json/archive/v0.19.0.tar.gz -> tree-sitter-json-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=e8db564dc9a541f08d2c5a72a9cf100e
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.1
index 9739a6332f28..ba6d99429077 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-json
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-json/archive/v0.20.1.tar.gz -> tree-sitter-json-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=94702a7683e3c45386ba72494b221ca5
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.2
index 0f1a2d245748..d19c06a80397 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.2
+++ b/metadata/md5-cache/dev-libs/tree-sitter-json-0.20.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-json
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-json/archive/v0.20.2.tar.gz -> tree-sitter-json-0.20.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=4ed4aebc19f42058d99262dd0fb8f16f
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
index bb2849565a89..4a218604d301 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Julia grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-julia
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-julia/archive/v0.19.0.tar.gz -> tree-sitter-julia-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=c816901af2d9fdbe45eb7b38ce0904c7
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.20.0
index d1dd846ad2b3..24637d8ac74c 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-julia-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-julia-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Julia grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-julia
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-julia/archive/v0.20.0.tar.gz -> tree-sitter-julia-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=ce91a44bbf2ef42291b6b7db2f4b4554
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
index 202bb69d9d61..b590677450a4 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OCaml grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ocaml
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ocaml/archive/v0.19.0.tar.gz -> tree-sitter-ocaml-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=9bc281849a48488d819bdd4f0dee06b2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=1222bfdb7a1eb94c02ab53e684cd4d59
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.1
index 6f6482838fce..86cf1afb22b2 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OCaml grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ocaml
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ocaml/archive/v0.20.1.tar.gz -> tree-sitter-ocaml-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=801d6bf2268d1cc72b7f0c03d346cf20
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=1222bfdb7a1eb94c02ab53e684cd4d59
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.4 b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.4
index 0a5bb0d88a31..5340c5c54772 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.4
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ocaml-0.20.4
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OCaml grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ocaml
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ocaml/archive/v0.20.4.tar.gz -> tree-sitter-ocaml-0.20.4.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=cbad59f347a32cae29e6cb49798f8dc7
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=1222bfdb7a1eb94c02ab53e684cd4d59
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
index 45f09fca9063..f83c3339f0aa 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-php-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=PHP grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-php
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-php/archive/v0.19.0.tar.gz -> tree-sitter-php-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=c7f4dab79e4eb19d402db0a751774775
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-php-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-php-0.20.0
index ccd3ded34476..d9ffda185522 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-php-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-php-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=PHP grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-php
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-php/archive/v0.20.0.tar.gz -> tree-sitter-php-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=f618375f299a4da7db8b0ec2df42f3bc
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
index caedb666d816..bf86c1596c54 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/v0.20.0.tar.gz -> tree-sitter-python-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=ff07273f6239a32a0c9dcd4cdaecc055
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.4 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.4
index fbe916b0b2b1..d32048674bd6 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.4
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.4
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/v0.20.4.tar.gz -> tree-sitter-python-0.20.4.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=46ed9767fcb70913ddfe953bb6fe8f08
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.21.0 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.21.0
new file mode 100644
index 000000000000..8465f3f755bc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-util/tree-sitter-cli ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
+DESCRIPTION=Python grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
+INHERIT=tree-sitter-grammar
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test python
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
+LICENSE=MIT
+RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/tree-sitter-0.21.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz -> tree-sitter-python-0.21.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=c2acc4d25827f0041c9c563ba8f68424
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
index 693c1ed434b8..5e63978df6e3 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ql-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Semmle QL grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ql
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ql/archive/v0.19.0.tar.gz -> tree-sitter-ql-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=eebc92b8d1b5fdf75388061c2169e763
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
index 0eb354f69224..02aac6beda97 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Regular Expressions grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-regex
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-regex/archive/v0.19.0.tar.gz -> tree-sitter-regex-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=8a29e39bc6f02bf7c1f9973fc8debf94
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.20.0
index 8101287a66e3..7109f3f4a013 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-regex-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-regex-0.20.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Regular Expressions grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-regex
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-regex/archive/v0.20.0.tar.gz -> tree-sitter-regex-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=3eb662039a2d5e2218906f7ea9323f98
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
index b7034b4ec72f..43ee4997c276 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ruby grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ruby
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ruby/archive/v0.19.0.tar.gz -> tree-sitter-ruby-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=18affece5492b3c4a69c235ee360075f
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.20.0_pre20221101 b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.20.0_pre20221101
index c33a2e252edd..1a5634df78b8 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.20.0_pre20221101
+++ b/metadata/md5-cache/dev-libs/tree-sitter-ruby-0.20.0_pre20221101
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ruby grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-ruby
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-ruby/archive/c91960320d0f337bdd48308a8ad5500bd2616979.tar.gz -> tree-sitter-ruby-0.20.0_pre20221101.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=028f405b78d4126bddd50d35faca840e
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=9f15bb774361a53aa6b9078f712ab916
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
index 7fe2a41ee039..9087b09a89f8 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rust grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-rust
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.1.tar.gz -> tree-sitter-rust-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=0e30100cfcd35b83dc1783a8671a9a7b
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.3 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.3
index 795517207478..f578c716a758 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.3
+++ b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.3
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rust grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-rust
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.3.tar.gz -> tree-sitter-rust-0.20.3.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=abacc11eb94a6e0a0864ba06a9a3fb90
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.4 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.4
index fdbb7f6ffdf4..f51807764ed4 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.4
+++ b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.4
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rust grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-rust
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.4.tar.gz -> tree-sitter-rust-0.20.4.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=53b4343fc143e6530d56024e05bd9451
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
index d9ee40fa0ded..a03af2f324b3 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Scala grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-scala
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-scala/archive/v0.19.0.tar.gz -> tree-sitter-scala-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=a1e8b30f0df71c5948979fdfcc3a0794
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.1 b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.1
index 68db9a8323be..e3c1379bd6d9 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.19.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Scala grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-scala
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-scala/archive/v0.19.1.tar.gz -> tree-sitter-scala-0.19.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=923348d52a7ad0dff22efc30fae4f581
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.20.2
index c71cdb439229..fe84cc71fc9c 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.20.2
+++ b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.20.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Scala grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-scala
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-scala/archive/v0.20.2.tar.gz -> tree-sitter-scala-0.20.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=b953da2ff5b197a5333d618080b7793b
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
index d03f7d0a7069..1e654029092d 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-tsq-0.19.0
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tree-sitter query language grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-tsq
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-tsq/archive/0.19.0.tar.gz -> tree-sitter-tsq-0.19.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
 _md5_=4963a67523c8e6caa0451d6c5f0c274b
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
index b0144d56320e..6829a93d8cdf 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=TypeScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.1.tar.gz -> tree-sitter-typescript-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=3776eb432afd46d0b124ff82e5291426
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=25bdcd0075918b9233539d47a546b815
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2
index 2ab2acafee6f..d5c01b2d3bed 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=TypeScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.2.tar.gz -> tree-sitter-typescript-0.20.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=a8832f5791bc6ef97a4ab4ee7e68aaa1
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=25bdcd0075918b9233539d47a546b815
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.3 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.3
index 0368b3228985..59f69eaabf5d 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.3
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.3
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=TypeScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.3.tar.gz -> tree-sitter-typescript-0.20.3.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=a837bf700e514dfb0bd92c3370f16ab8
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=25bdcd0075918b9233539d47a546b815
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.5 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.5
index a0c1c5227492..f184e8541d08 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.5
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.5
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/tree-sitter-cli )
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=TypeScript grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.5.tar.gz -> tree-sitter-typescript-0.20.5.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	295211cd03e4160303d359596aef4684
-_md5_=05f9838d4426888d369920cf1218d834
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	tree-sitter-grammar	b387ae33d78340575171e420abadc3db
+_md5_=3f6159b05dec9dd439ad3fa2c45b4fe9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 284e92cf0e65..ed19cbd6d0d0 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-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index 06a007f80b87..2dae471a99e1 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	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ec121544c62c6bb5c8112fe4850a5191
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.6
index 80e28307ee62..033f38e2ce4a 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60cfa38d0438f0434edcc6a55074d560
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.6
index 7ffa6096f2ff..ed6f6f434979 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60cfa38d0438f0434edcc6a55074d560
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.0
deleted file mode 100644
index f75db4b1fc72..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-18.1.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.0[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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 verify-sig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-18.1.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.0[llvm_targets_Xtensa] )
-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/18.1.0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fbf332dec306456b891c37c28bf58eef
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.2 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.2
index 4cb21ed29fc7..1e0ae5dffe04 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.2
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/18.1.2
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fbf332dec306456b891c37c28bf58eef
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0.9999
index 0eb32f197cf4..bae365d3bc56 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.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/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a551007d46e14570705b0da2f43e0be3
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240302 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240302
deleted file mode 100644
index 93f7ab20f3cd..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240302:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils python-any-r1
-IUSE=+debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240302:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Xtensa] )
-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/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a551007d46e14570705b0da2f43e0be3
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240309 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240309
deleted file mode 100644
index 3040d2d4aef5..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240309:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils python-any-r1
-IUSE=+debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240309:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Xtensa] )
-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/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a551007d46e14570705b0da2f43e0be3
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240316 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240316
index 7857d74cce72..232db6e49f75 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240316
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a551007d46e14570705b0da2f43e0be3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 6be3c87d2d5f..f9f99205cdf6 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/argcomplete-3.2.2 b/metadata/md5-cache/dev-python/argcomplete-3.2.2
deleted file mode 100644
index f688ae881b36..000000000000
--- a/metadata/md5-cache/dev-python/argcomplete-3.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-shells/fish app-shells/tcsh app-shells/zsh dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pip-19 ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bash tab completion for argparse
-EAPI=8
-HOMEPAGE=https://github.com/kislyuk/argcomplete/ https://pypi.org/project/argcomplete/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-3.2.2.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=833b50e05f39b2d0db8592635286ebce
diff --git a/metadata/md5-cache/dev-python/argcomplete-3.2.3 b/metadata/md5-cache/dev-python/argcomplete-3.2.3
index 09d155afd75e..5736f3c3c833 100644
--- a/metadata/md5-cache/dev-python/argcomplete-3.2.3
+++ b/metadata/md5-cache/dev-python/argcomplete-3.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/kislyuk/argcomplete/ https://pypi.org/project/argcomplete/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-3.2.3.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1074debe733f8ad4d0c050be85a1a1f1
+_md5_=833b50e05f39b2d0db8592635286ebce
diff --git a/metadata/md5-cache/dev-python/asgiref-3.8.1 b/metadata/md5-cache/dev-python/asgiref-3.8.1
new file mode 100644
index 000000000000..1763c9d82b43
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asgiref-3.8.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ASGI utilities (successor to WSGI)
+EAPI=8
+HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/asgiref/asgiref-3.8.1.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=da4f7dc5869401720bd0137cd61d8229
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.85.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.85.0
deleted file mode 100644
index 299bad11f871..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.85.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pydantic-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pydantic-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.85.0.tar.gz -> serverless-application-model-1.85.0.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cd95b5583a3115d243bb71a83f767bcb
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.86.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.86.0
index 93707b490bdc..9cbd40602524 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.86.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.86.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pydantic-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.86.0.tar.gz -> serverless-application-model-1.86.0.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=904c737398f2191d32db00452abfc184
+_md5_=cd95b5583a3115d243bb71a83f767bcb
diff --git a/metadata/md5-cache/dev-python/bandit-1.7.7 b/metadata/md5-cache/dev-python/bandit-1.7.7
deleted file mode 100644
index 2238973ac8bc..000000000000
--- a/metadata/md5-cache/dev-python/bandit-1.7.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testscenarios-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testtools-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/beautifulsoup4-4.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-1.9.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_10(-)?] ) ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GitPython-3.1.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A security linter from OpenStack Security
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/bandit/ https://pypi.org/project/bandit/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GitPython-3.1.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/bandit/bandit-1.7.7.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=da8ed97d3aa34e77fd55b7feddaffd9d
diff --git a/metadata/md5-cache/dev-python/bandit-1.7.8 b/metadata/md5-cache/dev-python/bandit-1.7.8
index d746763382d6..29a918ff7ede 100644
--- a/metadata/md5-cache/dev-python/bandit-1.7.8
+++ b/metadata/md5-cache/dev-python/bandit-1.7.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyCQA/bandit/ https://pypi.org/project/bandit/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GitPython-3.1.30[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/b/bandit/bandit-1.7.8.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=19358eacff33e3b6cd6cb3b61752a12a
+_md5_=79644b2b629c347cb62dd3a53228f088
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.54 b/metadata/md5-cache/dev-python/boto3-1.34.54
deleted file mode 100644
index f921a1a1be26..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.34.54
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.54[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.34.54.tar.gz -> boto3-1.34.54.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f37ec2b66190cda38c255cef699084ad
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.59 b/metadata/md5-cache/dev-python/boto3-1.34.59
index 929944ecaa27..cf1d1ed3313c 100644
--- a/metadata/md5-cache/dev-python/boto3-1.34.59
+++ b/metadata/md5-cache/dev-python/boto3-1.34.59
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-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.34.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.34.59.tar.gz -> boto3-1.34.59.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a760000ca2e2ca5614c106f4d3d512c4
+_md5_=f37ec2b66190cda38c255cef699084ad
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.66 b/metadata/md5-cache/dev-python/boto3-1.34.66
deleted file mode 100644
index 2a0424941ffb..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.34.66
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.66[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.66[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.34.66.tar.gz -> boto3-1.34.66.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a760000ca2e2ca5614c106f4d3d512c4
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.67 b/metadata/md5-cache/dev-python/boto3-1.34.67
deleted file mode 100644
index 3af181b4eb45..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.34.67
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.67[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.67[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.34.67.tar.gz -> boto3-1.34.67.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a760000ca2e2ca5614c106f4d3d512c4
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.68 b/metadata/md5-cache/dev-python/boto3-1.34.68
deleted file mode 100644
index 005eefc73a41..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.34.68
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.68[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.68[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.34.68.tar.gz -> boto3-1.34.68.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a760000ca2e2ca5614c106f4d3d512c4
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.65 b/metadata/md5-cache/dev-python/boto3-1.34.69
index 55912db03c98..65095b378796 100644
--- a/metadata/md5-cache/dev-python/boto3-1.34.65
+++ b/metadata/md5-cache/dev-python/boto3-1.34.69
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.65[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.69[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.34.65[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=>=dev-python/botocore-1.34.69[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.34.65.tar.gz -> boto3-1.34.65.gh.tar.gz
+SRC_URI=https://github.com/boto/boto3/archive/1.34.69.tar.gz -> boto3-1.34.69.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=a760000ca2e2ca5614c106f4d3d512c4
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.54 b/metadata/md5-cache/dev-python/botocore-1.34.54
deleted file mode 100644
index 3f5f1ff460c4..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.34.54
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.34.54.tar.gz -> botocore-1.34.54.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d1f3a00e6f9c9d98cc97f030301ab50f
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.59 b/metadata/md5-cache/dev-python/botocore-1.34.59
index f7aff307e447..8a520657ca3c 100644
--- a/metadata/md5-cache/dev-python/botocore-1.34.59
+++ b/metadata/md5-cache/dev-python/botocore-1.34.59
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-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/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/botocore/archive/1.34.59.tar.gz -> botocore-1.34.59.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f1ca9a8b0e1247ff42152fa304fc8999
+_md5_=d1f3a00e6f9c9d98cc97f030301ab50f
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.65 b/metadata/md5-cache/dev-python/botocore-1.34.65
deleted file mode 100644
index 2ee5ead4cb8b..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.34.65
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.34.65.tar.gz -> botocore-1.34.65.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.66 b/metadata/md5-cache/dev-python/botocore-1.34.66
deleted file mode 100644
index 5df572ff7bce..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.34.66
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.34.66.tar.gz -> botocore-1.34.66.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.67 b/metadata/md5-cache/dev-python/botocore-1.34.67
deleted file mode 100644
index 03371efb3f7c..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.34.67
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.34.67.tar.gz -> botocore-1.34.67.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.68 b/metadata/md5-cache/dev-python/botocore-1.34.69
index 6c3101127275..f375af17e9fb 100644
--- a/metadata/md5-cache/dev-python/botocore-1.34.68
+++ b/metadata/md5-cache/dev-python/botocore-1.34.69
@@ -11,6 +11,6 @@ RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.34.68.tar.gz -> botocore-1.34.68.gh.tar.gz
+SRC_URI=https://github.com/boto/botocore/archive/1.34.69.tar.gz -> botocore-1.34.69.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index cf2cd0fd77c4..3791a3b5a745 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 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_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.6 b/metadata/md5-cache/dev-python/clang-python-16.0.6
index 1bed17da3bca..5d64679a5a68 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=0efd225bad3b0e3b0055a8bea080c820
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.6 b/metadata/md5-cache/dev-python/clang-python-17.0.6
index ddb1383403f8..b8a547d1c3ba 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=43bc0ba057a9809af356d76c92a3cb01
diff --git a/metadata/md5-cache/dev-python/clang-python-18.1.0 b/metadata/md5-cache/dev-python/clang-python-18.1.0
deleted file mode 100644
index a21f3ee8f76a..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) test? ( sys-devel/clang:18 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-18.1.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test verify-sig python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-18.1.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=198a43f401a0941d5031c57a30d0990d
diff --git a/metadata/md5-cache/dev-python/clang-python-18.1.2 b/metadata/md5-cache/dev-python/clang-python-18.1.2
index cef053423c62..200555ef1e31 100644
--- a/metadata/md5-cache/dev-python/clang-python-18.1.2
+++ b/metadata/md5-cache/dev-python/clang-python-18.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=198a43f401a0941d5031c57a30d0990d
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-19.0.0.9999
index f530e39bab1f..4fdb1fbdb1fc 100644
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-19.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=96aa62ba191217295ead7b423ef429e2
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240302 b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240302
deleted file mode 100644
index ee515b03327b..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) test? ( sys-devel/clang:19 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-19.0.0_pre20240302:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-19.0.0_pre20240302:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=96aa62ba191217295ead7b423ef429e2
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240309 b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240309
deleted file mode 100644
index 89616ae1db19..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) test? ( sys-devel/clang:19 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-19.0.0_pre20240309:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-19.0.0_pre20240309:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=96aa62ba191217295ead7b423ef429e2
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240316 b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240316
index 259016a148a1..3a727d508b47 100644
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240316
+++ b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=96aa62ba191217295ead7b423ef429e2
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.14.0 b/metadata/md5-cache/dev-python/djangorestframework-3.15.1
index 0a57e80afa22..75d584bca64b 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.14.0
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.15.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/django-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/inflection[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-django[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/django-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Web APIs with django made easy
 EAPI=8
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/django-3.0[python_targets_python3_10(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/encode/django-rest-framework/archive/3.14.0.tar.gz -> django-rest-framework-3.14.0.gh.tar.gz
+SRC_URI=https://github.com/encode/django-rest-framework/archive/3.15.1.tar.gz -> django-rest-framework-3.15.1.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bfd61a927fbb5f44412c15dfd7654056
+_md5_=a2dbe62ef0e18e1cb6cebd9c13002cfe
diff --git a/metadata/md5-cache/dev-python/google-auth-2.28.1 b/metadata/md5-cache/dev-python/google-auth-2.28.1
deleted file mode 100644
index 91dd4aeba005..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.28.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyu2f[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-2.28.1.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f97c5393240cfd516ece34dac6c92ab7
diff --git a/metadata/md5-cache/dev-python/google-auth-2.28.2 b/metadata/md5-cache/dev-python/google-auth-2.28.2
index eaf82b0a6b33..1137b6e8fa0f 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.28.2
+++ b/metadata/md5-cache/dev-python/google-auth-2.28.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-2.28.2.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f22176d1d662c00bd6fc36af656ba422
+_md5_=f97c5393240cfd516ece34dac6c92ab7
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index 823e2cf371bf..d22d824aef33 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 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_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=05fe9b9d4b376809fb1d6ef6ed35e15b
diff --git a/metadata/md5-cache/dev-python/lit-16.0.6 b/metadata/md5-cache/dev-python/lit-16.0.6
index 230275d97fa3..5ef35a7e0af2 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.6
+++ b/metadata/md5-cache/dev-python/lit-16.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=11f95045aa3e1646a5cc1703113f36cc
diff --git a/metadata/md5-cache/dev-python/lit-17.0.6 b/metadata/md5-cache/dev-python/lit-17.0.6
index 36e3a0777e94..1fbcc1adcf43 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.6
+++ b/metadata/md5-cache/dev-python/lit-17.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=5252f99eec05b82802828941507ad1ac
diff --git a/metadata/md5-cache/dev-python/lit-18.1.0 b/metadata/md5-cache/dev-python/lit-18.1.0
deleted file mode 100644
index b8c1920800c4..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=54d39869c5d836679754eafabf3b14a8
diff --git a/metadata/md5-cache/dev-python/lit-18.1.2 b/metadata/md5-cache/dev-python/lit-18.1.2
index c1d10d82481a..e40f199a3aac 100644
--- a/metadata/md5-cache/dev-python/lit-18.1.2
+++ b/metadata/md5-cache/dev-python/lit-18.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=54d39869c5d836679754eafabf3b14a8
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0.9999 b/metadata/md5-cache/dev-python/lit-19.0.0.9999
index 16f270d4af47..7ca08378e5c8 100644
--- a/metadata/md5-cache/dev-python/lit-19.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-19.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e5605ef5b74a7ada51c4c46f83daddf2
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240302 b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240302
deleted file mode 100644
index e4984076e800..000000000000
--- a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240302
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-devel/llvm ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e5605ef5b74a7ada51c4c46f83daddf2
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240309 b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240309
deleted file mode 100644
index 6e161c07f8d7..000000000000
--- a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240309
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-devel/llvm ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e5605ef5b74a7ada51c4c46f83daddf2
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240316 b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240316
index 63cf72b03bfb..70d5bc356a75 100644
--- a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240316
+++ b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240316
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e5605ef5b74a7ada51c4c46f83daddf2
diff --git a/metadata/md5-cache/dev-python/manuel-1.12.4_p20231129 b/metadata/md5-cache/dev-python/manuel-1.12.4_p20231129
new file mode 100644
index 000000000000..dd663ed28440
--- /dev/null
+++ b/metadata/md5-cache/dev-python/manuel-1.12.4_p20231129
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lets you mix and match traditional doctests with custom test syntax
+EAPI=8
+HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/benji-york/manuel/archive/3f4d94d2ace3bdab4acad6896c93f5c96d6bee92.tar.gz -> manuel-3f4d94d2ace3bdab4acad6896c93f5c96d6bee92.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2de539678b50e835ed98b414677f7ddf
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.5.15 b/metadata/md5-cache/dev-python/mkdocs-material-9.5.15
new file mode 100644
index 000000000000..f9c4dd00eab6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.5.15
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/trove-classifiers-2023.10.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 dev-python/mkdocs[python_targets_python3_12(-)] dev-python/mkdocs-material-extensions[python_targets_python3_12(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_12(-)] dev-python/mkdocs-redirects[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=social python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+RDEPEND=>=dev-python/Babel-2.10.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/colorama-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mkdocs-1.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/paginate-0.5.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygments-2.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pymdown-extensions-10.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/readtime-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/regex-2022.4.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] social? ( >=dev-python/pillow-10.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=media-gfx/cairosvg-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.5.15.tar.gz -> mkdocs-material-9.5.15.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0dec1f83c0e8bd57fc095b5dbf020134
diff --git a/metadata/md5-cache/dev-python/mypy-1.9.0 b/metadata/md5-cache/dev-python/mypy-1.9.0
index 7a53132d7e6d..2e7d6e8b7a01 100644
--- a/metadata/md5-cache/dev-python/mypy-1.9.0
+++ b/metadata/md5-cache/dev-python/mypy-1.9.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mypy-lang.org/ https://github.com/python/mypy/ https://pypi.org/project/mypy/
 INHERIT=distutils-r1 multiprocessing
 IUSE=+native-extensions test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/1.9.0.tar.gz -> mypy-1.9.0.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d93fb9ea1839941ac2015e6ad658c9a6
+_md5_=6a56c4c9e7741e96d8f737b471793143
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.14.0 b/metadata/md5-cache/dev-python/pikepdf-8.14.0
new file mode 100644
index 000000000000..c240f4473167
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-8.14.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/qpdf-11.5.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=8
+HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.14.0.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8f8a8fc2b66c7074a2ffd045e6983e61
diff --git a/metadata/md5-cache/dev-python/podman-5.0.0 b/metadata/md5-cache/dev-python/podman-5.0.0
new file mode 100644
index 000000000000..cbab5ed4eb3c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/podman-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-mock-1.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pyxdg-0.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-12.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-1.2.3[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library to interact with a Podman server
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman-py/ https://pypi.org/project/podman/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyxdg-0.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rich-12.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-1.2.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/containers/podman-py/archive/v5.0.0.tar.gz -> podman-py-5.0.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f6857e4617db5319d24b6140783dde48
diff --git a/metadata/md5-cache/dev-python/pyglet-2.0.14 b/metadata/md5-cache/dev-python/pyglet-2.0.14
index 59cffe4524af..3dbba6f139c9 100644
--- a/metadata/md5-cache/dev-python/pyglet-2.0.14
+++ b/metadata/md5-cache/dev-python/pyglet-2.0.14
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pyglet.org/ https://github.com/pyglet/pyglet/ https://pypi.org/project/pyglet/
 INHERIT=distutils-r1 virtualx xdg-utils
 IUSE=examples image +sound test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/libpulse media-libs/openal ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v2.0.14.tar.gz -> pyglet-2.0.14.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bad4e5fc182e3f33e912db3965fec1af
+_md5_=48e08a0898bb90100232938c627a8859
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5 b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5
deleted file mode 100644
index 86c643c9bffb..000000000000
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for testing asyncio code with pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio/ https://pypi.org/project/pytest-asyncio/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-asyncio/pytest-asyncio-0.23.5.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=dbdc72a11832e345960315cb9d74d641
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5_p1 b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5_p1
index f1316d7753f4..61f5ad560d52 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5_p1
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.5_p1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio/ https://pypi.org/project/pytest-asyncio/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-asyncio/pytest-asyncio-0.23.5.post1.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=28566fec81bd8df0ab7471705efb8e99
+_md5_=dbdc72a11832e345960315cb9d74d641
diff --git a/metadata/md5-cache/dev-python/pytest-subtests-0.11.0 b/metadata/md5-cache/dev-python/pytest-subtests-0.11.0
deleted file mode 100644
index 96f8248a6f85..000000000000
--- a/metadata/md5-cache/dev-python/pytest-subtests-0.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unittest subTest() support and subtests fixture
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-subtests/ https://pypi.org/project/pytest-subtests/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-subtests/pytest-subtests-0.11.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cfb0238083c315cbe7b25b10488d190c
diff --git a/metadata/md5-cache/dev-python/pytest-subtests-0.12.0 b/metadata/md5-cache/dev-python/pytest-subtests-0.12.0
deleted file mode 100644
index 84c36b8d3999..000000000000
--- a/metadata/md5-cache/dev-python/pytest-subtests-0.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unittest subTest() support and subtests fixture
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-subtests/ https://pypi.org/project/pytest-subtests/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-subtests/pytest-subtests-0.12.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=99a4c25bbdd8dac9d8e04ca444570f68
diff --git a/metadata/md5-cache/dev-python/pytest-subtests-0.12.1 b/metadata/md5-cache/dev-python/pytest-subtests-0.12.1
index f0ea2c1ef80f..f556ae62617b 100644
--- a/metadata/md5-cache/dev-python/pytest-subtests-0.12.1
+++ b/metadata/md5-cache/dev-python/pytest-subtests-0.12.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-subtests/ https://pypi.org/project/pytest-subtests/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-subtests/pytest-subtests-0.12.1.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8f2d416751a5a71521330a2bdc4bb1b9
+_md5_=c053c492960d37560abaaa7b6ede4680
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.2.0 b/metadata/md5-cache/dev-python/pytest-timeout-2.2.0
deleted file mode 100644
index 89b572e30bb6..000000000000
--- a/metadata/md5-cache/dev-python/pytest-timeout-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !hppa? ( dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin to abort hanging tests
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-timeout/ https://pypi.org/project/pytest-timeout/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-2.2.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd90f8f67fdd622296e62e1785318c4c
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.3.1 b/metadata/md5-cache/dev-python/pytest-timeout-2.3.1
index 691cd0764b84..1429c3a990e2 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-timeout-2.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-timeout/ https://pypi.org/project/pytest-timeout/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-2.3.1.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4837fc49978a675e91e626640dbe773d
+_md5_=ac7debecd3078451aca007f17221896a
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.4.0 b/metadata/md5-cache/dev-python/requests-oauthlib-2.0.0
index 8645f9394ef9..f5befefc727b 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.4.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-2.0.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_10(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.4.0.tar.gz -> requests-oauthlib-1.4.0.gh.tar.gz
+SRC_URI=https://github.com/requests/requests-oauthlib/archive/v2.0.0.tar.gz -> requests-oauthlib-2.0.0.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b0c706199abc0b450738c0ecc0e9367a
diff --git a/metadata/md5-cache/dev-python/rq-1.15.1 b/metadata/md5-cache/dev-python/rq-1.15.1
deleted file mode 100644
index 0a0f51806544..000000000000
--- a/metadata/md5-cache/dev-python/rq-1.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/psutil[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sentry-sdk[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/click-5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.0.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, lightweight library for creating and processing background jobs
-EAPI=8
-HOMEPAGE=https://python-rq.org/ https://github.com/rq/rq/ https://pypi.org/project/rq/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.0.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rq/rq/archive/v1.15.1.tar.gz -> rq-1.15.1.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=34fd4b77a2704be4a91c95134812f57b
diff --git a/metadata/md5-cache/dev-python/rq-1.16.0 b/metadata/md5-cache/dev-python/rq-1.16.0
deleted file mode 100644
index 1b985327e91c..000000000000
--- a/metadata/md5-cache/dev-python/rq-1.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/psutil[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sentry-sdk[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/click-5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, lightweight library for creating and processing background jobs
-EAPI=8
-HOMEPAGE=https://python-rq.org/ https://github.com/rq/rq/ https://pypi.org/project/rq/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/rq/rq-1.16.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=954c03e5d45d652be2463543e398edc4
diff --git a/metadata/md5-cache/dev-python/rq-1.16.1 b/metadata/md5-cache/dev-python/rq-1.16.1
index e2de2fcad400..3f7f7157003b 100644
--- a/metadata/md5-cache/dev-python/rq-1.16.1
+++ b/metadata/md5-cache/dev-python/rq-1.16.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://python-rq.org/ https://github.com/rq/rq/ https://pypi.org/project/rq/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.5.0[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rq/rq-1.16.1.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=954c03e5d45d652be2463543e398edc4
+_md5_=20a7da05eb674ea9ef41847f7737aa25
diff --git a/metadata/md5-cache/dev-python/sphinx-press-theme-0.8.0 b/metadata/md5-cache/dev-python/sphinx-press-theme-0.9.1
index f3e1579461b5..38e18304e765 100644
--- a/metadata/md5-cache/dev-python/sphinx-press-theme-0.8.0
+++ b/metadata/md5-cache/dev-python/sphinx-press-theme-0.9.1
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx_press_theme/sphinx_press_theme-0.8.0.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx_press_theme/sphinx_press_theme-0.9.1.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0921ef9313b9482d39d4376a051d9b15
diff --git a/metadata/md5-cache/dev-python/stripe-8.4.0 b/metadata/md5-cache/dev-python/stripe-8.4.0
deleted file mode 100644
index 4181df48ceab..000000000000
--- a/metadata/md5-cache/dev-python/stripe-8.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.182.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1 pypi
-IUSE=telemetry test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/stripe/stripe-8.4.0.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3526125eed96ee85c9938cd29cf2f4f3
diff --git a/metadata/md5-cache/dev-python/stripe-8.6.0 b/metadata/md5-cache/dev-python/stripe-8.6.0
index fc2c9ddb8608..0009a6fd9b71 100644
--- a/metadata/md5-cache/dev-python/stripe-8.6.0
+++ b/metadata/md5-cache/dev-python/stripe-8.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
 INHERIT=distutils-r1 pypi
 IUSE=telemetry test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/stripe/stripe-8.6.0.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c32f11f6ea181e9a31b60a0b047a600f
+_md5_=3526125eed96ee85c9938cd29cf2f4f3
diff --git a/metadata/md5-cache/dev-python/time-machine-2.14.1 b/metadata/md5-cache/dev-python/time-machine-2.14.1
new file mode 100644
index 000000000000..0ad31922f9e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/time-machine-2.14.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Travel through time in your tests
+EAPI=8
+HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/adamchainz/time-machine/archive/2.14.1.tar.gz -> time-machine-2.14.1.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=31dc93c2bb6d2b5de76cb3b10929b7ae
diff --git a/metadata/md5-cache/dev-python/tox-4.14.2 b/metadata/md5-cache/dev-python/tox-4.14.2
new file mode 100644
index 000000000000..e25af9d645b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-4.14.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distlib[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( dev-python/cachetools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-api[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cachetools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-api[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tox/tox-4.14.2.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4c28c7ca049fbd35867b980bcdc8a6db
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.21.0 b/metadata/md5-cache/dev-python/tree-sitter-0.21.0
new file mode 100644
index 000000000000..b01752455de3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-libs/tree-sitter-0.22.1 python_targets_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/tree-sitter-0.22.1 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python bindings to the Tree-sitter parsing library
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter/ https://pypi.org/project/tree-sitter/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-libs/tree-sitter-0.22.1 python_targets_python3_12? ( dev-python/setuptools[python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/py-tree-sitter/archive/v0.21.0.tar.gz -> tree-sitter-0.21.0.gh.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-json/archive/3b129203f4b72d532f58e72c5310c0a7db3b8e6d.tar.gz -> tree-sitter-json-3b129203f4b72d532f58e72c5310c0a7db3b8e6d.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/03e88c170cb23142559a406b6e7621c4af3128f5.tar.gz -> tree-sitter-python-03e88c170cb23142559a406b6e7621c4af3128f5.tar.gz https://github.com/tree-sitter/tree-sitter-embedded-template/archive/6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz -> tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz https://github.com/tree-sitter/tree-sitter-rust/archive/3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz -> tree-sitter-rust-3a56481f8d13b6874a28752502a58520b9139dc7.tar.gz https://github.com/tree-sitter/tree-sitter-html/archive/b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz -> tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz https://github.com/tree-sitter/tree-sitter-javascript/archive/de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz -> tree-sitter-javascript-de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz )
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=081d0a57e148f1d788f47fb6c36faeb9
diff --git a/metadata/md5-cache/dev-python/trimesh-4.1.5 b/metadata/md5-cache/dev-python/trimesh-4.1.5
deleted file mode 100644
index 45954bd89b85..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-4.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mapbox_earcut[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimesh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/4.1.5.tar.gz -> trimesh-4.1.5.gh.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a2d989c5f51a4da6e18e5111dc954644
diff --git a/metadata/md5-cache/dev-python/trimesh-4.1.8 b/metadata/md5-cache/dev-python/trimesh-4.1.8
index 2dc5fbb60c11..3a5fc4e5ffa0 100644
--- a/metadata/md5-cache/dev-python/trimesh-4.1.8
+++ b/metadata/md5-cache/dev-python/trimesh-4.1.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://trimesh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikedh/trimesh/archive/4.1.8.tar.gz -> trimesh-4.1.8.gh.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7d947f2b93b343c40ad68a3a1fd33be8
+_md5_=b5411337d93f42169c4b039012467f5b
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240309 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240309
deleted file mode 100644
index f7e7f2554b9c..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240309
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240309.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240310 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240310
deleted file mode 100644
index b39eff5433bc..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240310
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240310.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240311 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240311
deleted file mode 100644
index 09d91808587c..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240311
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240311.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240314 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240314
deleted file mode 100644
index 08bfccebf2b9..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240314
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240314.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240315 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240315
deleted file mode 100644
index f283d1dbd271..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240315
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240315.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240316 b/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240316
deleted file mode 100644
index 5c45df7291d1..000000000000
--- a/metadata/md5-cache/dev-python/types-docutils-0.20.0.20240316
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.20.0.20240316.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=058e2f3a3024a6187d0d20f32ba6b9b3
diff --git a/metadata/md5-cache/dev-python/types-gdb-12.1.4.20240311 b/metadata/md5-cache/dev-python/types-gdb-12.1.4.20240311
deleted file mode 100644
index 744674774285..000000000000
--- a/metadata/md5-cache/dev-python/types-gdb-12.1.4.20240311
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for gdb
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-gdb/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-gdb/types-gdb-12.1.4.20240311.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f2ca8c4a512cf4de73abce147cecd658
diff --git a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240205 b/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240205
deleted file mode 100644
index 936104617df4..000000000000
--- a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240205
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for psutil
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-psutil/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-psutil/types-psutil-5.9.5.20240205.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fccfea4caded1fcb59ee378d057c7d82
diff --git a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240311 b/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240311
deleted file mode 100644
index 7b1e75faab21..000000000000
--- a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240311
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for psutil
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-psutil/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-psutil/types-psutil-5.9.5.20240311.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=58931871fe56ed04d884eb9ed0e16a39
diff --git a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240316 b/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240316
index ba1e0d27a03b..e7986d282cc2 100644
--- a/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240316
+++ b/metadata/md5-cache/dev-python/types-psutil-5.9.5.20240316
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/types-psutil/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/types-psutil/types-psutil-5.9.5.20240316.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=58931871fe56ed04d884eb9ed0e16a39
+_md5_=fccfea4caded1fcb59ee378d057c7d82
diff --git a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240302 b/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240302
deleted file mode 100644
index 6796870be4cc..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240302
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-69.1.0.20240302.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=66a6eeca81815f3d8813cfe088c86656
diff --git a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240308 b/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240308
deleted file mode 100644
index e195807f99df..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240308
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-69.1.0.20240308.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=62eb84e5bcb85adace6d97543d7a869b
diff --git a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240309 b/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240309
deleted file mode 100644
index d17f1402ffac..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240309
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-69.1.0.20240309.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=62eb84e5bcb85adace6d97543d7a869b
diff --git a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240310 b/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240310
index de372f644ff6..2747eb6312d0 100644
--- a/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240310
+++ b/metadata/md5-cache/dev-python/types-setuptools-69.1.0.20240310
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/types-setuptools/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-69.1.0.20240310.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=62eb84e5bcb85adace6d97543d7a869b
+_md5_=66a6eeca81815f3d8813cfe088c86656
diff --git a/metadata/md5-cache/dev-python/types-setuptools-69.2.0.20240316 b/metadata/md5-cache/dev-python/types-setuptools-69.2.0.20240316
deleted file mode 100644
index 0b333a341314..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-69.2.0.20240316
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-69.2.0.20240316.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=62eb84e5bcb85adace6d97543d7a869b
diff --git a/metadata/md5-cache/dev-python/weasyprint-60.2 b/metadata/md5-cache/dev-python/weasyprint-60.2
deleted file mode 100644
index 7c9e00310fc0..000000000000
--- a/metadata/md5-cache/dev-python/weasyprint-60.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-text/ghostscript-gpl-9.56.1-r3 media-fonts/ahem ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
-EAPI=8
-HOMEPAGE=https://weasyprint.org/ https://github.com/Kozea/WeasyPrint/ https://pypi.org/project/weasyprint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/weasyprint/weasyprint-60.2.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e019103e4b66d020ad68b4c0c22fc1e3
diff --git a/metadata/md5-cache/dev-python/weasyprint-61.1 b/metadata/md5-cache/dev-python/weasyprint-61.1
deleted file mode 100644
index 12f2839370b0..000000000000
--- a/metadata/md5-cache/dev-python/weasyprint-61.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-text/ghostscript-gpl-9.56.1-r3 media-fonts/ahem ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
-EAPI=8
-HOMEPAGE=https://weasyprint.org/ https://github.com/Kozea/WeasyPrint/ https://pypi.org/project/weasyprint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/weasyprint/weasyprint-61.1.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd0aa8ce22036179962bd670e34c6ce7
diff --git a/metadata/md5-cache/dev-python/weasyprint-61.2 b/metadata/md5-cache/dev-python/weasyprint-61.2
index 230a71dc6d02..2a6b9d2b6549 100644
--- a/metadata/md5-cache/dev-python/weasyprint-61.2
+++ b/metadata/md5-cache/dev-python/weasyprint-61.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://weasyprint.org/ https://github.com/Kozea/WeasyPrint/ https://pypi.org/project/weasyprint/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/weasyprint/weasyprint-61.2.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd0aa8ce22036179962bd670e34c6ce7
+_md5_=0cfd1a63113f1574a28751a0a1abd2d3
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.5.4 b/metadata/md5-cache/dev-python/ytmusicapi-1.5.4
deleted file mode 100644
index 2c96404dc11d..000000000000
--- a/metadata/md5-cache/dev-python/ytmusicapi-1.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unofficial API for YouTube Music
-EAPI=8
-HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
-INHERIT=distutils-r1 pypi
-IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.5.4.tar.gz
-_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bb92aeab2595e864105f279a571dcb46
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.6.0 b/metadata/md5-cache/dev-python/ytmusicapi-1.6.0
index 5956146b0a31..7a0ddfb2e8a5 100644
--- a/metadata/md5-cache/dev-python/ytmusicapi-1.6.0
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
 INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.6.0.tar.gz
 _eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6a04018a1c05c3e3bb80372f9d1a248b
+_md5_=bb92aeab2595e864105f279a571dcb46
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 0d79ca1888f4..d030b636003f 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/console-1.17.2 b/metadata/md5-cache/dev-ruby/console-1.17.2
deleted file mode 100644
index 60a084500d31..000000000000
--- a/metadata/md5-cache/dev-ruby/console-1.17.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/fiber-annotation[ruby_targets_ruby31(-)] dev-ruby/fiber-local[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/fiber-annotation[ruby_targets_ruby32(-)] dev-ruby/fiber-local[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Beautiful logging for Ruby
-EAPI=8
-HOMEPAGE=https://github.com/socketry/console
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-ruby/fiber-annotation[ruby_targets_ruby31(-)] dev-ruby/fiber-local[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/fiber-annotation[ruby_targets_ruby32(-)] dev-ruby/fiber-local[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/socketry/console/archive/v1.17.2.tar.gz -> console-1.17.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2bc72292a1b9c9d78bbdead9c4c13276
diff --git a/metadata/md5-cache/dev-ruby/console-1.23.4 b/metadata/md5-cache/dev-ruby/console-1.23.6
index 6759e7a45d99..fb0fbf27ee14 100644
--- a/metadata/md5-cache/dev-ruby/console-1.23.4
+++ b/metadata/md5-cache/dev-ruby/console-1.23.6
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby31? ( dev-ruby/fiber-annotation[ruby_targets_ruby31(-)]
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
-SRC_URI=https://github.com/socketry/console/archive/v1.23.4.tar.gz -> console-1.23.4.tar.gz
+SRC_URI=https://github.com/socketry/console/archive/v1.23.6.tar.gz -> console-1.23.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6086a3408c1c1ac0ac67ad732eecf1a8
+_md5_=e3350d69dcac60ae270a0a476ec37d2a
diff --git a/metadata/md5-cache/dev-ruby/csv-3.3.0 b/metadata/md5-cache/dev-ruby/csv-3.3.0
new file mode 100644
index 000000000000..051d1a5b06cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/csv-3.3.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=The CSV library provides a complete interface to CSV files and data
+EAPI=8
+HOMEPAGE=https://github.com/ruby/csv
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/ruby/csv/archive/v3.3.0.tar.gz -> csv-3.3.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=fe4b3f6101a638dd1c60f75da311d26e
diff --git a/metadata/md5-cache/dev-ruby/dry-inflector-1.0.0 b/metadata/md5-cache/dev-ruby/dry-inflector-1.0.0
index c4fd74a125d0..65bac5ad8341 100644
--- a/metadata/md5-cache/dev-ruby/dry-inflector-1.0.0
+++ b/metadata/md5-cache/dev-ruby/dry-inflector-1.0.0
@@ -1,11 +1,11 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/warning[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/warning[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/warning[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=String inflections for dry-rb
 EAPI=8
 HOMEPAGE=https://dry-rb.org/gems/dry-inflector/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dry-rb/dry-inflector/archive/v1.0.0.tar.gz -> dry-inflector-1.0.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8ba17463fd4bda73b779941c33da3c70
+_md5_=ea9a62dc4ec0cb860cd61adac86d39b7
diff --git a/metadata/md5-cache/dev-ruby/dry-logic-1.5.0 b/metadata/md5-cache/dev-ruby/dry-logic-1.5.0
index aee46de9970c..5f8bab76252c 100644
--- a/metadata/md5-cache/dev-ruby/dry-logic-1.5.0
+++ b/metadata/md5-cache/dev-ruby/dry-logic-1.5.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] dev-ruby/dry-core:1[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby32(-)] dev-ruby/dry-core:1[ruby_targets_ruby32(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby33(-)] dev-ruby/dry-core:1[ruby_targets_ruby33(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] dev-ruby/dry-core:1[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby32(-)] dev-ruby/dry-core:1[ruby_targets_ruby32(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby33(-)] dev-ruby/dry-core:1[ruby_targets_ruby33(-)] >=dev-ruby/zeitwerk-2.6:2[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/warning[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/warning[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/warning[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 DESCRIPTION=Predicate logic with rule composition
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dry-rb/dry-logic/archive/v1.5.0.tar.gz -> dry-logic-1.5.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0e8025e681c7dca096337fbb855ae76c
+_md5_=65b81cca02e1acee385c15b2f3ab4d91
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.6.0 b/metadata/md5-cache/dev-ruby/rdoc-6.6.0
deleted file mode 100644
index 6cc3fcbe0ca1..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-6.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby31(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby32(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby32(-)] dev-ruby/rake[ruby_targets_ruby32(-)] test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=8
-HOMEPAGE=https://github.com/ruby/rdoc/
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=|| ( GPL-2 Ruby-BSD )
-RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rdoc/archive/v6.6.0.tar.gz -> rdoc-6.6.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3b4e6170eee4e059e1e37b23205215e2
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.6.1 b/metadata/md5-cache/dev-ruby/rdoc-6.6.1
deleted file mode 100644
index 8d9a096a8283..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-6.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby31(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby32(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby32(-)] dev-ruby/rake[ruby_targets_ruby32(-)] test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=8
-HOMEPAGE=https://github.com/ruby/rdoc/
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=|| ( GPL-2 Ruby-BSD )
-RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rdoc/archive/v6.6.1.tar.gz -> rdoc-6.6.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3b4e6170eee4e059e1e37b23205215e2
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 145b112c983e..ad450e917214 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/tree-sitter-cli-0.22.1 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.22.1
new file mode 100644
index 000000000000..d809a42eb52a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.22.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-libs/tree-sitter-0.22.1 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Command-line tool for creating and testing tree-sitter grammars
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016
+RDEPEND=~dev-libs/tree-sitter-0.22.1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.22.1.tar.gz -> tree-sitter-0.22.1.tar.gz https://dev.gentoo.org/~arthurzam/distfiles/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.1-crates.tar.xz
+_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=2364b6d9c86b33cc161f98ce527d5154
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 817ea008105e..3ee4f70472f3 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index 1769fe81ba64..822b048de5c5 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) doc? ( sys-apps/texinfo )
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) doc? ( sys-apps/texinfo )
 DEFINED_PHASES=compile install setup
 DESCRIPTION=cowsay reimplemention for ponies
 EAPI=8
 HOMEPAGE=https://github.com/erkin/ponysay
 INHERIT=bash-completion-r1 python-single-r1
-IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_10 python_single_target_python3_11
+IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd7877ce643426c11c55a0f5f93b72ed
+_md5_=5fec9e22b080c0670c3143555978697f
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 4759571e64fc..0c35e78aed5f 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/gtk-layer-shell-0.8.1 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.1
deleted file mode 100644
index 44f224ea6ae9..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig x11-base/xorg-proto gtk-doc? ( dev-util/gtk-doc ) test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=x11-libs/gtk+-3.24.37:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
-DESCRIPTION=Library to create desktop components for Wayland using the Layer Shell protocol
-EAPI=8
-HOMEPAGE=https://github.com/wmww/gtk-layer-shell
-INHERIT=vala meson python-any-r1
-IUSE=examples gtk-doc introspection test vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT LGPL-3+
-RDEPEND=>=x11-libs/gtk+-3.24.37:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v0.8.1.tar.gz -> gtk-layer-shell-0.8.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	56446e0ef4b4c9af0e2dd4cdef1a086e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=30253530da81c1d49d439a9ae4fa3f0e
diff --git a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.2 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.2
index ac4d470f48f1..41db8304d000 100644
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.2
+++ b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig x11-base/xorg-proto gtk-doc? ( dev-util/gtk-doc ) test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig x11-base/xorg-proto gtk-doc? ( dev-util/gtk-doc ) test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=x11-libs/gtk+-3.24.39:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
 DESCRIPTION=Library to create desktop components for Wayland using the Layer Shell protocol
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v0.8.2.tar.gz -> gtk-layer-shell-0.8.2.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	56446e0ef4b4c9af0e2dd4cdef1a086e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=b05560c4df0f39eb6ccf52713fc4f844
+_md5_=333a8e0adc087d87c03b605cd531266e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index af66a958e627..35d73e9d449f 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/freecad-0.20.2 b/metadata/md5-cache/media-gfx/freecad-0.20.2
index 4b4d65a32585..1ecff206aeed 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.20.2
+++ b/metadata/md5-cache/media-gfx/freecad-0.20.2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) )
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=8
 HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
@@ -9,10 +9,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 xdg
 IUSE=debug designer +gui test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud pcl +python_single_target_python3_10
 KEYWORDS=amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) inspection? ( points ) path? ( robot )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.20.2.tar.gz -> freecad-0.20.2.tar.gz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=743afd6c5dce03fa29ec9191dec0e963
+_md5_=0d29696c918512984e41b5e992d37e8a
diff --git a/metadata/md5-cache/media-gfx/freecad-0.20.2-r1 b/metadata/md5-cache/media-gfx/freecad-0.20.2-r1
index 6e510093cec1..5ad620bc771b 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.20.2-r1
+++ b/metadata/md5-cache/media-gfx/freecad-0.20.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 )
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=8
 HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
@@ -9,10 +9,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 xdg
 IUSE=debug designer +gui test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud netgen pcl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) designer? ( gui ) inspection? ( points ) path? ( robot )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.20.2.tar.gz -> freecad-0.20.2.tar.gz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bce221abbc9893861cafcd1f154ca95c
+_md5_=a02c3e9ebc9f0df9ad1066cd009b5e34
diff --git a/metadata/md5-cache/media-gfx/freecad-0.20.2-r2 b/metadata/md5-cache/media-gfx/freecad-0.20.2-r2
index a8c886bb8f82..f08148084edd 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.20.2-r2
+++ b/metadata/md5-cache/media-gfx/freecad-0.20.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) dev-qt/qttest:5 )
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=8
 HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
@@ -9,10 +9,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 xdg
 IUSE=debug designer +gui test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud netgen pcl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) gui? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-libs/coin-4.0.0 virtual/glu virtual/opengl python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) designer? ( gui ) inspection? ( points ) path? ( robot )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.20.2.tar.gz -> freecad-0.20.2.tar.gz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4eacfabc8503a9035c2190ed9b91b43a
+_md5_=6d5e2e5949489dd4cba87cddf206953a
diff --git a/metadata/md5-cache/media-gfx/freecad-0.21.2-r2 b/metadata/md5-cache/media-gfx/freecad-0.21.2-r2
index 9faaa7de2161..cc4f15623f9c 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.21.2-r2
+++ b/metadata/md5-cache/media-gfx/freecad-0.21.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) !qt6? ( dev-qt/qttest:5 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) !qt6? ( dev-qt/qttest:5 ) )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) !qt6? ( dev-qt/qttest:5 ) )
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=8
 HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
@@ -9,10 +9,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 qmake-utils xdg
 IUSE=debug designer +gui qt6 test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud netgen pcl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) designer? ( gui ) inspection? ( points ) path? ( robot )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.21.2.tar.gz -> freecad-0.21.2.tar.gz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=91c84098f7ebb1f6c2ba1260af601dd7
+_md5_=7acf7a40262c5aaa1b74a7ff1a3c79e2
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index cd2d94bb6c61..9bb92b6bcb31 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] ) !qt6? ( dev-qt/qttest:5 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] ) !qt6? ( dev-qt/qttest:5 ) )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] ) !qt6? ( dev-qt/qttest:5 ) )
 DESCRIPTION=QT based Computer Aided Design application
 EAPI=8
 HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
@@ -9,9 +9,9 @@ INHERIT=check-reqs cmake optfeature python-single-r1 qmake-utils xdg git-r3
 IUSE=debug designer +gui qt6 test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud netgen pcl python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=LGPL-2 CC-BY-SA-4.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( <sci-libs/vtk-9.3.0:=[qt5,rendering] ) qt6? ( <sci-libs/vtk-9.3.0:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) designer? ( gui ) inspection? ( points ) path? ( robot ) python_single_target_python3_12? ( gui? ( qt6 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=201195ba4c049b1ec54b4f125c83da18
+_md5_=4ee3c311ec6161066d8d55b5cba9d28d
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3994753ae1be..71615524495f 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/libjxl-0.10.2 b/metadata/md5-cache/media-libs/libjxl-0.10.2
index 8508ceb6353c..e7e726288378 100644
--- a/metadata/md5-cache/media-libs/libjxl-0.10.2
+++ b/metadata/md5-cache/media-libs/libjxl-0.10.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl/
 INHERIT=cmake-multilib flag-o-matic gnome2-utils
 IUSE=+gdk-pixbuf openexr test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= ) >=x11-misc/shared-mime-info-2.2
 RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.10.2.tar.gz -> libjxl-0.10.2.tar.gz test? ( https://github.com/libjxl/testdata/archive/ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz -> libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnome2-utils	30dbce54b89e77b86f366548f94419ad	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3a335738847dde450573ce7a69ce745b
+_md5_=db8a556e1182d96e0f3c0dfb124696a5
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a0435dc99c9e..9dda2a257db1 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/audacity-3.2.5-r1 b/metadata/md5-cache/media-sound/audacity-3.2.5-r1
deleted file mode 100644
index 1f394ac7fc4f..000000000000
--- a/metadata/md5-cache/media-sound/audacity-3.2.5-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-DESCRIPTION=Free crossplatform audio editor
-EAPI=8
-HOMEPAGE=https://www.audacityteam.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake wxwidgets xdg
-IUSE=alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg opus +portmixer sbsms twolame vamp +vorbis wavpack
-KEYWORDS=amd64 ~riscv
-LICENSE=GPL-2+ GPL-3 doc? ( CC-BY-3.0 ) audiocom? ( ZLIB )
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=mad? ( !mpg123 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/audacity/audacity/archive/Audacity-3.2.5.tar.gz doc? ( https://github.com/audacity/audacity-manual/releases/download/v3.2.5/audacity-manual-3.2.5.tar.gz ) audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d8e15d1bcb5ebb520579b3cbc6979c16
diff --git a/metadata/md5-cache/media-sound/audacity-3.4.2 b/metadata/md5-cache/media-sound/audacity-3.4.2
new file mode 100644
index 000000000000..5fae48275092
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-3.4.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame sys-apps/util-linux sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] alsa? ( media-libs/alsa-lib ) audiocom? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) test? ( <dev-cpp/catch-3:0 )
+DESCRIPTION=Free crossplatform audio editor
+EAPI=8
+HOMEPAGE=https://www.audacityteam.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake wxwidgets xdg virtualx
+IUSE=alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg opus +portmixer sbsms test twolame vamp +vorbis wavpack test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ GPL-3 audiocom? ( ZLIB )
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame sys-apps/util-linux sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] alsa? ( media-libs/alsa-lib ) audiocom? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/audacity/audacity/releases/download/Audacity-3.4.2/audacity-sources-3.4.2.tar.gz audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f5df9f565bf120863d4fbae727f49447
diff --git a/metadata/md5-cache/media-sound/audacity-9999 b/metadata/md5-cache/media-sound/audacity-9999
index 761386b9a580..881df2d9e057 100644
--- a/metadata/md5-cache/media-sound/audacity-9999
+++ b/metadata/md5-cache/media-sound/audacity-9999
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) test? ( <dev-cpp/catch-3:0 )
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame sys-apps/util-linux sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] alsa? ( media-libs/alsa-lib ) audiocom? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) test? ( <dev-cpp/catch-3:0 )
 DESCRIPTION=Free crossplatform audio editor
 EAPI=8
 HOMEPAGE=https://www.audacityteam.org/
@@ -9,10 +9,9 @@ INHERIT=cmake flag-o-matic wxwidgets xdg virtualx git-r3
 IUSE=alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg opus +portmixer sbsms test twolame vamp +vorbis wavpack test
 LICENSE=GPL-2+ GPL-3 audiocom? ( ZLIB )
 PROPERTIES=live
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=test? ( mpg123 )
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 dev-libs/rapidjson:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame sys-apps/util-linux sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] alsa? ( media-libs/alsa-lib ) audiocom? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e46daa8052cb60e2c924dca78bb5ab74
+_md5_=f25f815b231747af322b988d31f8d18a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index e74a4a2c8073..8f0ba2baafc2 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
deleted file mode 100644
index d58f7c899b1d..000000000000
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=v4l2 loopback device whose output is its own input
-EAPI=7
-HOMEPAGE=https://github.com/umlaeute/v4l2loopback
-INHERIT=linux-mod toolchain-funcs
-IUSE=examples dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/v0.12.5.tar.gz -> v4l2loopback-0.12.5.tar.gz
-_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod	000f3723e8e062061ee523106e69f84a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bf7ef71397d198f5d6fbe1643a4d55f5
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.13.1 b/metadata/md5-cache/media-video/v4l2loopback-0.13.1
new file mode 100644
index 000000000000..922050f5ca7f
--- /dev/null
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.13.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=v4l2 loopback device whose output is its own input
+EAPI=8
+HOMEPAGE=https://github.com/umlaeute/v4l2loopback
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1 toolchain-funcs
+IUSE=examples dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/v0.13.1.tar.gz -> v4l2loopback-0.13.1.tar.gz
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f241a22c0e7f8516f2acba3dd36b8d50
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index c36d88399a68..3cc48f6a2709 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 _eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=872addaedc1dc6aabb39afa816b4413d
+_md5_=f241a22c0e7f8516f2acba3dd36b8d50
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a610ab02c96b..128cbc6f39c7 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/djbdns-1.05-r39 b/metadata/md5-cache/net-dns/djbdns-1.05-r39
index ed10f33ff688..00ebe6b492ef 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r39
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r39
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Collection of DNS client/server software
 EAPI=8
 HOMEPAGE=https://cr.yp.to/djbdns.html
-INHERIT=readme.gentoo-r1 toolchain-funcs
+INHERIT=flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=ipv6 selinux
 KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=acct-user/dnscache acct-user/dnslog acct-user/tinydns sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test32.diff.xz )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6ae2e4a59d96083fada0d085582c6dc7
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8e5d51e9f5d3bb33e5fa1cfe86113248
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index f88a376023b6..b06ca3734063 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/fractal-6 b/metadata/md5-cache/net-im/fractal-6
index 5d54ebd8cd26..360dfbd8da0e 100644
--- a/metadata/md5-cache/net-im/fractal-6
+++ b/metadata/md5-cache/net-im/fractal-6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Fractal https://gitlab.gnome.org/World/fractal/
 INHERIT=cargo gnome2-utils meson
 IUSE=debug
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 arm64
 LICENSE=GPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB openssl
 RDEPEND=>=dev-libs/glib-2.72 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.4.0:1 >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=gui-libs/gtksourceview-5.0.0:5 >=media-video/pipewire-0.3.0:=[gstreamer] >=dev-libs/openssl-1.0.1:= >=media-libs/libshumate-1.0.0:1.0 >=dev-db/sqlite-3.24.0:3 >=sys-apps/xdg-desktop-portal-1.14.1 virtual/secret-service
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/fractal/-/archive/6/fractal-6.tar.bz2 https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://github.com/matrix-org/matrix-rust-sdk/archive/19526cea6bce133fc48904838956846aeb966dc6.tar.gz -> matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/fractal-6_beta-crates.tar.xz
 _eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	56446e0ef4b4c9af0e2dd4cdef1a086e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fa0b78cd73a62ee1005f84623bcce718
+_md5_=381d3f62aa44444a6797efaca2b78e4e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 61658ab550e1..465530968a8d 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/xmrig-6.21.1 b/metadata/md5-cache/net-misc/xmrig-6.21.1
index 341ab51c3c30..17cbd462fa9a 100644
--- a/metadata/md5-cache/net-misc/xmrig-6.21.1
+++ b/metadata/md5-cache/net-misc/xmrig-6.21.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
 INHERIT=cmake flag-o-matic systemd toolchain-funcs
 IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0 GPL-3+ MIT
 RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
 SRC_URI=https://github.com/xmrig/xmrig/archive/v6.21.1.tar.gz -> xmrig-6.21.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=40ff5cf97b9cf70219b0ff5066f6cb2c
+_md5_=5ac027bc30af9d5efb40fb4de37fb40c
diff --git a/metadata/md5-cache/net-misc/xmrig-6.21.2 b/metadata/md5-cache/net-misc/xmrig-6.21.2
new file mode 100644
index 000000000000..31403ead6156
--- /dev/null
+++ b/metadata/md5-cache/net-misc/xmrig-6.21.2
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= )
+DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
+EAPI=8
+HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
+INHERIT=cmake systemd
+IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 GPL-3+ MIT
+RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
+SLOT=0
+SRC_URI=https://github.com/xmrig/xmrig/archive/v6.21.2.tar.gz -> xmrig-6.21.2.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=625d61ca85ad2557a13aa02e104d5d8d
diff --git a/metadata/md5-cache/net-misc/xmrig-9999 b/metadata/md5-cache/net-misc/xmrig-9999
index 820323889864..1a34c6656a29 100644
--- a/metadata/md5-cache/net-misc/xmrig-9999
+++ b/metadata/md5-cache/net-misc/xmrig-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/op
 DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
 EAPI=8
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
-INHERIT=cmake flag-o-matic systemd toolchain-funcs git-r3
+INHERIT=cmake systemd git-r3
 IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
 LICENSE=Apache-2.0 GPL-3+ MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1902a5bb7a9c0e76912f6c07ab3d83a5
+_md5_=625d61ca85ad2557a13aa02e104d5d8d
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 6f7eeef7c87f..0d31d8e6d011 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-4.2.3 b/metadata/md5-cache/net-nntp/sabnzbd-4.2.3
new file mode 100644
index 000000000000..adda8a51a515
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-4.2.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] >=dev-python/tavern-2[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest-mock[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] >=dev-python/tavern-2[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/flaky[python_targets_python3_12(-)] >=dev-python/lxml-4.5.0[python_targets_python3_12(-)] dev-python/pyfakefs[python_targets_python3_12(-)] dev-python/pytest-httpbin[python_targets_python3_12(-)] dev-python/pytest-httpserver[python_targets_python3_12(-)] dev-python/pytest-mock[python_targets_python3_12(-)] dev-python/pytest[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/selenium[python_targets_python3_12(-)] dev-python/tavalidate[python_targets_python3_12(-)] >=dev-python/tavern-2[python_targets_python3_12(-)] dev-python/werkzeug[python_targets_python3_12(-)] dev-python/xmltodict[python_targets_python3_12(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
+DEFINED_PHASES=install postinst setup test
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_10(-)] >=dev-python/guessit-3.7.1[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_11(-)] >=dev-python/guessit-3.7.1[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/chardet[python_targets_python3_12(-)] dev-python/cheetah3[python_targets_python3_12(-)] dev-python/cherrypy[python_targets_python3_12(-)] dev-python/configobj[python_targets_python3_12(-)] dev-python/cryptography[python_targets_python3_12(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_12(-)] >=dev-python/guessit-3.7.1[python_targets_python3_12(-)] dev-python/notify2[python_targets_python3_12(-)] dev-python/portend[python_targets_python3_12(-)] dev-python/puremagic[python_targets_python3_12(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_12(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=8
+HOMEPAGE=https://sabnzbd.org/
+INHERIT=optfeature python-single-r1 systemd
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_10(-)] >=dev-python/guessit-3.7.1[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_11(-)] >=dev-python/guessit-3.7.1[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/chardet[python_targets_python3_12(-)] dev-python/cheetah3[python_targets_python3_12(-)] dev-python/cherrypy[python_targets_python3_12(-)] dev-python/configobj[python_targets_python3_12(-)] dev-python/cryptography[python_targets_python3_12(-)] >=dev-python/feedparser-6.0.11[python_targets_python3_12(-)] >=dev-python/guessit-3.7.1[python_targets_python3_12(-)] dev-python/notify2[python_targets_python3_12(-)] dev-python/portend[python_targets_python3_12(-)] dev-python/puremagic[python_targets_python3_12(-)] ~dev-python/sabctools-8.1.0[python_targets_python3_12(-)] ) || ( >=app-arch/par2cmdline-0.8 >=app-arch/par2cmdline-turbo-1.1.0 ) net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/4.2.3/SABnzbd-4.2.3-src.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=efbde5c9e02d146cf297905b767fdfee
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 1709cb4a444e..7b1dadae68db 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.10 b/metadata/md5-cache/sci-electronics/kicad-7.0.10
index b5e89fe90de5..76437d160521 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.10
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.10
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.10/kicad-7.0.10.tar.bz2 -> kicad-7.0.10.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=833888cc5fba8a284e4b9f2150ec3b20
+_md5_=347b80d168a82f86ccc2a5b1fcc86b69
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.11 b/metadata/md5-cache/sci-electronics/kicad-7.0.11
index 936285ba110a..85f76f6cece6 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.11
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.11
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.11/kicad-7.0.11.tar.bz2 -> kicad-7.0.11.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b259f3297dcc0d1d36a8362e6f55e24a
+_md5_=14e5217171205ebd53d75366b4725616
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-7.0.7
index e5d8d29f7d70..5236d74e9155 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.7
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.7/kicad-7.0.7.tar.bz2 -> kicad-7.0.7.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a21c3f9f153a07d4423fe1f2950e514c
+_md5_=3c023e1675306adabbfb33841ded001a
diff --git a/metadata/md5-cache/sci-electronics/kicad-8.0.0 b/metadata/md5-cache/sci-electronics/kicad-8.0.0
index 389e02ba277b..9ead32cf9f6d 100644
--- a/metadata/md5-cache/sci-electronics/kicad-8.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-8.0.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp telemetry test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/8.0.0/kicad-8.0.0.tar.bz2 -> kicad-8.0.0.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41aaa81c598684c382b10b9b52859a50
+_md5_=6272b1d36bd6fb04edf1e5001927e423
diff --git a/metadata/md5-cache/sci-electronics/kicad-8.0.1 b/metadata/md5-cache/sci-electronics/kicad-8.0.1
index 034b2336e2c3..0919b3636a24 100644
--- a/metadata/md5-cache/sci-electronics/kicad-8.0.1
+++ b/metadata/md5-cache/sci-electronics/kicad-8.0.1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,10 +8,10 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp telemetry test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/8.0.1/kicad-8.0.1.tar.bz2 -> kicad-8.0.1.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41aaa81c598684c382b10b9b52859a50
+_md5_=6272b1d36bd6fb04edf1e5001927e423
diff --git a/metadata/md5-cache/sci-electronics/kicad-9999 b/metadata/md5-cache/sci-electronics/kicad-9999
index 14a4371e014f..df54d3e1d0ad 100644
--- a/metadata/md5-cache/sci-electronics/kicad-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) >=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
+DEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,9 +8,9 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples nls openmp telemetry test python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
 PROPERTIES=live
-RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
+RDEPEND=app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.5.0:0= <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext ) test? ( media-gfx/cairosvg ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41aaa81c598684c382b10b9b52859a50
+_md5_=6272b1d36bd6fb04edf1e5001927e423
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index f6b6af1c314c..4ce784687779 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/opencascade-7.6.3-r2 b/metadata/md5-cache/sci-libs/opencascade-7.6.3-r2
index d95b527e31dc..36104aaa4087 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.3-r2
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-text/doxygen[dot] ) examples? ( dev-qt/linguist-tools:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
+DEPEND=dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
 DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=8
 HOMEPAGE=https://www.opencascade.com
@@ -8,10 +8,10 @@ INHERIT=cmake
 IUSE=doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
+RDEPEND=dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 REQUIRED_USE=?? ( optimize tbb )
 RESTRICT=test
 SLOT=0/7.6
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=b079fb9877ef64d4a8158a60fa157f59b096debb;sf=tgz -> opencascade-7.6.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=af1bf26e33962ee4c72f28eccf6435ea
+_md5_=4ec2b15541ab96aba696f53af5782111
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.7.0-r2 b/metadata/md5-cache/sci-libs/opencascade-7.7.0-r2
index aae6da9ea0e1..faa2643ce268 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.7.0-r2
+++ b/metadata/md5-cache/sci-libs/opencascade-7.7.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-text/doxygen ) examples? ( dev-qt/linguist-tools:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) x11-base/xorg-proto json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
+DEPEND=dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) x11-base/xorg-proto json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
 DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=8
 HOMEPAGE=https://www.opencascade.com
@@ -8,10 +8,10 @@ INHERIT=cmake
 IUSE=doc examples ffmpeg freeimage gles2 json optimize tbb vtk
 KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
+RDEPEND=dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 REQUIRED_USE=?? ( optimize tbb )
 RESTRICT=test
 SLOT=0/7.7
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> opencascade-7.7.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=91117f0068a5c2b46d80751941e4f30b
+_md5_=ea8eca9ce43d5615af601658dc59a0e7
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.7.1 b/metadata/md5-cache/sci-libs/opencascade-7.7.1
new file mode 100644
index 000000000000..a430a76f4087
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/opencascade-7.7.1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/doxygen[dot] ) gui? ( examples? ( dev-qt/linguist-tools:5 ) ) test? ( dev-tcltk/thread ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) ) X? ( x11-base/xorg-proto ) json? ( dev-libs/rapidjson )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=8
+HOMEPAGE=https://www.opencascade.com
+INHERIT=cmake virtualx
+IUSE=X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) )
+REQUIRED_USE=?? ( optimize tbb ) ?? ( opengl gles2-only ) test? ( freeimage json opengl )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/7.7
+SRC_URI=test? ( https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_7_0/opencascade-dataset-7.7.0.tgz -> opencascade-dataset-7.7.0.tar.gz ) https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_7_1.tar.gz -> opencascade-7.7.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2d31ef2dc1760aa716ada0da697dc5cd
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.7.2 b/metadata/md5-cache/sci-libs/opencascade-7.7.2
new file mode 100644
index 000000000000..2ddf1ab42976
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/opencascade-7.7.2
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/doxygen[dot] ) gui? ( examples? ( dev-qt/linguist-tools:5 ) ) test? ( dev-tcltk/thread ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) ) X? ( x11-base/xorg-proto ) json? ( dev-libs/rapidjson )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=8
+HOMEPAGE=https://www.opencascade.com
+INHERIT=cmake virtualx
+IUSE=X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) )
+REQUIRED_USE=?? ( optimize tbb ) ?? ( opengl gles2-only ) test? ( freeimage json opengl )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/7.7
+SRC_URI=test? ( https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_7_0/opencascade-dataset-7.7.0.tgz -> opencascade-dataset-7.7.0.tar.gz ) https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_7_2.tar.gz -> opencascade-7.7.2.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2d31ef2dc1760aa716ada0da697dc5cd
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.8.0 b/metadata/md5-cache/sci-libs/opencascade-7.8.0
new file mode 100644
index 000000000000..b75987c25e00
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/opencascade-7.8.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/doxygen[dot] ) gui? ( examples? ( dev-qt/linguist-tools:5 ) ) test? ( dev-tcltk/thread ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) ) X? ( x11-base/xorg-proto ) json? ( dev-libs/rapidjson )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=8
+HOMEPAGE=https://www.opencascade.com
+INHERIT=cmake virtualx
+IUSE=X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) )
+REQUIRED_USE=?? ( optimize tbb ) ?? ( opengl gles2-only ) test? ( freeimage json opengl )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/7.8
+SRC_URI=test? ( https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_8_0/opencascade-dataset-7.8.0.tar.xz ) https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_8_0.tar.gz -> opencascade-7.8.0.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cd7e98fa58020498da15113b95940177
diff --git a/metadata/md5-cache/sci-libs/opencascade-9999 b/metadata/md5-cache/sci-libs/opencascade-9999
new file mode 100644
index 000000000000..fcbbf5f68d4c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/opencascade-9999
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/doxygen[dot] ) gui? ( examples? ( dev-qt/linguist-tools:5 ) ) test? ( dev-tcltk/thread ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) ) X? ( x11-base/xorg-proto ) json? ( dev-libs/rapidjson )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=8
+HOMEPAGE=https://www.opencascade.com
+INHERIT=cmake virtualx git-r3
+IUSE=X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk test
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+PROPERTIES=live
+RDEPEND=dev-lang/tcl:= tk? ( dev-lang/tk:= ) dev-libs/double-conversion freetype? ( media-libs/fontconfig media-libs/freetype:2 ) opengl? ( media-libs/libglvnd ) X? ( x11-libs/libX11 ) gui? ( examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] tbb? ( sci-libs/vtk:=[tbb,-cuda] ) )
+REQUIRED_USE=?? ( optimize tbb ) ?? ( opengl gles2-only ) test? ( freeimage json opengl )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/9999
+SRC_URI=test? ( https://github.com/Open-Cascade-SAS/OCCT/releases/download/V7_8_0/opencascade-dataset-7.8.0.tar.xz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cd7e98fa58020498da15113b95940177
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c981d861620e..858d58d1f32e 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.13.0 b/metadata/md5-cache/sci-mathematics/z3-4.13.0
index d572e0534b48..2271f331451d 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.13.0
+++ b/metadata/md5-cache/sci-mathematics/z3-4.13.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0/4.13
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.13.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ea3108a7c8e6916421c209677a7f796e
+_md5_=f3c5373562feb07de49e85e1312416ee
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2fcd64755f61..60b5d858a543 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/clang-15.0.7-r3 b/metadata/md5-cache/sys-devel/clang-15.0.7-r3
index 8f5575785d68..7ae6fc488527 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r3
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 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-r3.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0cfa18df83fe6dbdb4b88a03144ddd6e
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.6 b/metadata/md5-cache/sys-devel/clang-16.0.6
index 7371b9135217..6698cd48847d 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.6
+++ b/metadata/md5-cache/sys-devel/clang-16.0.6
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.4-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-16.0.6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1158b07108b5a7292be9386b837041cb
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.6 b/metadata/md5-cache/sys-devel/clang-17.0.6
index e89c9d6465e3..6cd05221648e 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.6
+++ b/metadata/md5-cache/sys-devel/clang-17.0.6
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-17.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-17.0.6-r1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1d927d777a1051f5f550b559cea488cc
diff --git a/metadata/md5-cache/sys-devel/clang-18.1.0 b/metadata/md5-cache/sys-devel/clang-18.1.0
deleted file mode 100644
index cdcbf2738ba3..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.1.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) test? ( ~sys-devel/lld-18.1.0 ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) doc? ( python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.1.0:18=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.0[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils multilib multilib-minimal prefix python-single-r1 toolchain-funcs
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-18.1.0 sys-devel/clang-toolchain-symlinks:18
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ~sys-devel/llvm-18.1.0:18=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-18.1.0 llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.0[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( 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=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26b7400308e5295314038a0bb29924b7
diff --git a/metadata/md5-cache/sys-devel/clang-18.1.2 b/metadata/md5-cache/sys-devel/clang-18.1.2
index 3574f2848147..3b560b4a40e4 100644
--- a/metadata/md5-cache/sys-devel/clang-18.1.2
+++ b/metadata/md5-cache/sys-devel/clang-18.1.2
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=18/18.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26b7400308e5295314038a0bb29924b7
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0.9999 b/metadata/md5-cache/sys-devel/clang-19.0.0.9999
index 781049ec4fcd..938f19d03878 100644
--- a/metadata/md5-cache/sys-devel/clang-19.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-19.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( 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=19/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7bdad6ff84e1dbb71fadd365cedb0a10
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240302
deleted file mode 100644
index d749cfe2a9e2..000000000000
--- a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240302
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) test? ( ~sys-devel/lld-19.0.0_pre20240302 ) xml? ( virtual/pkgconfig ) python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240302:19=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils multilib multilib-minimal prefix python-single-r1 toolchain-funcs
-IUSE=+debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-19.0.0_pre20240302 sys-devel/clang-toolchain-symlinks:19
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ~sys-devel/llvm-19.0.0_pre20240302:19=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-19.0.0_pre20240302 llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240302[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( 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=19/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bdad6ff84e1dbb71fadd365cedb0a10
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240309
deleted file mode 100644
index d00cc4720091..000000000000
--- a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240309
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) test? ( ~sys-devel/lld-19.0.0_pre20240309 ) xml? ( virtual/pkgconfig ) python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240309:19=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils multilib multilib-minimal prefix python-single-r1 toolchain-funcs
-IUSE=+debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-19.0.0_pre20240309 sys-devel/clang-toolchain-symlinks:19
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ~sys-devel/llvm-19.0.0_pre20240309:19=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-19.0.0_pre20240309 llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240309[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( 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=19/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bdad6ff84e1dbb71fadd365cedb0a10
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240316 b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240316
index 4ed92b7d276c..a8b3d968671f 100644
--- a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240316
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=19/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7bdad6ff84e1dbb71fadd365cedb0a10
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r7 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r7
index 54cd9ab41a84..e622caf27d16 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r7
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 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_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=b8d8a9feb440808a47d98c14a23239d8
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.6-r2 b/metadata/md5-cache/sys-devel/clang-common-16.0.6-r2
index 87020ac813c8..4c015b78d43d 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.6-r2
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.6-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.6[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=3a5666121e39422d520151ab3d077b32
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.6-r1 b/metadata/md5-cache/sys-devel/clang-common-17.0.6-r1
index fb3e7807b9f3..089281ff6771 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.6[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=c92da01f2c03235b2f045c356a327a7a
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.1.0 b/metadata/md5-cache/sys-devel/clang-common-18.1.0
deleted file mode 100644
index 10bd49c18903..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix hardened llvm-libunwind verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-18.1.0[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=32bb8a32dc3ee01727c2582ccf0ae83c
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.1.2 b/metadata/md5-cache/sys-devel/clang-common-18.1.2
index 7fa489af3150..165d6c9caf3a 100644
--- a/metadata/md5-cache/sys-devel/clang-common-18.1.2
+++ b/metadata/md5-cache/sys-devel/clang-common-18.1.2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-18.1.2[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=32bb8a32dc3ee01727c2582ccf0ae83c
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-19.0.0.9999
index 6854fa3529cb..008075fb25c1 100644
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-19.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0.9999[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=adc4d6fd595603c631e3d60fcb37a373
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240302
deleted file mode 100644
index ce4a6d31259c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240302
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix hardened llvm-libunwind
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240302[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=adc4d6fd595603c631e3d60fcb37a373
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240309
deleted file mode 100644
index 98c156209094..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240309
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix hardened llvm-libunwind
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240309[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=adc4d6fd595603c631e3d60fcb37a373
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240316 b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240316
index d923360482e1..07130187c5fa 100644
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240316
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240316[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=adc4d6fd595603c631e3d60fcb37a373
diff --git a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-16 b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-16
index 95e72ea6a6f2..b0e3c3494e4b 100644
--- a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-16
+++ b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-16
@@ -5,7 +5,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=crossdev
 KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos
 LICENSE=public-domain
-RDEPEND=sys-devel/clang:16
+RDEPEND=sys-devel/clang:16 sys-devel/lld:16
 SLOT=16
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c075d67a20c99e857750f08d82418d74
+_md5_=c269caf49f27fc91358a318e009dd021
diff --git a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-17 b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-17
index 9595e7d79396..054a9a48e80a 100644
--- a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-17
+++ b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-17
@@ -5,7 +5,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=crossdev
 KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos
 LICENSE=public-domain
-RDEPEND=sys-devel/clang:17
+RDEPEND=sys-devel/clang:17 sys-devel/lld:17
 SLOT=17
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b309d71d13e461f0bd2db8bef08e2e6b
+_md5_=aba95fee70d52a351240d0b10276b3b0
diff --git a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-18 b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-18
index b2a5f5bcc101..c2ecf20f74a7 100644
--- a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-18
+++ b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-18
@@ -5,7 +5,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=crossdev
 LICENSE=public-domain
 PROPERTIES=live
-RDEPEND=sys-devel/clang:18
+RDEPEND=sys-devel/clang:18 sys-devel/lld:18
 SLOT=18
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6361e4affcd533d4ae41d5f55bca00b6
+_md5_=76d5eeee16fac71fe1ee3388b07880bf
diff --git a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-19 b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-19
index 043c7f5dd34a..95951919c7aa 100644
--- a/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-19
+++ b/metadata/md5-cache/sys-devel/clang-crossdev-wrappers-19
@@ -5,7 +5,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=crossdev
 LICENSE=public-domain
 PROPERTIES=live
-RDEPEND=sys-devel/clang:19
+RDEPEND=sys-devel/clang:19 sys-devel/lld:19
 SLOT=19
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a59c62146716277ceaf5cb1756a56342
+_md5_=76d5eeee16fac71fe1ee3388b07880bf
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.1.0 b/metadata/md5-cache/sys-devel/clang-runtime-18.1.0
deleted file mode 100644
index 1b2486793787..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-18.1.0:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.1.0:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-18.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=18
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=160fc06fc8f87413c2a65cf179524b62
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240302
deleted file mode 100644
index f582fa6c4429..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240302
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-19.0.0_pre20240302:19[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-19.0.0_pre20240302:19[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240302[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-19.0.0_pre20240302[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=19
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f4e85250deef580e6b36d286de5a556e
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240309
deleted file mode 100644
index a015bedcc896..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240309
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-19.0.0_pre20240309:19[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-19.0.0_pre20240309:19[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240309[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-19.0.0_pre20240309[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=19
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f4e85250deef580e6b36d286de5a556e
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 8366de835010..5cce68919d49 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	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f22d6c95adc279983bb33d8f95134d83
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.6 b/metadata/md5-cache/sys-devel/lld-16.0.6
index dc571766eda8..8948472cc9b3 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.6
+++ b/metadata/md5-cache/sys-devel/lld-16.0.6
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-16.0.6[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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-16.0.6-r1.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3cfaf0eb2b7af03eb59e054216545291
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.6 b/metadata/md5-cache/sys-devel/lld-17.0.6
index 9914282a6549..03a28d5bd90b 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.6
+++ b/metadata/md5-cache/sys-devel/lld-17.0.6
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-17.0.6[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zs
 RESTRICT=!test? ( test )
 SLOT=17/17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=01cc6c571493e52c688bac068529ea21
diff --git a/metadata/md5-cache/sys-devel/lld-18.1.0 b/metadata/md5-cache/sys-devel/lld-18.1.0
deleted file mode 100644
index 5a8664334457..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/llvm:18 test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-18.1.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.1.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.1.0[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.1.0[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=debug test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:18
-RDEPEND=~sys-devel/llvm-18.1.0[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=afac5136a754bdf8a537a3da950aa828
diff --git a/metadata/md5-cache/sys-devel/lld-18.1.2 b/metadata/md5-cache/sys-devel/lld-18.1.2
index ee0214eaefaa..b208a8fcb554 100644
--- a/metadata/md5-cache/sys-devel/lld-18.1.2
+++ b/metadata/md5-cache/sys-devel/lld-18.1.2
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-18.1.2[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zs
 RESTRICT=!test? ( test )
 SLOT=18/18.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=afac5136a754bdf8a537a3da950aa828
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0.9999 b/metadata/md5-cache/sys-devel/lld-19.0.0.9999
index cc9ede4cf0cb..c12393c21dab 100644
--- a/metadata/md5-cache/sys-devel/lld-19.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-19.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-19.0.0.9999[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test )
 SLOT=19/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5abc5c2616e616caea79d334d75942dd
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240302
deleted file mode 100644
index 96e99ea2a0f8..000000000000
--- a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:19 test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-19.0.0_pre20240302[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-19.0.0_pre20240302[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-19.0.0_pre20240302[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240302[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+debug test zstd
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:19
-RDEPEND=~sys-devel/llvm-19.0.0_pre20240302[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5abc5c2616e616caea79d334d75942dd
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240309
deleted file mode 100644
index 5fe0ba25c804..000000000000
--- a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:19 test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-19.0.0_pre20240309[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-19.0.0_pre20240309[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-19.0.0_pre20240309[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240309[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+debug test zstd
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:19
-RDEPEND=~sys-devel/llvm-19.0.0_pre20240309[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5abc5c2616e616caea79d334d75942dd
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240316 b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240316
index aa3cc1dd5106..022be09598d0 100644
--- a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240316
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-19.0.0_pre20240316[debug=,zstd=] sys-libs/zlib:= zstd? (
 RESTRICT=!test? ( test )
 SLOT=19/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5abc5c2616e616caea79d334d75942dd
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7-r3 b/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
index c66314340d12..25d9379b27e3 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!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 ) !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-r3.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3fb9fa999b0df84ad86a270e3323110f
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.6 b/metadata/md5-cache/sys-devel/llvm-16.0.6
index 209e6e0cdbf6..84f9b20c5f00 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.6
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.4-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-16.0.6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25a618142824e1194690c95b09a87873
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.6 b/metadata/md5-cache/sys-devel/llvm-17.0.6
index 0350e56fad60..a0555d91b6f5 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.6
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-17.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-17.0.6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ac00f1c9793f7580130fc64f155dfcf8
diff --git a/metadata/md5-cache/sys-devel/llvm-18.1.0 b/metadata/md5-cache/sys-devel/llvm-18.1.0
deleted file mode 100644
index 8249b5fa981a..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.1.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-18.1.0.9999 ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) doc? ( || ( ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug debuginfod doc exegesis libedit +libffi ncurses test xml z3 zstd doc 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 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:18 binutils-plugin? ( >=sys-devel/llvmgold-18 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=02e645e8e4ebf0afff443ff34fab2d45
diff --git a/metadata/md5-cache/sys-devel/llvm-18.1.2 b/metadata/md5-cache/sys-devel/llvm-18.1.2
index 2182990b3658..c94e2b09e545 100644
--- a/metadata/md5-cache/sys-devel/llvm-18.1.2
+++ b/metadata/md5-cache/sys-devel/llvm-18.1.2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=18/18.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=02e645e8e4ebf0afff443ff34fab2d45
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-19.0.0.9999
index ed8f19d4b0d0..599e2d979a53 100644
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-19.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 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=19/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=19279e10da3d2f9d96b8e7e37d2c7b2d
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240302
deleted file mode 100644
index b6f20146ad9f..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240302
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-19.0.0.9999 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin +debug debuginfod doc exegesis libedit +libffi ncurses test xml z3 zstd doc 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:19 binutils-plugin? ( >=sys-devel/llvmgold-19 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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=19/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=19279e10da3d2f9d96b8e7e37d2c7b2d
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240309
deleted file mode 100644
index e05c2bc26563..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240309
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-19.0.0.9999 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin +debug debuginfod doc exegesis libedit +libffi ncurses test xml z3 zstd doc 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:19 binutils-plugin? ( >=sys-devel/llvmgold-19 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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=19/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=19279e10da3d2f9d96b8e7e37d2c7b2d
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240316 b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240316
index 108670886ae6..f7a8a86f73b4 100644
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240316
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=19/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=19279e10da3d2f9d96b8e7e37d2c7b2d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index 96b255afa231..ab045b2800dd 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 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_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=74bab60d2fd440b3b3d43e776eebe06a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.6 b/metadata/md5-cache/sys-devel/llvm-common-16.0.6
index 31300026278a..48a741d4a489 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=abad9fd7bcfc6952a896f67d449a3ac1
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.6 b/metadata/md5-cache/sys-devel/llvm-common-17.0.6
index fdcde7a68acb..bf88f22d883d 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=577f58d99e8d65307eb001bec5185f02
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.1.0 b/metadata/md5-cache/sys-devel/llvm-common-18.1.0
deleted file mode 100644
index fb94285bd82e..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=d69cb8f9a981cbbea91eb25f4cc59177
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.1.2 b/metadata/md5-cache/sys-devel/llvm-common-18.1.2
index 6db9c9bc0f66..393afd8f55fe 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-18.1.2
+++ b/metadata/md5-cache/sys-devel/llvm-common-18.1.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=d69cb8f9a981cbbea91eb25f4cc59177
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0.9999
index 9d7643bb84a4..25bdb48ab4f9 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-19.0.0.9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
 _md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240302 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240302
deleted file mode 100644
index deeb6b1fa2df..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240302
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240309 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240309
deleted file mode 100644
index bec94c0ee2cc..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240309
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240316 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240316
index 09ecdf03bb0d..8c1d48730378 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240316
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	db28f058af6c7a9b83b7af79281b5774	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
 _md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 38ad59098c66..096834fdc6ec 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.10 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.10
deleted file mode 100644
index 2c77da73393b..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=prepare
-DEPEND=>=sys-fs/fuse-3:=
-DESCRIPTION=FUSE implementation for overlayfs
-EAPI=8
-HOMEPAGE=https://github.com/containers/fuse-overlayfs
-INHERIT=autotools
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/fuse-3:=
-SLOT=0
-SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.10.tar.gz -> fuse-overlayfs-1.10.tar.gz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=667977975268e0c7978beed22a3e86d1
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.11 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.11
deleted file mode 100644
index 7bb492f35c83..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=prepare
-DEPEND=sys-fs/fuse:3
-DESCRIPTION=FUSE implementation for overlayfs
-EAPI=8
-HOMEPAGE=https://github.com/containers/fuse-overlayfs
-INHERIT=autotools
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv
-LICENSE=GPL-3
-RDEPEND=sys-fs/fuse:3
-SLOT=0
-SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.11.tar.gz -> fuse-overlayfs-1.11.tar.gz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2be364c737cdb1d1843d23ce5314fbdd
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.13 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.13
index 83ea6942e9fa..66dc1fb58c8f 100644
--- a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.13
+++ b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.13
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=prepare
+DEFINED_PHASES=prepare pretend
 DEPEND=sys-fs/fuse:3
 DESCRIPTION=FUSE implementation for overlayfs
 EAPI=8
@@ -11,4 +11,4 @@ RDEPEND=sys-fs/fuse:3
 SLOT=0
 SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.13.tar.gz -> fuse-overlayfs-1.13.tar.gz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bfd4ed9d68636279e25568a8d0680785
+_md5_=e81e6b0116c893572f9221cc0bd26bbe
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.7.1 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.7.1
deleted file mode 100644
index 3e0d87b538ec..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=prepare
-DEPEND=>=sys-fs/fuse-3:=
-DESCRIPTION=FUSE implementation for overlayfs
-EAPI=7
-HOMEPAGE=https://github.com/containers/fuse-overlayfs
-INHERIT=autotools
-KEYWORDS=amd64 arm64 ~ppc64
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/fuse-3:=
-SLOT=0
-SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.7.1.tar.gz -> fuse-overlayfs-1.7.1.tar.gz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=70939a4a4f9840542bafb8c0a3278d32
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 57cb3c620e1c..7ae528e923a2 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-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 4ac9544c3112..5cb45ae05d93 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	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=704d950e9cdfed4a67d55c707a7db129
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.6
index 4ba8f0a8e839..2fcaea757088 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.6
@@ -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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9dbdbb0a42f87edcd5e64cdaff7329e4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.6-r4 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.6-r4
index 875036ee7f2a..5bec257ff637 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.6-r4
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.6-r4
@@ -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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-16.0.6-r4.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cbf62a2e9a77364e78a667b10382d57e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.6
index b6c1c07d11b5..0133b7e4d408 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-17.0.6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4dc755137ee1f67fc375f9e2f0f8a0f1
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-18.1.0
deleted file mode 100644
index 61b751235a2a..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-18.1.0*:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=18
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1aa90190ecbc9e9bc420679d4f978d3d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.1.2 b/metadata/md5-cache/sys-libs/compiler-rt-18.1.2
index 863ee163a601..b8e22fc5735f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.1.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-18.1.2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=18
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1aa90190ecbc9e9bc420679d4f978d3d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0.9999
index 6930b3e07d73..0497c69ece01 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-19.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=19
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a218b63277d63e812d0640d18ea924a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240302
deleted file mode 100644
index 91c883927dac..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240302
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a218b63277d63e812d0640d18ea924a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240309
deleted file mode 100644
index 38ee0f944189..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240309
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a218b63277d63e812d0640d18ea924a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240316
index 45ee8fbd4c57..256418895e87 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240316
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=19
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a218b63277d63e812d0640d18ea924a
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 cbacf6a533a5..cfa61e6bb22b 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	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c8981bb60f4a2681377d1b30e49600d6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.6
index 51c3e28bb762..205621a9ef09 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.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=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9dee7cde1fca09c3a59eaeb050aacce9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.6
index ce912602f7aa..98f07f3783c9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.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=17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f1c9603ed6e27e64e90710dcb7bf34bd
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.0
deleted file mode 100644
index 75da3eaf2a6a..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-18.1.0*:18 sys-libs/compiler-rt:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=18
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ad78087b0ab392d52fa5fe8bdb67877d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.2
index 682c1500f5a9..3f26354dc24f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.2
@@ -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=18
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad78087b0ab392d52fa5fe8bdb67877d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0.9999
index bd6087d36654..10b729ff4a49 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.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=19
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fb686ec3d08b2b18e9ae4be59f1c38e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240302
deleted file mode 100644
index 4e5b5443e9cd..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240302
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 sys-libs/compiler-rt:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fb686ec3d08b2b18e9ae4be59f1c38e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240309
deleted file mode 100644
index e99f4af00c2f..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240309
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 sys-libs/compiler-rt:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fb686ec3d08b2b18e9ae4be59f1c38e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240316
index 39fb21607d08..a1cbca744b0b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240316
@@ -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=19
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fb686ec3d08b2b18e9ae4be59f1c38e3
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 94392146b4ca..dce03d58d046 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	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cbab90e17c99591e90cb17c654e53eed
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.6 b/metadata/md5-cache/sys-libs/libcxx-16.0.6
index 8f2444fe8f31..b65a046d3a49 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.6
@@ -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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-16.0.6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=524a7f80481620ff445d73b26d915a81
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.6 b/metadata/md5-cache/sys-libs/libcxx-17.0.6
index de98ab05cab5..58e1cbe82ae6 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=42f3711bc0f6f7740ca6763a0a64c267
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.1.0 b/metadata/md5-cache/sys-libs/libcxx-18.1.0
deleted file mode 100644
index 5479ff459109..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.1.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:18
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.1.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=745bc558cf73e1543da6e2e14bff129f
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.1.2 b/metadata/md5-cache/sys-libs/libcxx-18.1.2
index a026c9763c6a..a857800cfb6d 100644
--- a/metadata/md5-cache/sys-libs/libcxx-18.1.2
+++ b/metadata/md5-cache/sys-libs/libcxx-18.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=745bc558cf73e1543da6e2e14bff129f
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-19.0.0.9999
index b7520ad4c5df..83711ed11b49 100644
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=464012e4a495040cfdb9f7393842ade9
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240302
deleted file mode 100644
index 8cdd3db83140..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240302[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:19
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240302[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=464012e4a495040cfdb9f7393842ade9
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240309
deleted file mode 100644
index 59eccddaa623..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240309[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:19
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240309[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=464012e4a495040cfdb9f7393842ade9
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240316
index 6fb95f7b019d..405150aac184 100644
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=464012e4a495040cfdb9f7393842ade9
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index d451d1d670a9..afec6de7aa9c 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	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a14a31a2f90e26640f635cc72061d383
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.6
index c554e4fcc408..8b80290f0cd3 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.6
@@ -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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c72a7ac64229d8667b1e3e2d049a040d
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.6
index e27bf8ea8699..2040cb3ef750 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.6
@@ -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-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3b57907f3580ac85f038cd73d40bce69
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.1.0 b/metadata/md5-cache/sys-libs/libcxxabi-18.1.0
deleted file mode 100644
index ef8463c074c4..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:18
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=406c06e2acccee230942ffa11c7c151e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.1.2 b/metadata/md5-cache/sys-libs/libcxxabi-18.1.2
index a3021f6b3b61..4adb886bb73a 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.1.2
+++ b/metadata/md5-cache/sys-libs/libcxxabi-18.1.2
@@ -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-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=406c06e2acccee230942ffa11c7c151e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0.9999
index e735055a841c..e5fb8b2f888a 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-19.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	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=17cf65aa8d5f9bfa01840d9af26e56de
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240302
deleted file mode 100644
index 29deb07cc05a..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:19
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17cf65aa8d5f9bfa01840d9af26e56de
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240309
deleted file mode 100644
index a5d8f90261a7..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:19
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17cf65aa8d5f9bfa01840d9af26e56de
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240316
index 7062465f8c8e..2c0439c36a28 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=17cf65aa8d5f9bfa01840d9af26e56de
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r6 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r6
index 771936d17641..ecb445ea4a1a 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r6
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r6
@@ -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 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r6.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3404a7460de7445a128bdc2eb7d5bce6
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.6 b/metadata/md5-cache/sys-libs/libomp-16.0.6
index 52bc7469fdbe..f8f9f9cffdfc 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.6
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8d37363d5c4510e263ab7f7364e0c990
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.6 b/metadata/md5-cache/sys-libs/libomp-17.0.6
index 5f922ba65690..3267f05365ca 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.6
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c785d7bf110fb69f99fd2d30c5d8efb1
diff --git a/metadata/md5-cache/sys-libs/libomp-18.1.0 b/metadata/md5-cache/sys-libs/libomp-18.1.0
deleted file mode 100644
index 4d5c6e5bb40d..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-18.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org llvm-utils python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-18.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
-RESTRICT=!test? ( test )
-SLOT=0/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4394f69e3d3fcc8daf700a69a6fa8e0b
diff --git a/metadata/md5-cache/sys-libs/libomp-18.1.2 b/metadata/md5-cache/sys-libs/libomp-18.1.2
index 3e6fdb851e35..d06eb81e6a13 100644
--- a/metadata/md5-cache/sys-libs/libomp-18.1.2
+++ b/metadata/md5-cache/sys-libs/libomp-18.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/18.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4394f69e3d3fcc8daf700a69a6fa8e0b
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-19.0.0.9999
index 64c858af1cba..4073d11c73a1 100644
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0/19.0.0.9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4e7686089f0764528f2f221afa6e01e
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240302
deleted file mode 100644
index 3d33a5805528..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) sys-devel/clang ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-19.0.0_pre20240302[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org llvm-utils python-single-r1 toolchain-funcs
-IUSE=+debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-19.0.0_pre20240302[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240302
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2d4506bcf69a24945e79242ecb27f027
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240309
deleted file mode 100644
index aaf97770f8ba..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) sys-devel/clang ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-19.0.0_pre20240309[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org llvm-utils python-single-r1 toolchain-funcs
-IUSE=+debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-19.0.0_pre20240309[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240309
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c4e7686089f0764528f2f221afa6e01e
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240316
index 8ba88b0f216c..0c6cc42d9671 100644
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/19.0.0_pre20240316
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	7ca3057b277f1e5978947b4cc289ce62	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4e7686089f0764528f2f221afa6e01e
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 75a0c985d086..57c6f7885b4e 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	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.6-r1
index 36d9fdae9bf7..6e6fa93e0d45 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.6-r1
@@ -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.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6923802effae324b1b764b4bfccaea81
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.6
index 79380e97af07..20d0d6c0d23e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.6
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.6
@@ -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-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=926284095bff100bc6cb744d0ea7bd1e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.0
deleted file mode 100644
index 295214e3c70a..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:18
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.0/llvm-project-18.1.0.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1b496d100178396330e64cb122b6e794
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.2 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.2
index 77a93f94ddd8..99088e30d3d4 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.2
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.2
@@ -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-18.1.2/llvm-project-18.1.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-project-18.1.2.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1b496d100178396330e64cb122b6e794
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0.9999
index 646b20c0a4f1..2e2f4242ccdb 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=442ef78dfc444df5b8965d4e0396ef66
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240302 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240302
deleted file mode 100644
index 79555c500204..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240302
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz -> llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=442ef78dfc444df5b8965d4e0396ef66
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240309 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240309
deleted file mode 100644
index 0c7c068ee667..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240309
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+clang +debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz -> llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=442ef78dfc444df5b8965d4e0396ef66
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240316 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240316
index 5807627b8244..677db0ecd4a6 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240316
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240316
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz -> llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5e74e9ae3c1cc567f08864efe88e2a26	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	db28f058af6c7a9b83b7af79281b5774	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=442ef78dfc444df5b8965d4e0396ef66
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 48d0fa601f23..558adeac4542 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/btop-1.3.2 b/metadata/md5-cache/sys-process/btop-1.3.2
index a7c3308bc38c..7d1bad64bc27 100644
--- a/metadata/md5-cache/sys-process/btop-1.3.2
+++ b/metadata/md5-cache/sys-process/btop-1.3.2
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/aristocratos/btop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake optfeature toolchain-funcs xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/btop/archive/refs/tags/v1.3.2.tar.gz -> btop-1.3.2.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=69bf41c139d174774e4e21067346753e
+_md5_=a04577608b4f7f3a5a323558b32e1bc1
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index c500d0145384..b06833d4a9b1 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/libxfce4ui-4.18.5 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.5
deleted file mode 100644
index 657e847da87a..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=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?,vala?] >=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 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-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
-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?,vala?] >=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.5.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a75b8e73ec275a63d2e384e3f88a3d3
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.19.0 b/metadata/md5-cache/xfce-base/tumbler-4.19.0
deleted file mode 100644
index 0bdbd2d27348..000000000000
--- a/metadata/md5-cache/xfce-base/tumbler-4.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=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.32.0:= ) 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] )
-DESCRIPTION=A thumbnail service for Thunar
-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
-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.32.0:= ) 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.19/tumbler-4.19.0.tar.bz2
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=32d18b18802e5ea8b0389cafc06b32b7
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.19.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.19.2
deleted file mode 100644
index 5f1fdb19eed7..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.19.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.72.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=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/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.13.2:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( >=dev-libs/wayland-1.15 >=gui-libs/gtk-layer-shell-0.7.0 ) X? ( >=x11-libs/libX11-1.6.7 x11-libs/libwnck:3 )
-DESCRIPTION=Panel for the Xfce desktop environment
-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 wayland X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.72.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=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/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.13.2:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( >=dev-libs/wayland-1.15 >=gui-libs/gtk-layer-shell-0.7.0 ) X? ( >=x11-libs/libX11-1.6.7 x11-libs/libwnck:3 )
-REQUIRED_USE=|| ( wayland X ) vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.19/xfce4-panel-4.19.2.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6717f4280bbd20c3f53b95ad2b61d7db
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.18.3 b/metadata/md5-cache/xfce-base/xfconf-4.18.3
index e6f8527b501f..f64fc14199ca 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.18.3
+++ b/metadata/md5-cache/xfce-base/xfconf-4.18.3
@@ -13,4 +13,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.18/xfconf-4.18.3.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=f08a591b5015a84352ee68f541b591c3
+_md5_=f35499159cd4056134dc9c094d51c2e1
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.19.1 b/metadata/md5-cache/xfce-base/xfconf-4.19.1
deleted file mode 100644
index 5a9c07ae3a8c..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install test
-DEPEND=>=dev-libs/glib-2.66.0 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=A configuration management system for Xfce
-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
-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.19/xfconf-4.19.1.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=b83f7432b110d90eade263f58496ba72
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.19.2 b/metadata/md5-cache/xfce-base/xfconf-4.19.2
index 888fe0e7aca4..00dfe249c928 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.19.2
+++ b/metadata/md5-cache/xfce-base/xfconf-4.19.2
@@ -13,4 +13,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.19/xfconf-4.19.2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16
-_md5_=1283dae2d619d05dc23358e60c006459
+_md5_=337160992a340952dbe1266809d24956
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 5327539c207e..fcad9e54f69a 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-screensaver-4.18.2 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2
deleted file mode 100644
index 7a824725ee41..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.18.4:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Screen saver and locker (port of MATE screensaver)
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/screensaver/start https://gitlab.xfce.org/apps/xfce4-screensaver/
-INHERIT=xdg-utils
-IUSE=elogind +locking opengl pam systemd
-KEYWORDS=~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.18.4:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.18/xfce4-screensaver-4.18.2.tar.bz2
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a18cca5711053b02da757b2b76685d45
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.3 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.3
index 0f4a299ebfde..bd6cecbed404 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/screensaver/start https://gitlab.xfce.org/apps/xfce4-screensaver/
 INHERIT=xdg-utils
 IUSE=elogind +locking opengl pam systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.18.4:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.18/xfce4-screensaver-4.18.3.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=94c33e84e799d2d60ebed43e7f4a7c0f
+_md5_=24fab64a4a52066040046edc323034be
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.11.2 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.11.2
index 58b09f771dbc..a98d25643aa4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.11.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.11.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/
 INHERIT=xdg-utils
 IUSE=upower
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.64.0 >=dev-libs/json-c-0.13.1:= dev-libs/libxml2 >=net-libs/libsoup-2.42:2.4[ssl] >=x11-libs/gtk+-3.22.0 >=xfce-base/libxfce4ui-4.14.0 >=xfce-base/libxfce4util-4.14.0 >=xfce-base/xfce4-panel-4.14.0 >=xfce-base/xfconf-4.12.0 upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/xfce4-weather-plugin-0.11.2.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=afacfb03eb4907a604ff400d9ee8c617
+_md5_=495a5a5b43afdcd9484fa82c949b84de
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a593a0147906..23cd1f20910f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17311 BLAKE2B f550628a182b004412f3e0b20ba77919ab2e7e528a920976d67f986c8267afb7994fe49cf448586ac019fe2ec55592f4b9b50ec271768e8478f6539524f00a00 SHA512 bb2e4cbb11bfc387c3b18ea611d21f5348debc887ab425be7802e836a0246f683ed7ff10cd3f1f0137dc0b481a9b807ac0a15333650148ce734ee744e1696f46
-TIMESTAMP 2024-03-23T06:10:10Z
+TIMESTAMP 2024-03-23T12:10:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+ckJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmX+xqVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDsAA//f1d3SE6s/sipmnFt2AzDB167mdFVSZdEuxqDfopIp5TSC1uT/pklam78
-vF8c3+R6uNH2U7shH4+1MWnoriY1rHtyITTz0c0H6OU/RQ+6CG/axL1IJGfIulC0
-WVltTacTc/+6kbT5IYsxd6VjHQ44jNvIypdO4/QkaHQej7J/6p89ODRU0U+2R6CO
-oTP/NouEcpE8ytAkyLSWYCTkfiPmYaZNo1p8inC0WSvM4mMnk7AULOs9PMqxjVVY
-93lxHT0BjtYyH1xC61ub7PD4+BDdbiZTjJZa4JtSu86BNVxUK1pji+qZSNvUMhVR
-87gzK7OxE3H+vIOisjJQdfQjDW837GTMM3xZlLOD3kBZ2ricc1RI8rRCkdKYwDpj
-TMzGtYjT24m18ihL5Cj2nkn4LEpGL0snWCHeGoZPAeT1fGf8vO5i+MOnTkT3VBzI
-2IVZkd/erzmoZ80Qpu/Yg30n3Qm2GVRegtpLm6dFgQlBUbuisDIt7Z9YsjXdVxlE
-Wn2CDkaplUqqaE6zix0uWHOiSYaPP9L/t9L2xf2JZiZYSh8GnCvr1KmDx8I4EFHv
-+oDZ4gAmyPtnxbVurqpa7s52NtXhScWOmnL/mj2JTxpG/vu3JuLG0EsYwYoJo427
-/Ek9dNA5hum2yIxPExNekvl9BjtlYc76NNp31ha7CWKbAGJoWzI=
-=kTTC
+klCzVw//fB19uUeTi2Da3wyyaKgNOof5r5KMUL1i/MWI7iH+QIPGdkjxKbGEnZyO
+2xRJWOyGp2R7J3s71Lz4hgkfrDN+MD5tyXwLgEliW7H15bDnXyt/lJW+LcLTQOgV
+YknWzvPaUMwv3OtHV532vGrMsPQRRyc+wnLYSYNLUsQ2VcfqWNd88mUPrxXC4irX
+Ny+iq7J0ZdgVHzUv2zGq9B0DMPFshx8oRiI6nHD1e9M5eTPyNEBy4GzzZ6kGdSI9
+J3JDlcvjF7QSukd1x/Gpsb7vhhVPBLJRT8+c/M7YmVL5jV2cIQCpg3Pfc2qchxf+
+ejoj10kW4QVsJ4DRka/iiJGh7kIoZVQi8OmQLq6BnpaQygSfPTbHBGk7WjIiYg8e
+oGo2GkPbKZ0V67mEG7fnbwULj1lYXyPokZ07r6qYDtyFmBpY3slgdVzbEduhdQN9
+9FLY0qxfL5QOK28XGZKik1nIXo5o+yjUnUyrA7knPxF73h25nfq4Q6MTWRktfaR0
+BxrnA2/XUIGt6IpP8mfdGkpbho/+WhT/uDs6F58XFeFT01UtuuzKjMx9xbvZg96p
+tk/gYjSUhNQKG1GaxkJMNf2RTy6yhAOx51XbI/DoBJXlxgJ6UBWYfX/xJxSvsW1W
+UygoEwT7hWp1O6np6Berfdy3OndC4iFO1OgUnbRIKiyERR2JEVI=
+=I9fT
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1cef230a942b..a5d2dfe27b95 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Mar 2024 06:10:07 +0000
+Sat, 23 Mar 2024 12:10:10 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8eadc9d016fd..594fe7863c44 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar 23 06:10:06 AM UTC 2024
+Sat Mar 23 12:10:10 PM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2ca39c73597c..696584a5d382 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Mar 2024 06:15:00 +0000
+Sat, 23 Mar 2024 12:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 71d18316ca54..e51aebf021a7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3b305d92ffdaab6b7703010911dccff204b67571 1711173905 2024-03-23T06:05:05+00:00
+c2477a76b1edeb7bec683b4f924b16ff53a6798f 1711195279 2024-03-23T12:01:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 305900c01669..27d94df79a71 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1711174201 Sat 23 Mar 2024 06:10:01 AM UTC
+1711195800 Sat 23 Mar 2024 12:10:00 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cd3d1d77cbd0..a5d2dfe27b95 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Mar 2024 06:10:06 +0000
+Sat, 23 Mar 2024 12:10:10 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 55e0842e5ed0..c56728aa89e3 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index fed85e22bf1f..056433682d55 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -20,5 +20,5 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64
 DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a SHA512 ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r38.ebuild 3865 BLAKE2B 48ad84b7063fe3bad4f85a31cabf347cf190184d8ba53a1f58e41a687dcdf4ab4073a2e81745f475eeeb5eb2e9b4d90db2525e9db76fbd43e3669be435722f03 SHA512 cde9e09279e6934bd862d3e8962b2aa40348eeff2bb1ba03c7d4b8788ffc9a895a484bd7fee63b0ead42dadfb34c8cc26f700056f3417f2c26565fb443a5e2a2
-EBUILD djbdns-1.05-r39.ebuild 4115 BLAKE2B ec258c39c219fe7cef2c16b46e262f6745ecb304db1533860b1bab230bf6ef526e24013ec61a71d4644d4d36ebde1ed21e897569ad0905e2b0dec2aa06be99d6 SHA512 37c8ce729284ead4db6ff3fca34c5840902899ac0e07501317fa1c809349b35f06f3ceff671a4e04fd0bdb619f3d1d3e071b7fe0a25f1b568fa8f5548b54a91d
+EBUILD djbdns-1.05-r39.ebuild 4289 BLAKE2B 9945ba00fa1d8ba613245a7dc86cedc0470bd43de7541419c4bbd999f469a31d8f408bc3f0cfc08d0ff9893428597907f5e8762096e6ec1b4c188aceafb40b10 SHA512 3392601d470e4e1830f23d7a7daac0dcd9149cbfcf827db762c0f6e3369ef53c8a65bdf9707591ad6c1237af62f375d8e2f9e3b5d7a7ee4b0d7107e6bd072f4c
 MISC metadata.xml 452 BLAKE2B c17e56cddeb305abd668ddffa1589e95184c03ea619102e2b82cb05febdfc21bfcbf1cffc8274f9ead52bcb4e1a5e3aa7d715261c9692c538872587d02ce929f SHA512 9bb5e5f836dd077e476f3035c5aed99ff5965472c8a3a2ac61e18d8a715985cd71dcdc7a9775ba9bda86008156db2c50172697d847629e9abd57eaef423ef0ac
diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild b/net-dns/djbdns/djbdns-1.05-r39.ebuild
index 77ba586d70d9..9b70fbb959bb 100644
--- a/net-dns/djbdns/djbdns-1.05-r39.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit readme.gentoo-r1 toolchain-funcs
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Collection of DNS client/server software"
 HOMEPAGE="https://cr.yp.to/djbdns.html"
@@ -81,6 +81,10 @@ src_prepare() {
 }
 
 src_compile() {
+	# Bug 927539. This is beyond our ability to realistically fix due
+	# to patch conflicts.
+	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 	echo "/usr" > conf-home || die
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 62b1d0b82ec4..13d7d83301d3 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest
index 654734a3de6d..0f7656b65a92 100644
--- a/net-im/fractal/Manifest
+++ b/net-im/fractal/Manifest
@@ -2,6 +2,6 @@ DIST fractal-6.rc.tar.bz2 1408366 BLAKE2B f02f3679bdd062fffe577a935b23f1f5243a91
 DIST fractal-6.tar.bz2 1430986 BLAKE2B 2388771eb34b527ce758efc9a81a5134cb5558ba64bbdf2cbb4911e56698dff7fcf175280b1a8126ffe59189024dbdb3fb847a88e991b86adb81b5e0f64a4ef7 SHA512 78f5ae06117b8f7218084946c883022ec08ae213a433c17386cdf84a30dcb2796f957c13b5b21cef1e500df0b1a86794aff144698c014fdeb42b782bf5583280
 DIST fractal-6_beta-crates.tar.xz 45123596 BLAKE2B 88bd065066367943dc84af70a514f79e96382d62fb47caf80844a0c5532cc065fe5aa72bc737f240d6f64cd5e9f123be467c9fef0fd64e8f7a4aa496e613a408 SHA512 23cfff457be78c6ba2e71342d54605adad28dd0a21dcf3d3415477a36e78c52c921fd92083551798b6fccb4569814a33606812752c5b9c4ca2952e94f7f2f596
 DIST matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz 1743912 BLAKE2B 48b6352fbad17eb1651e5ca57bca25ea64dacecf0e97b63502fa54fd86ac65728656e799c0b50fddec575d05aa408c8347815f30afbf78413e973c35e0d8768f SHA512 a330250bf25dcb4a4a4a8bfc3bdda1a19d389080fb6a4983f00cc9cddc2f12b7a8f652942a58b9ed78b9c52802f94fd391e3dfd6971add8a44dbf66460488a1b
-EBUILD fractal-6.ebuild 3136 BLAKE2B 1aa85ca9daff782a60688e5d22495e6ce758b0295546c58e1167189e5535d352a4c118f87f3ea789bc6727adf7eadaa7c4744a38d593a13c5881de31f1c43823 SHA512 a753f009d3eb4cbff109ea21df540308cf96e46b3ba6cf46f505a2a8c2cd42d030360df4554629e3f331eeb3ddddc91c50d2fd0e6df0a57515f649015758829e
+EBUILD fractal-6.ebuild 3135 BLAKE2B 4833880c1c99ca8731b15c4ecc9ad9cb2a1d2eef308adf0e3d7c5bbee892a9688fae00d8f91558d10e40f7759eca68862ac3cb664dee174a44a5ddddf61bb13e SHA512 743fe7fe0711ea222064e6a2fd77d9d52a2e1e9817e3da88bd6e411c1bde2e6548ca14f37f13351ae99be84f5a7ea1f6357743bf598fd9b97faf6873c497d1a6
 EBUILD fractal-6_rc.ebuild 3116 BLAKE2B dc418a3e58a92fabbb7cd4ca768d6d7cf5215c106ecc5fdceedb29e692d4d99e3ca1d3dfaf1ac77ad90cb40e2937b3e24b10807993b8e76c33adc2745fbe829f SHA512 22c49220d7330405ee7163196c0b2d089d6320d33b19d5f6fbaec5e08aa0b52ea3a265e22b737b5d39136cc54313544d46de876b25327bc945b1a42887ede108
 MISC metadata.xml 332 BLAKE2B 36b22310df0557eda42824f89922a2f86f69d1e865e7a218e68cb8402f525e6b656ffad5ddfd571db0683fedaf4be4731b90f396f10dc5860f84a68954aee178 SHA512 5be14905102caf86ecae246ca7cc69a9c3543f9c2d0cf78f99c6f0eeb04ffdbecb91bb06b12d99956ddd69d59a99b71b5caaf1a788fa6c3fd2f8142434970038
diff --git a/net-im/fractal/fractal-6.ebuild b/net-im/fractal/fractal-6.ebuild
index fc47c41defd9..61d0fe434518 100644
--- a/net-im/fractal/fractal-6.ebuild
+++ b/net-im/fractal/fractal-6.ebuild
@@ -46,7 +46,7 @@ LICENSE+="
 # ring crate
 LICENSE+=" openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
 
 DEPEND="
 	>=dev-libs/glib-2.72
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5d1d3157c29a..63ebcb5e1a7a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index b53267625f22..db58e25a6d0a 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -3,7 +3,9 @@ AUX xmrig-6.18.1-gcc-13.patch 1910 BLAKE2B e3a097ef3d4999a84a9aa4edad1fd14dc7c62
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.18.1.tar.gz 2394259 BLAKE2B 4d7ed3ce7b6c9dce9b25da7c316df4542046b014167ce090c5c2ec4dbf61607e4238ce8a8407a396f1eb47dc76cbfac08e0131835d9c4bbff8f4e5920d2f19a6 SHA512 bb297b17f820ad38f0c68aebfe1be8e82e85aede99a9e2a7692935ed57dab06a36566d13c16f850123dc6e829dfb56bc9253c46b94e6a703fe169a0126feb37b
 DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794
+DIST xmrig-6.21.2.tar.gz 2426759 BLAKE2B df2b25177ae4b60eff0f518cfe0aa513820fdce1811c329a33d16ee74c9f387b26bf41e8a2bf84471f0c1eef4deceee164e82a245c9a7813d633a08747bf6cfd SHA512 e6fefa091c5884ebd30a938472032efcf68fccde1ba492bd045dc50fef1ec95bb951bbbf1ed1832670bc241400629754f31318477ae634080a89790e9fa27957
 EBUILD xmrig-6.18.1-r2.ebuild 1592 BLAKE2B 7ca183e7fb3647b3dadbefbe2cfd3f9e2560a6e3b7c61b0200c617978f1f1683e1d10b9d5f44a48ecc18f9bbc01acc87298b06f1753b5ff09030b1df0d6041b4 SHA512 0349293e8eabf03b199523572c6b4c8fa1ebce93768ab70820f2d20768ecaf56a94224539778e4740f127543d7cb68815f79d9f85b1f2175431a9503e3e60555
-EBUILD xmrig-6.21.1.ebuild 1553 BLAKE2B ab6a6a35f869baee05387111b510ae3f6ca796e5a2343322b6abefcbbc992b61f93b63b53d61639b2812978cf43bedce2e5066f69aea7d4d574ce35d4220bca7 SHA512 fbac76b9ff9144413a432668602812a4b75f5acf5b472ef68d83666d5d117295e20bb7dc483579a6057d36a1bf50bb5a74fc60801e22b78b694363ab411cf7a4
-EBUILD xmrig-9999.ebuild 1553 BLAKE2B 4424c59bec325f902d6b0597406902faab3f55de490047dd7c73a0d56c8d4128243b52aceae5414f8aa460539f6ff131ca3e18a271af9ca9dc088b1f83509e9d SHA512 9355b207a49e67d0f16df4c03f34ebf6060839539b487a32c455a23832f5e68624d31120266fc0271c8976897019e388be62127ec9d581ab22f1bea681d38c19
+EBUILD xmrig-6.21.1.ebuild 1551 BLAKE2B e590f209544572f41c8ef3f9984791cedcf33d73626d47411eecaff54d3320111140de17da4790ab9a6a506ef7e58eb317d917840f6967b0b332870f5e4f37f8 SHA512 1046e575d34e47489533335121be7780f85a3fbd36669fb4d93e8344f24ae62f6fc82656c4927a537744942c384d2047cb28b134b925d735221845f151e0794c
+EBUILD xmrig-6.21.2.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 MISC metadata.xml 833 BLAKE2B ac0e7279af43dc7d8cefaf41d3cb02cc426080936eae5084b23011ef57be7162844d9d78edded1e2b18edd1cc90a03b0cb9fd52e834e79f195799b48fd2c20d6 SHA512 ce9293b9c560b227bf44f149010b259a86175a178a22b72187efa128dde1aa138928033e7cd7d9cee41313c083bb972248460f7a73d970e7fd1f74463e515c38
diff --git a/net-misc/xmrig/xmrig-6.21.1.ebuild b/net-misc/xmrig/xmrig-6.21.1.ebuild
index 93dd2712390e..b6cc3de16350 100644
--- a/net-misc/xmrig/xmrig-6.21.1.ebuild
+++ b/net-misc/xmrig/xmrig-6.21.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-misc/xmrig/xmrig-6.21.2.ebuild b/net-misc/xmrig/xmrig-6.21.2.ebuild
new file mode 100644
index 000000000000..2061563b6ac5
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.21.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index a36872e00718..2061563b6ac5 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake flag-o-matic systemd toolchain-funcs
+inherit cmake systemd
 
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
 HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
@@ -44,13 +44,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# JIT broken with FORTIFY_SOURCE=3
-	# Bug #913420
-	if tc-enables-fortify-source; then
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
 	local mycmakeargs=(
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index f657681e9d33..a00888386c1f 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index dbc07a7c7efe..e26f36ab524b 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -6,8 +6,10 @@ DIST SABnzbd-4.0.2-src.tar.gz 5081392 BLAKE2B 1740aad2a5b248b22dda42cb22b740c54d
 DIST SABnzbd-4.0.3-src.tar.gz 5084243 BLAKE2B ad7787cb4dd0bd2fca6cb0a69f395ff0cdffcaaa09ae05a1ee44b809e26ba1879ae018fdb94b7d468aac433af41d57ea36443aa8b12145a792557c3be239ae15 SHA512 5b35575d5be0942a632ecd9226b80fdcf865f94350d756c5265ea9aad587a3b4f907cd5ba1a6f3366b6b0e9dd58221268647c14c8e41f58ebb9e8a3e3ac9031d
 DIST SABnzbd-4.2.1-src.tar.gz 5075716 BLAKE2B e4248a7eac3f97b1ba3ba69a56cef8f5e37c9797603f83a1ecd37f85b56f72b209b2caa3b00c5163c50dfb3de20ea5148f5a2f3c029d7f2aff8239aa9c2d35fe SHA512 08521d491f8995698dd92b972df9491c0d1821871322cba63812f7655d60fa71b9f1a6c6691635882fa3214d34d255c33c17d1bf0164a5f54856a5caa0a81dc5
 DIST SABnzbd-4.2.2-src.tar.gz 5096168 BLAKE2B 1768ebc6bd26a61724f3efefe83ea9c7e4245880b914b6da8fd27be15270cf9d2c9382693bbbcc8bb2c92588f815d8a6dbee14dbe70bb7ec4281ea056c5b9ed0 SHA512 4979b3e747c15f85b5c62edd2d3b6b7e01889c88d1a5645366ed6c058eb7f3bb31bcb532fb2b96c475fa4a769d6ad86a2052f275cdd71f3422d56e6af4386157
+DIST SABnzbd-4.2.3-src.tar.gz 5096209 BLAKE2B 60d52f89cd85d942d50310b25016a33983889ee13e380785e3510b954e82ce6c29f867e4cf21814e4a949b9f0484cf55766583234bed7e91432a3a741ac3ba3a SHA512 446985d6c5faddd90bff097a55fb2e4e588f9d5aad42215187bade57dab9b00c132d8d9116c68b8210b51d382740a97908f2b5d071cbf6b90fe9c7ecbfc65398
 EBUILD sabnzbd-4.0.2.ebuild 5176 BLAKE2B 8465d7dd954d88670b2cd97973d9fd52c131460434e33f6b33b03fc04efac2ec846b671f54250d60e140ca7ce26bf0aa8d792ae54c4710ffcc5a0b3b1bcc4f73 SHA512 6704362c44f39983ad66bcf8079fc69ffd0389e3fd6e233edaa9b758cf489d1f3440776e312efcf00ce3f0b93ecd8be3dd0f4f4ba1df7bf70b2c3fa84119dade
 EBUILD sabnzbd-4.0.3.ebuild 5178 BLAKE2B b578815986ecd6d851cf0ca3c390c11694b3ed94f58356e9b8ed7dd3ab8423675ddba61d7b71bb886abdd71b1fdb370b5647fe41eb8b9a92e7365f043eca606f SHA512 a3b35023b58485326d621005738e3b7fcb8e05047b86ff0832c3ef7d1b635bf21e141ca1868dbdf340abaeb9b0a975fd09150961ca1d93f27eaf4085f2081515
 EBUILD sabnzbd-4.2.1.ebuild 5232 BLAKE2B fc1b37938f7343c54099dc3c271e8537fdf809638ff6e3a4d823a8d9f1565ba50d0926efc1666f9e46f8b04796d1bd229ec3e71141361b96cfd6a0affcaccc75 SHA512 77de346772d13400e327776641de1808b8fecc9bc4b6546d08066837b8ae7614fdd41fe64a3dc3d3db9e7e69e789bd67654867544bd80714977ae24de51d9b47
 EBUILD sabnzbd-4.2.2.ebuild 5660 BLAKE2B 16adf2f3cb5123cde5856887e593cbf2008df301e3ce997119f5692508bdcb21a2a375493de5c9147ba0e22868af1c9d2a013fd16edfdafb28a12b229f6a7455 SHA512 05adefa06ffea91a728952ec96af55947ebd3b65860a9ca82658d096cfc4ee9bde68e5c47b753740e04648163fd8abbc32fde3be6756cdcd7b3bef7e46f56bf8
+EBUILD sabnzbd-4.2.3.ebuild 5660 BLAKE2B 16adf2f3cb5123cde5856887e593cbf2008df301e3ce997119f5692508bdcb21a2a375493de5c9147ba0e22868af1c9d2a013fd16edfdafb28a12b229f6a7455 SHA512 05adefa06ffea91a728952ec96af55947ebd3b65860a9ca82658d096cfc4ee9bde68e5c47b753740e04648163fd8abbc32fde3be6756cdcd7b3bef7e46f56bf8
 MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/sabnzbd-4.2.3.ebuild b/net-nntp/sabnzbd/sabnzbd-4.2.3.ebuild
new file mode 100644
index 000000000000..0cc03bdddd59
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-4.2.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit optfeature python-single-r1 systemd
+
+MY_PV="${PV/_alpha/Alpha}"
+MY_PV="${MY_PV/_beta/Beta}"
+MY_PV="${MY_PV/_rc/RC}"
+
+MY_P="SABnzbd-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
+		>=dev-python/guessit-3.7.1[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
+		~dev-python/sabctools-8.1.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		>=app-arch/par2cmdline-0.8
+		>=app-arch/par2cmdline-turbo-1.1.0
+	)
+	net-misc/wget
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/selenium[${PYTHON_USEDEP}]
+			dev-python/tavalidate[${PYTHON_USEDEP}]
+			>=dev-python/tavern-2[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/xmltodict[${PYTHON_USEDEP}]
+		')
+		app-arch/p7zip
+		app-arch/unrar
+		app-arch/unzip
+		www-apps/chromedriver-bin
+	)
+"
+
+src_test() {
+	local EPYTEST_IGNORE=(
+		# network sandbox
+		tests/test_getipaddress.py
+		tests/test_rss.py
+		tests/test_urlgrabber.py
+		tests/test_utils/test_happyeyeballs.py
+		tests/test_utils/test_internetspeed.py
+	)
+	local EPYTEST_DESELECT=(
+		# network sandbox
+		'tests/test_cfg.py::TestValidators::test_validate_host'
+		'tests/test_consistency.py::TestWiki'
+		'tests/test_newswrapper.py::TestNewsWrapper'
+		'tests/test_happyeyeballs.py::TestHappyEyeballs'
+		'tests/test_internetspeed.py::TestInternetSpeed'
+		# Just plain fails
+		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
+		# Chromedriver tests don't want to behave in portage
+		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
+		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
+		'tests/test_functional_config.py::TestConfigLogin::test_login'
+		'tests/test_functional_config.py::TestConfigCategories::test_page'
+		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
+		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
+		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
+		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
+		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
+		'tests/test_functional_sorting.py::TestDownloadSorting'
+	)
+
+	# The test suite is prone to being broken by random plugins that happen
+	# to be installed, so disable autoloading.
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Use PYTEST_PLUGINS instead of args to 'epytest' because the test suite
+	# calls pytest itself and the args would get lost. To get the list of plugins,
+	# if stuck, comment out the AUTOLOAD line above, look at the list of loaded
+	# plugins at the top of the pytest output, then translate those into module names
+	# by e.g. checking equery f.
+	local -x PYTEST_PLUGINS=pytest_mock,tavern,tavern._core.pytest,pyfakefs.pytest_plugin
+
+	epytest -s
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r email icons interfaces locale po sabnzbd scripts tools
+
+	exeinto /usr/share/${PN}
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	python_optimize "${ED}"/usr/share/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	diropts -o ${PN} -g ${PN}
+	dodir /etc/${PN}
+	keepdir /var/log/${PN}
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc ISSUES.txt README.mkd
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: /var/lib/${PN}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	fi
+
+	optfeature "7z archive support" app-arch/p7zip
+	optfeature "rar archive support" app-arch/unrar app-arch/rar
+	optfeature "zip archive support" app-arch/unzip
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f8ea52beee1a..436d0457329c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask
index 22f96c7ad1db..7cd1ff04a69d 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Rahil Bhimjiani <me@rahil.rocks> (2024-03-20)
+# https://bugs.gentoo.org/925111
+app-containers/podman
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # Not all dependencies keyworded
 net-im/telegram-desktop
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b65aebba34ee..8442575839e0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -269,7 +269,7 @@ x11-wm/stumpwm doc
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2022-11-25)
 # USE=tbb is broken in 7.7.0
 # https://tracker.dev.opencascade.org/view.php?id=33152
-~sci-libs/opencascade-7.7.0 tbb
+>=sci-libs/opencascade-7.7.0 tbb
 
 # Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
 # app-text/pandoc is not keyworded on most architectures
diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
deleted file mode 100644
index f25938b2f986..000000000000
--- a/profiles/releases/23.0/package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ionen Wolkens <ionen@gentoo.org> (2024-02-28)
-# 23.0 profiles have USE="-cli" overriding ebuild's IUSE="+cli" (bug #925520)
-media-video/mpv cli
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7ed64452976c..2a925d13604f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -333,9 +333,8 @@ app-containers/incus:fuidshift - Install the fuidshift binary - currently confli
 app-containers/lxc:io-uring - Enable io_uring support, and use io_uring instead of epoll
 app-containers/lxc:tools - Build and install additional command line tools
 app-containers/nerdctl:rootless - Enables dependencies for running in rootless mode.
-app-containers/podman:btrfs - Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.
+app-containers/podman:btrfs - Enables btrfs support (graph driver) in Podman
 app-containers/podman:cgroup-hybrid - Use legacy (hybrid) cgroups instead of modern (unified) cgroups
-app-containers/podman:cron - Runs `podman auto-update` daily. See podman-auto-update(1)
 app-containers/podman:fuse - Enables fuse dependencies (fuse-overlayfs is especially useful for rootless mode).
 app-containers/podman:init - Enables catatonit dependency required for podman run --init.
 app-containers/podman:rootless - Enables dependencies for running in rootless mode.
@@ -7438,9 +7437,12 @@ sci-libs/openblas:pthread - Build with pthread threading model
 sci-libs/openblas:relapack - Build the ReLAPACK extension to OpenBLAS
 sci-libs/opencascade:eigen - Enable support for eigenvalues through the header-only dev-cpp/eigen package.
 sci-libs/opencascade:freeimage - Enable support for image i/o via media-libs/freeimage
+sci-libs/opencascade:freetype - Enable media-libs/freetype support
+sci-libs/opencascade:jemalloc - Enable jemalloc allocator support via dev-libs/jemalloc
 sci-libs/opencascade:json - Enable JSON support through dev-libs/rapidjson
-sci-libs/opencascade:optimize - Don't clear allocated memory. Use optimized memory manager unless tbb USE flag is set.
+sci-libs/opencascade:optimize - Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.
 sci-libs/opencascade:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
+sci-libs/opencascade:testprograms - Indicates whether non-regression OCCT test scripts should be installed
 sci-libs/opencascade:vtk - Enable Visualization Toolkit support via sci-libs/vtk
 sci-libs/orocos_kdl:models - Build models for some well known robots.
 sci-libs/p4est:romio - Build with support for the ROMIO MPI-IO component
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 5e5abd8a7004..40d03140fb64 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 323928bf9a4d..40932051da06 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,10 +4,10 @@ DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e9422
 DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067
 DIST kicad-8.0.0.tar.bz2 72430414 BLAKE2B 52bad016249563d9668f08da2103e47c7db706e6749e23ff5c59fd423673db614a1c8681cd0e7927571fe157644e142929891647964c48f45b219e72166c3ebc SHA512 52e605c10fbac0a3c6208f92ab9e567de9074e41495db9619631765a0f20e2da23a2d45610bd367d943e8b4a2d72edf33456007aabcc1f7672b0bb1a93101ce0
 DIST kicad-8.0.1.tar.bz2 72453098 BLAKE2B 67c6b69256566a176ae10affa7ac65879db71f5017dc24312eba904724b2b28caa56f6c82c697d27b34d94f9a8f5448307948e17f17c9750693b192afa3ffab9 SHA512 b6509bb4bfd1cbe87a2f409b70a8ba037a44fb039aaacd9d62868b43925382c0d3aab4c4f7e4bbd646b6ea7cf35fd7318f620a1c8c250c09251349357f2caf11
-EBUILD kicad-7.0.10.ebuild 4330 BLAKE2B fa3647b65773f2a0c3b6383c2776da74bbbf6ab65276445ddcbc0cc976558df37d60631305fe6d2681e23cce2fd3d40497092c6d865fb2ec3059f14c028d00ca SHA512 9e17ce3e84ebde2d757165c05b84efab84ca879d5cb7a68c3471d05a8d53abcd16cec1d5971be896d3dafae7123383764fb0e8e08bad3247c9b038c4147c5313
-EBUILD kicad-7.0.11.ebuild 4331 BLAKE2B 63da9994d4843b52e36fdc37887b753946712ad68615f9c8a7ec30ceea1ee132e72aa230d142b0cc6bc6ed38be793b1e8974edd010d03d741687877907f5b075 SHA512 998814f61408aa54e12764901dee59f358a0133a52e06f4efd2fd93d48540e926ac930e9078e4b0b4ed1e448dbbab5dfbb00c7f38756b2edcdb3028bbe043031
-EBUILD kicad-7.0.7.ebuild 4288 BLAKE2B 13b5fa9f060f5a1d383c0eaa3dfc57bafb400643906034b2356c7da7fa689a25c4ca6196fb61ae8bc68c8be07bb110519933fc9ba1fa9069b948821697c54735 SHA512 3bfec4c28498e498689f999f6d2d7fa8cc0e81d2726798dd3d1c563eaacd57286517ea61bd0f7f8269b95fbced02a5f0cf139551e64134e558e5726983b589a4
-EBUILD kicad-8.0.0.ebuild 4405 BLAKE2B 8d33794e7a0ad407271ec0d181c62ed09604764b9e3daa6342a96ee087f62799383047c39186269c24c69054c949180037541e7cd429652a472647e3ff1d9824 SHA512 c3f74c915c80278f284691a4c66c5550e8e3ef5958792dad8434944cbb259d523c2a8dabf811602c01436d1121156c5f2668a94828933ea49dcc8d52f4729c06
-EBUILD kicad-8.0.1.ebuild 4405 BLAKE2B 8d33794e7a0ad407271ec0d181c62ed09604764b9e3daa6342a96ee087f62799383047c39186269c24c69054c949180037541e7cd429652a472647e3ff1d9824 SHA512 c3f74c915c80278f284691a4c66c5550e8e3ef5958792dad8434944cbb259d523c2a8dabf811602c01436d1121156c5f2668a94828933ea49dcc8d52f4729c06
-EBUILD kicad-9999.ebuild 4405 BLAKE2B 8d33794e7a0ad407271ec0d181c62ed09604764b9e3daa6342a96ee087f62799383047c39186269c24c69054c949180037541e7cd429652a472647e3ff1d9824 SHA512 c3f74c915c80278f284691a4c66c5550e8e3ef5958792dad8434944cbb259d523c2a8dabf811602c01436d1121156c5f2668a94828933ea49dcc8d52f4729c06
+EBUILD kicad-7.0.10.ebuild 4362 BLAKE2B 28406e5f84731d8570940026cc91e8e347ad7a694dbb3538f4ff1822302c0132894a7208db807793bcc0986c58224a79f3cf6bb05c206a699f9a102ecdf3a5bc SHA512 5ab394782cb40651fc112f3b4b20b19d7fa8900af5596e76b5bcfd3876732497800a9f4a2adf477700da26fb1e2c84da47b6f7ebe3883f6d0736d2112df36603
+EBUILD kicad-7.0.11.ebuild 4363 BLAKE2B 337e3e5bdb66b3735777b1362d0a0cee45fe8b73dc159cb28e918956e7057746c45adc61a1935a88cdc8aa233657984399380bdf63c6cf18fe88dab24fc3a451 SHA512 2ee86ef232c2b42142f5991ad3e84713a3a1ba591d39844cbe8f964fd6cfe8f5864f135fc451b28c8341cf01f6f5584f83fd4d86458e8cb4ac0b6fee7a9517ca
+EBUILD kicad-7.0.7.ebuild 4320 BLAKE2B 05b44e10a0a360a061fe7c1a5c44d72a39b6a158d4c3e013c47dcff8c545cb3741ecc847aad53fc4b9745089763ff4408d270112473f8aeb701fa2bf9c5c886a SHA512 bef889e4e25aa3285ee3d3df6c04d45446b6fbcecf076a391a8021d0e97d53efb11385abe889fb83db16f6cd2cb0b3c0eb466e8e9453a154c03c52ca29685a11
+EBUILD kicad-8.0.0.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
+EBUILD kicad-8.0.1.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
+EBUILD kicad-9999.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
 MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
diff --git a/sci-electronics/kicad/kicad-7.0.10.ebuild b/sci-electronics/kicad/kicad-7.0.10.ebuild
index b4a439a45e48..01d0cff6c0d7 100644
--- a/sci-electronics/kicad/kicad-7.0.10.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.10.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
 	media-libs/mesa[X(+)]
 	net-misc/curl
 	>=sci-libs/opencascade-7.3.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-electronics/kicad/kicad-7.0.11.ebuild b/sci-electronics/kicad/kicad-7.0.11.ebuild
index bcbe17a2e692..6048013c238d 100644
--- a/sci-electronics/kicad/kicad-7.0.11.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.11.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
 	media-libs/mesa[X(+)]
 	net-misc/curl
 	>=sci-libs/opencascade-7.3.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-electronics/kicad/kicad-7.0.7.ebuild b/sci-electronics/kicad/kicad-7.0.7.ebuild
index 2a3d5f1733c6..66c7ff8dd513 100644
--- a/sci-electronics/kicad/kicad-7.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.7.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
 	media-libs/mesa[X(+)]
 	net-misc/curl
 	>=sci-libs/opencascade-7.3.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-electronics/kicad/kicad-8.0.0.ebuild b/sci-electronics/kicad/kicad-8.0.0.ebuild
index 5780889b5538..8c9a6b4dc5eb 100644
--- a/sci-electronics/kicad/kicad-8.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-8.0.0.ebuild
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
 	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
+	>=sci-libs/opencascade-7.5.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-electronics/kicad/kicad-8.0.1.ebuild b/sci-electronics/kicad/kicad-8.0.1.ebuild
index 5780889b5538..8c9a6b4dc5eb 100644
--- a/sci-electronics/kicad/kicad-8.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-8.0.1.ebuild
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
 	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
+	>=sci-libs/opencascade-7.5.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 5780889b5538..8c9a6b4dc5eb 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
 	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
+	>=sci-libs/opencascade-7.5.0:0=
+	<sci-libs/opencascade-7.8.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	>sci-electronics/ngspice-27[shared]
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3448b4707cb2..f32ea7715386 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3f5f0d194556..113205e2a3e2 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -7,10 +7,22 @@ AUX opencascade-7.7.0-add-missing-include-limits.patch 459 BLAKE2B 507fd80c08c52
 AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4737971b0bf14828acc7c6049ad75920853f565705699ab58bf60d6e4aa5473114c6224938870e19439b569ce2112af2e9b0742c361cc54a68421ae SHA512 202994e6a0b42c2469f8fc11ace7364ce41056192393bd2930fba1468809ce8992169a6ccbe909930ad181d9c633fc9f6169f7ef72ef071c0186ae7f2ecdb456
 AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5
 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
+AUX opencascade-7.7.0-jemalloc-lib-type.patch 783 BLAKE2B baa529cd277dac5e97fc77b30a8a5b2349364a60948abbb56d754dcb1a1bfd4fc76745798b4163d1b5d76752e3ff61b121323cf4a15195b4bab0e4ad5dd56fd1 SHA512 1ac1a56cec067184ced6cf632d4b18c50bbbc7380f397f55dd4be5003938aaa4899d857f6a1c14f342550c1fdd43e23829a9a174042cbf8d76e2844d740aa20c
 AUX opencascade-7.7.0-musl.patch 3095 BLAKE2B ad17417a93f42b4871c469cd7a50c48ed987f9333c626ca103fedabd49b84b7061de8eefbe834ead65325d606f2ea7f89210156364b55de75336d6493ff483c1 SHA512 6fb94bd075448d4ede48df918d070eda4607956d7a66b01f8b8b3621c0dc57348daa120661c5f1fe6ba7b818fec5737936b2620d62bfd0a7a224d03cbdd3ffc6
+AUX opencascade-7.8.0-cmake-min-version.patch 388 BLAKE2B ebeda19b2bb855a1b01bafb0a69e4bac51b95a84ca1d2fdfb58bfb4af007ba11efb4452812bd51060be5d45233258aabac305bb4048364fb0663c42cabe60d1f SHA512 025611176fdb894e53e413a5de32aabf7822743393dd847e01d650f3fdf00f56fc73b22c1faae97b94b2120d016055f0fd23a2d47c6211e49d2097fe6d510e99
+AUX opencascade-7.8.0-tests.patch 539 BLAKE2B 519e97a2881da6d437c4b54beaeb5e77883669ff8d16b491bc6859db6c02e807dc4ceffa1052ece9a8ec56ba9024c5abb61caca1a1efa7847efbe3bce7d5ef95 SHA512 4ba8fcf8277b4dda3ceb84010299b925ccb561e9bb3d1097dc41c437be6be9499160ac1c3f36d63ca6f4fa9f9f9d012f787125c0bd693b44028c50b9c858bd8a
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-EBUILD opencascade-7.6.3-r2.ebuild 4724 BLAKE2B b3de0675bf17cf889646ae2ee50097b47b4b8544c6151b2f2f6f515e22df37883da477e2176e6231a410942c7b67f1e38a9f01bffd0901449c5a77c896d269ef SHA512 b916d80bd1c367a2079a72957d5531deca041bca3fdd773a9b6dc77fb351bb44e053e4e72e1bc4adb8b63b10387d9838fc777bad0712b8d075f024fdaaa42869
-EBUILD opencascade-7.7.0-r2.ebuild 4872 BLAKE2B 251ec7e583e2d38727da929f0319a983f97c1bdeb14e08c0d0c8df2bea7e14499a03d111beb102ddf97dd209104bc86a627b629bcdd0c6243fe1162da2fb82fa SHA512 d800c6a8dd8b79d19d2adb6c6772cc5928b2b8aac1f3efa15e1cb3e8bb42ca859d4aa22f5413ea4bccfbb5681fb4e3ce3608e6109ccc5e55030a441da33c4ed3
-MISC metadata.xml 1053 BLAKE2B 946125fdaf332fb577655b71f63e7d55cba3af624f817ecee100f1307b97fa94710f16a4c8f8af4d32d822bbe85a07af1bf5170064061c6dfe62fdd1d7d107c4 SHA512 106def99d7a94c3e2efdbf2024bff00558891c92be9ff7909dfcf9a53635c8d0f01bed474e475aefc29c8239a5bf3cc7d15689288852b087ca54ad39584f0d25
+DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230 SHA512 f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
+DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
+DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf SHA512 af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
+DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990
+EBUILD opencascade-7.6.3-r2.ebuild 4690 BLAKE2B 8447a1b6c95c13c14a21bc58fbe82bb113e4d042e1034f66723f19eeddb558f8a243e77514c27ed53b0f220cb077d5bc91a8856f41a74d5fa396c16c3548e658 SHA512 d5821c186e2715fa7cea2b21f043b9c08c99de015789837b5e27a537c4a4017af0366752840d817b92506bea2d9bd2450fa6fca914c2e266001cde0cd483ebf4
+EBUILD opencascade-7.7.0-r2.ebuild 4838 BLAKE2B d0fba653700a337109b5c41c80b68560c2703b56592fc57d5f588e507f68637ff4db7938f91436e5e520799585044c97fc7c9fcc914b48114411a1a83d75c549 SHA512 c4d9522d65bd199a0fd4f5dddad91224c4fe7b2e383324f3a2fdf36c752c22ce7afc934cda38f9a558f6ce4a528688163b446e99ddc2c5a9e2ac4950b2f7d2fd
+EBUILD opencascade-7.7.1.ebuild 9410 BLAKE2B c29aafd2f1e7a7305b25fc2eeaa82ab2b337c78193f73d1838545368735b0b0628f0ff8b737d11363b16a3f55e78ebf48a34d8a0a08a4b4ccbe4cab562b2a232 SHA512 1bee8ef7ba89382d533510356d307d0f87b88af4dbf00be86124c146bfdcd1e82b7e179371c1154688c0069912f707bad5569118c59f4edf90f8f85fee5fc634
+EBUILD opencascade-7.7.2.ebuild 9410 BLAKE2B c29aafd2f1e7a7305b25fc2eeaa82ab2b337c78193f73d1838545368735b0b0628f0ff8b737d11363b16a3f55e78ebf48a34d8a0a08a4b4ccbe4cab562b2a232 SHA512 1bee8ef7ba89382d533510356d307d0f87b88af4dbf00be86124c146bfdcd1e82b7e179371c1154688c0069912f707bad5569118c59f4edf90f8f85fee5fc634
+EBUILD opencascade-7.8.0.ebuild 9373 BLAKE2B f4140665caaaa607bf22af4a3828944f69e7f74483dbaf768865e93e9127655427527e1f21bbaa6ec563a1da1eac94337885d5d4f60005980bdcc525f16f19fe SHA512 1940b0465b5023a6b53530fe25f832d653ecd06b95aacf33984ce76fc1df579eccade33889ffd2ee81bfed8839c82bb3977accef467a7173b2279ccbf7598752
+EBUILD opencascade-9999.ebuild 9373 BLAKE2B f4140665caaaa607bf22af4a3828944f69e7f74483dbaf768865e93e9127655427527e1f21bbaa6ec563a1da1eac94337885d5d4f60005980bdcc525f16f19fe SHA512 1940b0465b5023a6b53530fe25f832d653ecd06b95aacf33984ce76fc1df579eccade33889ffd2ee81bfed8839c82bb3977accef467a7173b2279ccbf7598752
+MISC metadata.xml 1377 BLAKE2B ca7101643c8e08017ec12840cecf9e852a5fcfa8e40f50589ce70b21e55bb4b61598689d15596ed132bba7f592fb9672fc14e559540deb6900709bcfc2dcfcc3 SHA512 a6c3e37cda18e3838f4277383a0067166cb14449905d6c1dd566f7d78064b9e20ac35acf3dadb75ef82f9a6a59f463f870e08ea7f501dadf6f06834606a3526d
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
new file mode 100644
index 000000000000..c80d9946b7c6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-jemalloc-lib-type.patch
@@ -0,0 +1,27 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+
+Only try to find the jemalloc libs we are going to use
+
+diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake
+index b37d5d276..deef66d6c 100644
+--- a/adm/cmake/jemalloc.cmake
++++ b/adm/cmake/jemalloc.cmake
+@@ -128,6 +128,7 @@ endmacro()
+ # Reset CSF variable
+ set (CSF_MMGR "")
+ 
++if(BUILD_LIBRARY_TYPE EQUAL "Static")
+ # find static jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+ if (WIN32)
+@@ -137,7 +138,10 @@ elseif(NOT WIN32)
+   SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
+   JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
+ endif()
++endif()
+ 
++if(BUILD_LIBRARY_TYPE EQUAL "Shared")
+ # find shared jemalloc lib
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
+ JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")
++endif()
diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch
new file mode 100644
index 000000000000..b0a9d026f34e
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-cmake-min-version.patch
@@ -0,0 +1,14 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+
+Bump cmake minimum version to remove warning
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88d34f0..232c643 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
+ 
+ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
+ 
diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch b/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch
new file mode 100644
index 000000000000..cf45ca5ce246
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-tests.patch
@@ -0,0 +1,19 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+
+Fix test harness script
+
+diff --git a/adm/templates/draw.sh b/adm/templates/draw.sh
+index 02e6043..c7347e0 100755
+--- a/adm/templates/draw.sh
++++ b/adm/templates/draw.sh
+@@ -4,7 +4,8 @@ aCurrentPath="$PWD"
+ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+ 
+ source "${aScriptPath}/env.sh" "$1"
++shift
+ 
+ echo 'Hint: use "pload ALL" command to load standard commands'
+-cd ${aCurrentPath}
+-DRAWEXE
++cd "${aCurrentPath}"
++DRAWEXE "$@"
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 482d7bde88bb..f3b6e96ad889 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -10,26 +10,17 @@
 	<name>Proxy Maintainers</name>
 </maintainer>
 <use>
-	<flag name="eigen">
-		Enable support for eigenvalues through the header-only
-		<pkg>dev-cpp/eigen</pkg> package.
-	</flag>
-	<flag name="freeimage">
-		Enable support for image i/o via <pkg>media-libs/freeimage</pkg>
-	</flag>
-	<flag name="json">
-		Enable JSON support through <pkg>dev-libs/rapidjson</pkg>
-	</flag>
-	<flag name="optimize">
-		Don't clear allocated memory. Use optimized memory manager unless
-		tbb USE flag is set.
-	</flag>
-	<flag name="tbb">
-		Enable multithreading with the Intel Threads Building Block
-		<pkg>dev-cpp/tbb</pkg>
-	</flag>
-	<flag name="vtk">
-		Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg>
-	</flag>
+	<flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag>
+	<flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+	<flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag>
+	<flag name="jemalloc">Enable jemalloc allocator support via <pkg>dev-libs/jemalloc</pkg></flag>
+	<flag name="json">Enable JSON support through <pkg>dev-libs/rapidjson</pkg></flag>
+	<flag name="optimize">Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.</flag>
+	<flag name="tbb">Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag>
+	<flag name="testprograms">Indicates whether non-regression OCCT test scripts should be installed</flag>
+	<flag name="vtk">Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg></flag>
 </use>
+<upstream>
+	<remote-id type="github">Open-Cascade-SAS/OCCT</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 25a8b78a8a7a..2e561ce32b79 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -27,7 +27,6 @@ RESTRICT="test"
 
 # ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
 RDEPEND="
-	!app-eselect/eselect-opencascade
 	dev-lang/tcl:=
 	dev-lang/tk:=
 	dev-tcltk/itcl
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index 31f9cb4cbfca..547ddb45705a 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -28,7 +28,6 @@ RESTRICT="test"
 
 # ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
 RDEPEND="
-	!app-eselect/eselect-opencascade
 	dev-lang/tcl:=
 	dev-lang/tk:=
 	media-libs/fontconfig
diff --git a/sci-libs/opencascade/opencascade-7.7.1.ebuild b/sci-libs/opencascade/opencascade-7.7.1.ebuild
new file mode 100644
index 000000000000..384a99eaaf44
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.7.1.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+
+MY_PN="OCCT"
+
+MY_TEST_PV="7.7.0"
+MY_TEST_PV2="${MY_TEST_PV//./_}"
+
+SRC_URI="
+	test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
+		-> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
+"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
+else
+	MY_PV="${PV//./_}"
+	SRC_URI+="
+		https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+
+REQUIRED_USE="
+	?? ( optimize tbb )
+	?? ( opengl gles2-only )
+	test? ( freeimage json opengl )
+"
+
+# There's no easy way to test. Testing needs a rather big environment properly set up.
+RESTRICT="!test? ( test )"
+
+# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
+RDEPEND="
+	dev-lang/tcl:=
+	tk? ( dev-lang/tk:= )
+	dev-libs/double-conversion
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	opengl? (
+		media-libs/libglvnd
+	)
+	X? (
+		x11-libs/libX11
+	)
+	gui? (
+		examples? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtquickcontrols2:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtxml:5
+		)
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	freeimage? ( media-libs/freeimage )
+	jemalloc? ( dev-libs/jemalloc )
+	tbb? ( dev-cpp/tbb:= )
+	vtk? (
+		sci-libs/vtk:=[rendering]
+		tbb? (
+			sci-libs/vtk:=[tbb,-cuda]
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+	doc? ( app-text/doxygen[dot] )
+	gui? (
+		examples? ( dev-qt/linguist-tools:5 )
+	)
+	test? ( dev-tcltk/thread )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
+	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
+	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
+	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
+	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
+	"${FILESDIR}/${PN}-7.7.0-musl.patch"
+	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
+	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
+	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use test; then
+		mkdir "${WORKDIR}/data"
+		pushd "${WORKDIR}/data" > /dev/null || die
+		# should be in paths indicated by CSF_TestDataPath environment variable,
+		# or in subfolder data in the script directory
+		unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-D3RDPARTY_DIR="${ESYSROOT}/usr"
+		-DBUILD_CPP_STANDARD="C++17"
+		-DBUILD_SOVERSION_NUMBERS=2
+
+		-DBUILD_DOC_Overview="$(usex doc)"
+		-DBUILD_Inspector="$(usex gui)"
+
+		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
+		-DBUILD_USE_PCH="no"
+		# -DBUILD_OPT_PROFILE="Default" # Production
+		# -DBUILD_RESOURCES="yes"
+		# -DBUILD_YACCLEX="yes"
+
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
+		-DINSTALL_DIR="${EPREFIX}/usr"
+		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DINSTALL_DIR_DATA="share/${PN}/data"
+		-DINSTALL_DIR_DOC="share/doc/${PF}"
+		-DINSTALL_DIR_INCLUDE="include/${PN}"
+		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
+		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
+		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
+		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_TESTS="share/${PN}/tests"
+		-DINSTALL_DIR_WITH_VERSION="no"
+		-DINSTALL_SAMPLES="$(usex examples)"
+
+		-DINSTALL_TEST_CASES="$(usex testprograms)"
+
+		# no package yet in tree
+		-DUSE_DRACO="no"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FREEIMAGE="$(usex freeimage)"
+		-DUSE_FREETYPE="$(usex freetype)"
+		# Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
+		-DUSE_GLES2="$(usex gles2-only)"
+		# Indicates whether OpenGL desktop should be used in OCCT visualization module
+		-DUSE_OPENGL="$(usex opengl)"
+		# no package in tree
+		-DUSE_OPENVR="no"
+		-DUSE_RAPIDJSON="$(usex json)"
+		-DUSE_TBB="$(usex tbb)"
+		-DUSE_TK="$(usex tk)"
+		-DUSE_VTK="$(usex vtk)"
+		-DUSE_XLIB="$(usex X)"
+	)
+
+	# Select using memory manager tool.
+	if ! use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
+	elif use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+	elif ! use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
+	elif use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DINSTALL_DOC_Overview="yes"
+			-D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
+		)
+	fi
+
+	if use gui; then
+		mycmakeargs+=(
+			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
+			-DBUILD_SAMPLES_QT="$(usex examples)"
+		)
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=(
+			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
+		)
+	fi
+
+	if use vtk; then
+		local vtk_ver
+		vtk_ver="$(best_version "sci-libs/vtk")"
+		vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	fi
+
+	cmake_src_configure
+
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
+		< "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die
+	fi
+
+	# use internal optimized memory manager and don't clear memory with this
+	# memory manager.
+	if use optimize ; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+			-i "${T}/99${PN}" || die
+	fi
+}
+
+src_test() {
+	echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
+
+	if has_version media-fonts/dejavu; then
+		cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
+	fi
+
+	local test_file=${T}/testscript.tcl
+
+	local draw_opts=(
+		i # see ${BUILD_DIR}/custom*.sh
+		# -b # batch mode (no GUI, no viewers)
+		-v # no GUI, use virtual (off-screen) windows for viewers
+	)
+
+	local test_names=(
+		"demo draw bug30430" # prone to dying due to cpu limit
+	)
+	local test_opts=( # run single tests
+		-overwrite
+	)
+	for test_name in "${test_names[@]}"; do
+		cat >> "${test_file}" <<- _EOF_ || die
+			test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
+		_EOF_
+	done
+
+	local testgrid_opts=()
+
+	local SKIP_TESTS=()
+
+	if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
+		SKIP_TESTS+=(
+			'blend complex F4'
+			'bugs'
+			'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
+			'heal checkshape bug32448_1'
+			'hlr exact_hlr bug25813_2'
+
+			'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
+			'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
+			'lowalgos proximity '{A4,A5}
+			'opengl background bug27836'
+			'opengl drivers opengles'
+			'opengles3'
+
+			'demo draw bug30430'
+		)
+
+		local DEL_TESTS=(
+			'opengl/data/background/bug27836'
+			'perf/mesh/bug26965'
+			'v3d/trsf/bug26029'
+		)
+
+		for test in "${DEL_TESTS[@]}"; do
+			rm "${CMAKE_USE_DIR}/tests/${test}" || die
+		done
+	fi
+
+	if ! use vtk; then
+		SKIP_TESTS+=(
+			'vtk'
+		)
+		echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
+	fi
+
+	if [[ -n "${SKIP_TESTS[*]}" ]]; then
+		testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
+	fi
+
+	testgrid_opts+=(
+		# -refresh 5
+		-overwrite
+	)
+	cat >> "${test_file}" <<- _EOF_ || die
+		testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
+	_EOF_
+
+	# # regenerate summary in case we have to
+	# cat >> "${test_file}" <<- _EOF_ || die
+	# 	testsummarize "${BUILD_DIR}/test_results"
+	# _EOF_
+
+	# Work around zink warnings
+	export LIBGL_ALWAYS_SOFTWARE="true"
+
+	export CASROOT="${BUILD_DIR}"
+
+	virtx \
+	"${BUILD_DIR}/draw.sh" \
+		"${draw_opts[@]}" \
+		-f "${test_file}"
+
+	if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
+		eerror "tests never ran!"
+		die
+	fi
+	failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
+	if [[ -n ${failed_tests} ]]; then
+		eerror "Failed tests:"
+		eerror "${failed_tests}"
+		die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x "/usr/share/doc/${PF}/overview/html"
+}
diff --git a/sci-libs/opencascade/opencascade-7.7.2.ebuild b/sci-libs/opencascade/opencascade-7.7.2.ebuild
new file mode 100644
index 000000000000..384a99eaaf44
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.7.2.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+
+MY_PN="OCCT"
+
+MY_TEST_PV="7.7.0"
+MY_TEST_PV2="${MY_TEST_PV//./_}"
+
+SRC_URI="
+	test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
+		-> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
+"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
+else
+	MY_PV="${PV//./_}"
+	SRC_URI+="
+		https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+
+REQUIRED_USE="
+	?? ( optimize tbb )
+	?? ( opengl gles2-only )
+	test? ( freeimage json opengl )
+"
+
+# There's no easy way to test. Testing needs a rather big environment properly set up.
+RESTRICT="!test? ( test )"
+
+# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
+RDEPEND="
+	dev-lang/tcl:=
+	tk? ( dev-lang/tk:= )
+	dev-libs/double-conversion
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	opengl? (
+		media-libs/libglvnd
+	)
+	X? (
+		x11-libs/libX11
+	)
+	gui? (
+		examples? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtquickcontrols2:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtxml:5
+		)
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	freeimage? ( media-libs/freeimage )
+	jemalloc? ( dev-libs/jemalloc )
+	tbb? ( dev-cpp/tbb:= )
+	vtk? (
+		sci-libs/vtk:=[rendering]
+		tbb? (
+			sci-libs/vtk:=[tbb,-cuda]
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+	doc? ( app-text/doxygen[dot] )
+	gui? (
+		examples? ( dev-qt/linguist-tools:5 )
+	)
+	test? ( dev-tcltk/thread )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
+	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
+	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
+	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
+	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
+	"${FILESDIR}/${PN}-7.7.0-musl.patch"
+	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
+	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
+	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use test; then
+		mkdir "${WORKDIR}/data"
+		pushd "${WORKDIR}/data" > /dev/null || die
+		# should be in paths indicated by CSF_TestDataPath environment variable,
+		# or in subfolder data in the script directory
+		unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-D3RDPARTY_DIR="${ESYSROOT}/usr"
+		-DBUILD_CPP_STANDARD="C++17"
+		-DBUILD_SOVERSION_NUMBERS=2
+
+		-DBUILD_DOC_Overview="$(usex doc)"
+		-DBUILD_Inspector="$(usex gui)"
+
+		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
+		-DBUILD_USE_PCH="no"
+		# -DBUILD_OPT_PROFILE="Default" # Production
+		# -DBUILD_RESOURCES="yes"
+		# -DBUILD_YACCLEX="yes"
+
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
+		-DINSTALL_DIR="${EPREFIX}/usr"
+		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DINSTALL_DIR_DATA="share/${PN}/data"
+		-DINSTALL_DIR_DOC="share/doc/${PF}"
+		-DINSTALL_DIR_INCLUDE="include/${PN}"
+		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
+		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
+		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
+		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_TESTS="share/${PN}/tests"
+		-DINSTALL_DIR_WITH_VERSION="no"
+		-DINSTALL_SAMPLES="$(usex examples)"
+
+		-DINSTALL_TEST_CASES="$(usex testprograms)"
+
+		# no package yet in tree
+		-DUSE_DRACO="no"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FREEIMAGE="$(usex freeimage)"
+		-DUSE_FREETYPE="$(usex freetype)"
+		# Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
+		-DUSE_GLES2="$(usex gles2-only)"
+		# Indicates whether OpenGL desktop should be used in OCCT visualization module
+		-DUSE_OPENGL="$(usex opengl)"
+		# no package in tree
+		-DUSE_OPENVR="no"
+		-DUSE_RAPIDJSON="$(usex json)"
+		-DUSE_TBB="$(usex tbb)"
+		-DUSE_TK="$(usex tk)"
+		-DUSE_VTK="$(usex vtk)"
+		-DUSE_XLIB="$(usex X)"
+	)
+
+	# Select using memory manager tool.
+	if ! use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
+	elif use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+	elif ! use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
+	elif use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DINSTALL_DOC_Overview="yes"
+			-D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
+		)
+	fi
+
+	if use gui; then
+		mycmakeargs+=(
+			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
+			-DBUILD_SAMPLES_QT="$(usex examples)"
+		)
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=(
+			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
+		)
+	fi
+
+	if use vtk; then
+		local vtk_ver
+		vtk_ver="$(best_version "sci-libs/vtk")"
+		vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	fi
+
+	cmake_src_configure
+
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
+		< "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die
+	fi
+
+	# use internal optimized memory manager and don't clear memory with this
+	# memory manager.
+	if use optimize ; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+			-i "${T}/99${PN}" || die
+	fi
+}
+
+src_test() {
+	echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
+
+	if has_version media-fonts/dejavu; then
+		cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
+	fi
+
+	local test_file=${T}/testscript.tcl
+
+	local draw_opts=(
+		i # see ${BUILD_DIR}/custom*.sh
+		# -b # batch mode (no GUI, no viewers)
+		-v # no GUI, use virtual (off-screen) windows for viewers
+	)
+
+	local test_names=(
+		"demo draw bug30430" # prone to dying due to cpu limit
+	)
+	local test_opts=( # run single tests
+		-overwrite
+	)
+	for test_name in "${test_names[@]}"; do
+		cat >> "${test_file}" <<- _EOF_ || die
+			test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
+		_EOF_
+	done
+
+	local testgrid_opts=()
+
+	local SKIP_TESTS=()
+
+	if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
+		SKIP_TESTS+=(
+			'blend complex F4'
+			'bugs'
+			'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
+			'heal checkshape bug32448_1'
+			'hlr exact_hlr bug25813_2'
+
+			'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
+			'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
+			'lowalgos proximity '{A4,A5}
+			'opengl background bug27836'
+			'opengl drivers opengles'
+			'opengles3'
+
+			'demo draw bug30430'
+		)
+
+		local DEL_TESTS=(
+			'opengl/data/background/bug27836'
+			'perf/mesh/bug26965'
+			'v3d/trsf/bug26029'
+		)
+
+		for test in "${DEL_TESTS[@]}"; do
+			rm "${CMAKE_USE_DIR}/tests/${test}" || die
+		done
+	fi
+
+	if ! use vtk; then
+		SKIP_TESTS+=(
+			'vtk'
+		)
+		echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
+	fi
+
+	if [[ -n "${SKIP_TESTS[*]}" ]]; then
+		testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
+	fi
+
+	testgrid_opts+=(
+		# -refresh 5
+		-overwrite
+	)
+	cat >> "${test_file}" <<- _EOF_ || die
+		testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
+	_EOF_
+
+	# # regenerate summary in case we have to
+	# cat >> "${test_file}" <<- _EOF_ || die
+	# 	testsummarize "${BUILD_DIR}/test_results"
+	# _EOF_
+
+	# Work around zink warnings
+	export LIBGL_ALWAYS_SOFTWARE="true"
+
+	export CASROOT="${BUILD_DIR}"
+
+	virtx \
+	"${BUILD_DIR}/draw.sh" \
+		"${draw_opts[@]}" \
+		-f "${test_file}"
+
+	if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
+		eerror "tests never ran!"
+		die
+	fi
+	failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
+	if [[ -n ${failed_tests} ]]; then
+		eerror "Failed tests:"
+		eerror "${failed_tests}"
+		die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x "/usr/share/doc/${PF}/overview/html"
+}
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.0.ebuild
new file mode 100644
index 000000000000..2f819b1746e8
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.8.0.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+
+MY_PN="OCCT"
+
+MY_TEST_PV="7.8.0"
+MY_TEST_PV2="${MY_TEST_PV//./_}"
+
+SRC_URI="
+	test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tar.xz )
+"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
+else
+	MY_PV="${PV//./_}"
+	SRC_URI+="
+		https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+
+REQUIRED_USE="
+	?? ( optimize tbb )
+	?? ( opengl gles2-only )
+	test? ( freeimage json opengl )
+"
+
+# There's no easy way to test. Testing needs a rather big environment properly set up.
+RESTRICT="!test? ( test )"
+
+# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
+RDEPEND="
+	dev-lang/tcl:=
+	tk? ( dev-lang/tk:= )
+	dev-libs/double-conversion
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	opengl? (
+		media-libs/libglvnd
+	)
+	X? (
+		x11-libs/libX11
+	)
+	gui? (
+		examples? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtquickcontrols2:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtxml:5
+		)
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	freeimage? ( media-libs/freeimage )
+	jemalloc? ( dev-libs/jemalloc )
+	tbb? ( dev-cpp/tbb:= )
+	vtk? (
+		sci-libs/vtk:=[rendering]
+		tbb? (
+			sci-libs/vtk:=[tbb,-cuda]
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+	doc? ( app-text/doxygen[dot] )
+	gui? (
+		examples? ( dev-qt/linguist-tools:5 )
+	)
+	test? ( dev-tcltk/thread )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
+	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
+	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
+	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
+	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
+	"${FILESDIR}/${PN}-7.7.0-musl.patch"
+	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
+	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
+	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use test; then
+		mkdir "${WORKDIR}/data"
+		pushd "${WORKDIR}/data" > /dev/null || die
+		# should be in paths indicated by CSF_TestDataPath environment variable,
+		# or in subfolder data in the script directory
+		unpack "${PN}-dataset-${MY_TEST_PV}.tar.xz"
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-D3RDPARTY_DIR="${ESYSROOT}/usr"
+		-DBUILD_CPP_STANDARD="C++17"
+		-DBUILD_SOVERSION_NUMBERS=2
+
+		-DBUILD_DOC_Overview="$(usex doc)"
+		-DBUILD_Inspector="$(usex gui)"
+
+		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
+		-DBUILD_USE_PCH="no"
+		# -DBUILD_OPT_PROFILE="Default" # Production
+		# -DBUILD_RESOURCES="yes"
+		# -DBUILD_YACCLEX="yes"
+
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
+		-DINSTALL_DIR="${EPREFIX}/usr"
+		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DINSTALL_DIR_DATA="share/${PN}/data"
+		-DINSTALL_DIR_DOC="share/doc/${PF}"
+		-DINSTALL_DIR_INCLUDE="include/${PN}"
+		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
+		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
+		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
+		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_TESTS="share/${PN}/tests"
+		-DINSTALL_DIR_WITH_VERSION="no"
+		-DINSTALL_SAMPLES="$(usex examples)"
+
+		-DINSTALL_TEST_CASES="$(usex testprograms)"
+
+		# no package yet in tree
+		-DUSE_DRACO="no"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FREEIMAGE="$(usex freeimage)"
+		-DUSE_FREETYPE="$(usex freetype)"
+		# Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
+		-DUSE_GLES2="$(usex gles2-only)"
+		# Indicates whether OpenGL desktop should be used in OCCT visualization module
+		-DUSE_OPENGL="$(usex opengl)"
+		# no package in tree
+		-DUSE_OPENVR="no"
+		-DUSE_RAPIDJSON="$(usex json)"
+		-DUSE_TBB="$(usex tbb)"
+		-DUSE_TK="$(usex tk)"
+		-DUSE_VTK="$(usex vtk)"
+		-DUSE_XLIB="$(usex X)"
+	)
+
+	# Select using memory manager tool.
+	if ! use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
+	elif use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+	elif ! use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
+	elif use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DINSTALL_DOC_Overview="yes"
+			-D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
+		)
+	fi
+
+	if use gui; then
+		mycmakeargs+=(
+			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
+			-DBUILD_SAMPLES_QT="$(usex examples)"
+		)
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=(
+			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
+		)
+	fi
+
+	if use vtk; then
+		local vtk_ver
+		vtk_ver="$(best_version "sci-libs/vtk")"
+		vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	fi
+
+	cmake_src_configure
+
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
+		< "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die
+	fi
+
+	# use internal optimized memory manager and don't clear memory with this
+	# memory manager.
+	if use optimize ; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+			-i "${T}/99${PN}" || die
+	fi
+}
+
+src_test() {
+	echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
+
+	if has_version media-fonts/dejavu; then
+		cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
+	fi
+
+	local test_file=${T}/testscript.tcl
+
+	local draw_opts=(
+		i # see ${BUILD_DIR}/custom*.sh
+		# -b # batch mode (no GUI, no viewers)
+		-v # no GUI, use virtual (off-screen) windows for viewers
+	)
+
+	local test_names=(
+		"demo draw bug30430" # prone to dying due to cpu limit
+	)
+	local test_opts=( # run single tests
+		-overwrite
+	)
+	for test_name in "${test_names[@]}"; do
+		cat >> "${test_file}" <<- _EOF_ || die
+			test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
+		_EOF_
+	done
+
+	local testgrid_opts=()
+
+	local SKIP_TESTS=()
+
+	if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
+		SKIP_TESTS+=(
+			'blend complex F4'
+			'bugs'
+			'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
+			'heal checkshape bug32448_1'
+			'hlr exact_hlr bug25813_2'
+
+			'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
+			'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
+			'lowalgos proximity '{A4,A5}
+			'opengl background bug27836'
+			'opengl drivers opengles'
+			'opengles3'
+
+			'demo draw bug30430'
+		)
+
+		local DEL_TESTS=(
+			'opengl/data/background/bug27836'
+			'perf/mesh/bug26965'
+			'v3d/trsf/bug26029'
+		)
+
+		for test in "${DEL_TESTS[@]}"; do
+			rm "${CMAKE_USE_DIR}/tests/${test}" || die
+		done
+	fi
+
+	if ! use vtk; then
+		SKIP_TESTS+=(
+			'vtk'
+		)
+		echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
+	fi
+
+	if [[ -n "${SKIP_TESTS[*]}" ]]; then
+		testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
+	fi
+
+	testgrid_opts+=(
+		# -refresh 5
+		-overwrite
+	)
+	cat >> "${test_file}" <<- _EOF_ || die
+		testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
+	_EOF_
+
+	# # regenerate summary in case we have to
+	# cat >> "${test_file}" <<- _EOF_ || die
+	# 	testsummarize "${BUILD_DIR}/test_results"
+	# _EOF_
+
+	# Work around zink warnings
+	export LIBGL_ALWAYS_SOFTWARE="true"
+
+	export CASROOT="${BUILD_DIR}"
+
+	virtx \
+	"${BUILD_DIR}/draw.sh" \
+		"${draw_opts[@]}" \
+		-f "${test_file}"
+
+	if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
+		eerror "tests never ran!"
+		die
+	fi
+	failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
+	if [[ -n ${failed_tests} ]]; then
+		eerror "Failed tests:"
+		eerror "${failed_tests}"
+		die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x "/usr/share/doc/${PF}/overview/html"
+}
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
new file mode 100644
index 000000000000..2f819b1746e8
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+
+MY_PN="OCCT"
+
+MY_TEST_PV="7.8.0"
+MY_TEST_PV2="${MY_TEST_PV//./_}"
+
+SRC_URI="
+	test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tar.xz )
+"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
+else
+	MY_PV="${PV//./_}"
+	SRC_URI+="
+		https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+
+REQUIRED_USE="
+	?? ( optimize tbb )
+	?? ( opengl gles2-only )
+	test? ( freeimage json opengl )
+"
+
+# There's no easy way to test. Testing needs a rather big environment properly set up.
+RESTRICT="!test? ( test )"
+
+# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871
+RDEPEND="
+	dev-lang/tcl:=
+	tk? ( dev-lang/tk:= )
+	dev-libs/double-conversion
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	opengl? (
+		media-libs/libglvnd
+	)
+	X? (
+		x11-libs/libX11
+	)
+	gui? (
+		examples? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtquickcontrols2:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtxml:5
+		)
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	freeimage? ( media-libs/freeimage )
+	jemalloc? ( dev-libs/jemalloc )
+	tbb? ( dev-cpp/tbb:= )
+	vtk? (
+		sci-libs/vtk:=[rendering]
+		tbb? (
+			sci-libs/vtk:=[tbb,-cuda]
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	json? ( dev-libs/rapidjson )
+"
+BDEPEND="
+	doc? ( app-text/doxygen[dot] )
+	gui? (
+		examples? ( dev-qt/linguist-tools:5 )
+	)
+	test? ( dev-tcltk/thread )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
+	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
+	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
+	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
+	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
+	"${FILESDIR}/${PN}-7.7.0-musl.patch"
+	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
+	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
+	"${FILESDIR}/${PN}-7.8.0-tests.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use test; then
+		mkdir "${WORKDIR}/data"
+		pushd "${WORKDIR}/data" > /dev/null || die
+		# should be in paths indicated by CSF_TestDataPath environment variable,
+		# or in subfolder data in the script directory
+		unpack "${PN}-dataset-${MY_TEST_PV}.tar.xz"
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-D3RDPARTY_DIR="${ESYSROOT}/usr"
+		-DBUILD_CPP_STANDARD="C++17"
+		-DBUILD_SOVERSION_NUMBERS=2
+
+		-DBUILD_DOC_Overview="$(usex doc)"
+		-DBUILD_Inspector="$(usex gui)"
+
+		-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
+		-DBUILD_USE_PCH="no"
+		# -DBUILD_OPT_PROFILE="Default" # Production
+		# -DBUILD_RESOURCES="yes"
+		# -DBUILD_YACCLEX="yes"
+
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
+		-DINSTALL_DIR="${EPREFIX}/usr"
+		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DINSTALL_DIR_DATA="share/${PN}/data"
+		-DINSTALL_DIR_DOC="share/doc/${PF}"
+		-DINSTALL_DIR_INCLUDE="include/${PN}"
+		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
+		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
+		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
+		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_TESTS="share/${PN}/tests"
+		-DINSTALL_DIR_WITH_VERSION="no"
+		-DINSTALL_SAMPLES="$(usex examples)"
+
+		-DINSTALL_TEST_CASES="$(usex testprograms)"
+
+		# no package yet in tree
+		-DUSE_DRACO="no"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FREEIMAGE="$(usex freeimage)"
+		-DUSE_FREETYPE="$(usex freetype)"
+		# Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
+		-DUSE_GLES2="$(usex gles2-only)"
+		# Indicates whether OpenGL desktop should be used in OCCT visualization module
+		-DUSE_OPENGL="$(usex opengl)"
+		# no package in tree
+		-DUSE_OPENVR="no"
+		-DUSE_RAPIDJSON="$(usex json)"
+		-DUSE_TBB="$(usex tbb)"
+		-DUSE_TK="$(usex tk)"
+		-DUSE_VTK="$(usex vtk)"
+		-DUSE_XLIB="$(usex X)"
+	)
+
+	# Select using memory manager tool.
+	if ! use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
+	elif use jemalloc && ! use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+	elif ! use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
+	elif use jemalloc && use tbb; then
+		mycmakeargs+=( -DUSE_MMGR_TYPE=FLEXIBLE )
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DINSTALL_DOC_Overview="yes"
+			-D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
+		)
+	fi
+
+	if use gui; then
+		mycmakeargs+=(
+			-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
+			-DBUILD_SAMPLES_QT="$(usex examples)"
+		)
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=(
+			-D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
+		)
+	fi
+
+	if use vtk; then
+		local vtk_ver
+		vtk_ver="$(best_version "sci-libs/vtk")"
+		vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	fi
+
+	cmake_src_configure
+
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
+		< "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die
+	fi
+
+	# use internal optimized memory manager and don't clear memory with this
+	# memory manager.
+	if use optimize ; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+			-i "${T}/99${PN}" || die
+	fi
+}
+
+src_test() {
+	echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
+
+	if has_version media-fonts/dejavu; then
+		cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
+	fi
+
+	local test_file=${T}/testscript.tcl
+
+	local draw_opts=(
+		i # see ${BUILD_DIR}/custom*.sh
+		# -b # batch mode (no GUI, no viewers)
+		-v # no GUI, use virtual (off-screen) windows for viewers
+	)
+
+	local test_names=(
+		"demo draw bug30430" # prone to dying due to cpu limit
+	)
+	local test_opts=( # run single tests
+		-overwrite
+	)
+	for test_name in "${test_names[@]}"; do
+		cat >> "${test_file}" <<- _EOF_ || die
+			test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
+		_EOF_
+	done
+
+	local testgrid_opts=()
+
+	local SKIP_TESTS=()
+
+	if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
+		SKIP_TESTS+=(
+			'blend complex F4'
+			'bugs'
+			'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
+			'heal checkshape bug32448_1'
+			'hlr exact_hlr bug25813_2'
+
+			'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
+			'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
+			'lowalgos proximity '{A4,A5}
+			'opengl background bug27836'
+			'opengl drivers opengles'
+			'opengles3'
+
+			'demo draw bug30430'
+		)
+
+		local DEL_TESTS=(
+			'opengl/data/background/bug27836'
+			'perf/mesh/bug26965'
+			'v3d/trsf/bug26029'
+		)
+
+		for test in "${DEL_TESTS[@]}"; do
+			rm "${CMAKE_USE_DIR}/tests/${test}" || die
+		done
+	fi
+
+	if ! use vtk; then
+		SKIP_TESTS+=(
+			'vtk'
+		)
+		echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
+	fi
+
+	if [[ -n "${SKIP_TESTS[*]}" ]]; then
+		testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
+	fi
+
+	testgrid_opts+=(
+		# -refresh 5
+		-overwrite
+	)
+	cat >> "${test_file}" <<- _EOF_ || die
+		testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
+	_EOF_
+
+	# # regenerate summary in case we have to
+	# cat >> "${test_file}" <<- _EOF_ || die
+	# 	testsummarize "${BUILD_DIR}/test_results"
+	# _EOF_
+
+	# Work around zink warnings
+	export LIBGL_ALWAYS_SOFTWARE="true"
+
+	export CASROOT="${BUILD_DIR}"
+
+	virtx \
+	"${BUILD_DIR}/draw.sh" \
+		"${draw_opts[@]}" \
+		-f "${test_file}"
+
+	if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
+		eerror "tests never ran!"
+		die
+	fi
+	failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
+	if [[ -n ${failed_tests} ]]; then
+		eerror "Failed tests:"
+		eerror "${failed_tests}"
+		die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x "/usr/share/doc/${PF}/overview/html"
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d509ac39ba0a..92442769e903 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index bd66a1fefa84..a565bc3e656d 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,5 @@
 DIST z3-4.12.6.tar.gz 5492517 BLAKE2B 721db0881ec77112ca0461897fa01f2b7e9f8748976f54d1b0c36acc583f74c175d0002cf46261f87c15b2614832700c1e5f94a199767a945041950cc3d9048d SHA512 10883877d20adbd229ad4bf65a9b50660d93d85514f933865f06920efd697f51ce34e502fbe451d4c1b2251f13d597050b8277036d4011d9c0f196111d681f8f
 DIST z3-4.13.0.tar.gz 5520232 BLAKE2B 0889c03991311c46c361f269b85fb316c0b4be5cee84f1bb420ef640876058431fe5ec00f58a3dc9377ed3a2ea1cd908a8d9731f9575cf0e4a819fe1f50be670 SHA512 8503787fe0b18592b5a131bcec2cacfa5f5096d76386a1c4fda7a836e472924b154433306d27600ff0d0758ddb710c965901fbfc2e5605919b624b9d4d1bc4fd
 EBUILD z3-4.12.6.ebuild 2858 BLAKE2B 09cbdc8fc592e03499d1d8108717b60424729a8f384ae48e954372a5da1a69b5d7f00b20537891ee449d64fd6f3419df21b73a8380774d0e869bf42492a4b87c SHA512 5710b3de087309c72d5e7b17f611eb3107962486c405ec4f78da5958564616123c904da8e8db48acc92dd5aa9614531b608623728455b88bb4ca147fe85f7c24
-EBUILD z3-4.13.0.ebuild 2606 BLAKE2B 20c67a359fbf84f2f639dd2b496a3528f04e01d0be3fb41a2e013fb1200a61da65cc041ba23f44f80db000ab1d6d265790222952fc4eb5dc60acd624a1808ea3 SHA512 a1a0d85858b83acef24bf6df1c4bdd71868e1cc7aa45f2e311a40225fa3999ece72a38162c8d72cc609207dd70b5d2127b4902dd10a90b5def052a2e9a3dd570
+EBUILD z3-4.13.0.ebuild 2601 BLAKE2B 4c39503c95374125664565b490985c765f39d0426e5949230d4cd671b8fa7bdd02f020332b9f9db80b4ef15bae539ca46cb8228582764bd9a3dd9ef54a1b4a72 SHA512 8db8468a69a23e92e8a373e22965ac19844955b447a9f70b7b048fd831d8a54b310a8cadc9759f749f16832d6e2edaec4a69714f1fe06b3d37dfe6ef717eadad
 MISC metadata.xml 1718 BLAKE2B a94783909c12aa7dd2d5fd1f9d2fc75e20ca91b6abffd6dc020f602e57ef698f7184acaf14def4b6e21bb659e595abd44956ba37a679134d11b523103b0461df SHA512 ed375986a8010a7ae1eadab3107342126194a5513cbb22ce2064ffeff42c7184ea94f4f69017204c73bd61236847475cd1f0d8b3ba369236b26630dc8b2f46a2
diff --git a/sci-mathematics/z3/z3-4.13.0.ebuild b/sci-mathematics/z3/z3-4.13.0.ebuild
index ea1e9651b9f5..3ebd68cb57a5 100644
--- a/sci-mathematics/z3/z3-4.13.0.ebuild
+++ b/sci-mathematics/z3/z3-4.13.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index faec452f9afd..6f7d8c19cae8 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 8b0576c12a82..df2ad863abd8 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD clang-common-15.0.7-r7.ebuild 5462 BLAKE2B 098697c65115e672a1e878167997d820c93cad6a71c5a1dc17c731a031d37f20e50ef41e2f1d3238bc91065ba23bab5db4ab48e8274be9db3cb086ec6cdf7868 SHA512 7500bf0c4fde82b90aac68d09b95a49c241fae8b0d2340f7780e9baed1c85d855e45c4296a7daaa0b831a07f442e0be4faf6510a335fa5c979b3061e28fdb99d
 EBUILD clang-common-16.0.6-r2.ebuild 5694 BLAKE2B 18498071d0ca64d58e19ba1e11a42aa7bdf630f66b30aa80e4b72a9aa69f45723baea1da53462cb351075481ad1500544fbb3243ffd8aec16c04c526e2844723 SHA512 70736fa50d37a505b41b385ed0ecd5bca571e1a04d9bc66dfb010e5e1ab61aadaf26bdec17bb46d7a7850dcb90cbabdb173887c0f93fe94c78a460784bc04ab8
 EBUILD clang-common-17.0.6-r1.ebuild 8633 BLAKE2B 5ae3311d770544ce3796b89caca2924d119bdae2287f8cd52386ae5df4d4b8aac919f71d613cc2d2b471e38caab9e9098565c566ec43870b7ef108599d972500 SHA512 36366fe6f08a78d10d08c2270c2a6b87669a8f1a383e3a1e5533b7ffb88aac5d2544aac2e95bb21d26cd2421d95ee3ad9b48cd194b8bfd6a3eff26b39438f310
-EBUILD clang-common-18.1.0.ebuild 8753 BLAKE2B 562cd03f515472d69eb0be89030066863ec8de6525420eeffab8388241f1d2a4896ec62df754dad5edf7d79061878019d6425cf6c433a27a8b2d69ef0db8f72b SHA512 1ad9a3c60a9d63aa0051e9bfba12c7d5596f443924c1afc122f8c47701f6bcd7109d663596faf284924fd117f80a97ec592ab8465beda03bd9c20a963376946a
 EBUILD clang-common-18.1.2.ebuild 8753 BLAKE2B 562cd03f515472d69eb0be89030066863ec8de6525420eeffab8388241f1d2a4896ec62df754dad5edf7d79061878019d6425cf6c433a27a8b2d69ef0db8f72b SHA512 1ad9a3c60a9d63aa0051e9bfba12c7d5596f443924c1afc122f8c47701f6bcd7109d663596faf284924fd117f80a97ec592ab8465beda03bd9c20a963376946a
 EBUILD clang-common-19.0.0.9999.ebuild 8637 BLAKE2B de63b6709030ab33f7238f2f17fec431b801a5e7f72ae964c6b4f21617078db772a640ee0b15f700ab17e24b1403b2aa113c63c0532336a111ac7e76ed74c19c SHA512 8ec3ab542f3e78d1aaddbb9b2304b7be267dd0620d574a0c14aa07a11a5a6f739c743ffe62dc3d7ac5e11c16f3a3b4167c990d9c0b3217ad5d8ba0b37f4c9fd6
-EBUILD clang-common-19.0.0_pre20240302.ebuild 8637 BLAKE2B de63b6709030ab33f7238f2f17fec431b801a5e7f72ae964c6b4f21617078db772a640ee0b15f700ab17e24b1403b2aa113c63c0532336a111ac7e76ed74c19c SHA512 8ec3ab542f3e78d1aaddbb9b2304b7be267dd0620d574a0c14aa07a11a5a6f739c743ffe62dc3d7ac5e11c16f3a3b4167c990d9c0b3217ad5d8ba0b37f4c9fd6
-EBUILD clang-common-19.0.0_pre20240309.ebuild 8637 BLAKE2B de63b6709030ab33f7238f2f17fec431b801a5e7f72ae964c6b4f21617078db772a640ee0b15f700ab17e24b1403b2aa113c63c0532336a111ac7e76ed74c19c SHA512 8ec3ab542f3e78d1aaddbb9b2304b7be267dd0620d574a0c14aa07a11a5a6f739c743ffe62dc3d7ac5e11c16f3a3b4167c990d9c0b3217ad5d8ba0b37f4c9fd6
 EBUILD clang-common-19.0.0_pre20240316.ebuild 8637 BLAKE2B de63b6709030ab33f7238f2f17fec431b801a5e7f72ae964c6b4f21617078db772a640ee0b15f700ab17e24b1403b2aa113c63c0532336a111ac7e76ed74c19c SHA512 8ec3ab542f3e78d1aaddbb9b2304b7be267dd0620d574a0c14aa07a11a5a6f739c743ffe62dc3d7ac5e11c16f3a3b4167c990d9c0b3217ad5d8ba0b37f4c9fd6
 MISC metadata.xml 865 BLAKE2B decae84b1cb0faa0683824073ff458dc8ca638ae02593bb0ac5850f893eabebb989d68b5d5eca2a2d2a89659f9c3c645face5dd5e34255b01dd43eaa6c5675cb SHA512 aa2caddce30ede46b2e78ada1645de0a8dd67d15c5e466d51fe9b8c1197a03c42da78f3d1f69ec22f1e656ac094ba02b351acfe20533088253245d95c796e646
diff --git a/sys-devel/clang-common/clang-common-18.1.0.ebuild b/sys-devel/clang-common/clang-common-18.1.0.ebuild
deleted file mode 100644
index 623368383908..000000000000
--- a/sys-devel/clang-common/clang-common-18.1.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-Wl,-z,now
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-common/clang-common-19.0.0_pre20240302.ebuild b/sys-devel/clang-common/clang-common-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 80d989986d28..000000000000
--- a/sys-devel/clang-common/clang-common-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-Wl,-z,now
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-common/clang-common-19.0.0_pre20240309.ebuild b/sys-devel/clang-common/clang-common-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 80d989986d28..000000000000
--- a/sys-devel/clang-common/clang-common-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-Wl,-z,now
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-crossdev-wrappers/Manifest b/sys-devel/clang-crossdev-wrappers/Manifest
index e21b769ba93a..e22394b8324d 100644
--- a/sys-devel/clang-crossdev-wrappers/Manifest
+++ b/sys-devel/clang-crossdev-wrappers/Manifest
@@ -1,5 +1,5 @@
-EBUILD clang-crossdev-wrappers-16.ebuild 960 BLAKE2B ef98c0144150c23f3daa2e8240f8fbe9dd5325a92ab5ee4daabc0ae63d397de7e81f65315b10ffa5333365fdd67ce5df8a5fbc9ca518c3995c61a8b2301ef753 SHA512 fe1c40b3b734f2ed740a1d6df92a64dc39846e8dacc94826a27459bad09c455b903220b30ce40b6bd70936876c8e1b57319921c4a3974face9342c433e518d12
-EBUILD clang-crossdev-wrappers-17.ebuild 964 BLAKE2B 10805d04f5b3fbe680b7af131b2264ea50d73747c4ba48d94675689ababb9ab533de2e099e4f7f41ba2b644540d3b037d1171521e4c46123890efa791fb9c153 SHA512 94f87429923e5e71e95c2920b59d3603c36479ae6c21d9be1df94e88cbcd1cc739174df2a719026c372bd06a378ba99d1b9c86330bca03add3c93c780a2942f8
-EBUILD clang-crossdev-wrappers-18.ebuild 905 BLAKE2B 8decbe14e019a0d0e952763df6666782a5b6d9d4846cb1bc5ca432cdcb2ae3a70bfa6eb921c987facd98d8bd19c1d7eded7255a82af5eebc80a99d8573d6fc67 SHA512 ea611c975e92160ba0c7c5ba5ff0fbefcb0a628846e7adcd09fd41db42949734a9f4678cbc8131b8757988246cc1152d5c00c0de91494950cf86e246854c5855
-EBUILD clang-crossdev-wrappers-19.ebuild 905 BLAKE2B 45fc5b4fbf1abc84fc896c718efbf889e788b69d83d31bb8be60c4cba53b3b66beef7606eed3a339b7ab0b975e9642962075430e9cd5622ad09259e5864793bb SHA512 d6d26a42c98a8264bffa0abacef69580cd2add21e07510f1d2082443342278b7889aeaaafbff65fa02dfd801172730cbe808306e84e9cb4bafe9e888db3c5e72
+EBUILD clang-crossdev-wrappers-16.ebuild 983 BLAKE2B 638ebc495b7c4f937a074513dae45fcf12e96f182b422877c7f33cf5618ebf828fc5a93325adf7aa375567b64e74f5014d1f09d28fdb60dc95164dbcbe0eaabb SHA512 9b7a9182f270a7f7f2dbc103312aaa3028952d1c7ce5bfe516f06c8a81361dc0f6836d4ed376c3298ce336a1c698e044166233b3f8d608e49941ecd96e1796bf
+EBUILD clang-crossdev-wrappers-17.ebuild 987 BLAKE2B 3fd80cd27fa4e3a08e406e593b4f20bb8b6e4e3d768731a045391c73e4f0cdc1ba56a37be3dc37f286590a33f0dabaebe56b8d80d3ce9eafbeeaefaea9cc7d0e SHA512 3c72f52099ed85d5a536c97e38340bf4ab41f29e31ce2bd4f77c9c37dfe7e9e0e4342b3fd16296e3e35521925431eb885ebf63cb894711e5544224d85ffadcbe
+EBUILD clang-crossdev-wrappers-18.ebuild 928 BLAKE2B 1a9cd7140833e4a3560267089d73f8c661ba0fd0a961a3ae516483f36dfb091bf64acc0c20df4f29be06b30db5abe301ea045cb042c958e7049434cd3d46fd97 SHA512 ad38e4027c314702d8916b991f56b014abccf9d578826d1dadadfb791ab601955a3874684f8ba20e48e005a7cdf94d326e36a2737b655b3f4e36ade256385817
+EBUILD clang-crossdev-wrappers-19.ebuild 928 BLAKE2B 1a9cd7140833e4a3560267089d73f8c661ba0fd0a961a3ae516483f36dfb091bf64acc0c20df4f29be06b30db5abe301ea045cb042c958e7049434cd3d46fd97 SHA512 ad38e4027c314702d8916b991f56b014abccf9d578826d1dadadfb791ab601955a3874684f8ba20e48e005a7cdf94d326e36a2737b655b3f4e36ade256385817
 MISC metadata.xml 308 BLAKE2B 8a56e0600fd80db6bd01529b04bd4616962e67ee955c95cc6082153f6835efc50e405d18f778ebdb67572c9fe552f6f292ddb960e2802c4bfdac88e00d911d37 SHA512 4c6483cbed3a1b379d433406ac7f04af61d7a0baa8df68e84a173c2d25d6b1dd27e961215235c7cf59a62c5db5917ef8af06696cf84e52d40b364b688c49458a
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
index 02158f98d5fb..2a6e3cd5239e 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-ma
 
 RDEPEND="
 	sys-devel/clang:${SLOT}
+	sys-devel/lld:${SLOT}
 "
 
 src_install() {
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
index ef1d00cf7cf6..4c77cf55e7da 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x6
 
 RDEPEND="
 	sys-devel/clang:${SLOT}
+	sys-devel/lld:${SLOT}
 "
 
 src_install() {
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
index 6cce67ad5210..7604a7a58de0 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ PROPERTIES="live"
 
 RDEPEND="
 	sys-devel/clang:${SLOT}
+	sys-devel/lld:${SLOT}
 "
 
 src_install() {
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
index 167f8e6f3541..7604a7a58de0 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
@@ -17,6 +17,7 @@ PROPERTIES="live"
 
 RDEPEND="
 	sys-devel/clang:${SLOT}
+	sys-devel/lld:${SLOT}
 "
 
 src_install() {
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 97d3d9b3c486..a72364cb2ae4 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,10 +1,7 @@
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.6.ebuild 1448 BLAKE2B be376aab09a0268444784d1a0bcb590222c9c8a118e260b15939e574687334eb476d6f66ab0f1f4fb0841a226c7b7f690666c33bec2d9c14f27a4f30f986b859 SHA512 b0b7a2f5c69890cb2fc0a9c2c8a1910669a4eae16826c0702a2ef508f91b6ec3b5607beab5b24f02951cf9b377f1d09395bd97c27f476137ef6cdf2571330578
 EBUILD clang-runtime-17.0.6.ebuild 1452 BLAKE2B 4a093f4827fa5ebacf44f0bdeb9e2af8a39c491cac3100d96e4d04bf8f82c8247c39369ba85c1d257cbe5c38bb7bd228b986355d4bc446ec8c4c6f19ddac7a18 SHA512 9a3f35cfb6bf234a8e25d9127954fece3e285379469db8bfbbc0c3ca97e952242df930144c528402d48ca64d6b0b5bdadf428d4a41c19b170deb9198bdd3d21b
-EBUILD clang-runtime-18.1.0.ebuild 1455 BLAKE2B 09d026673062eaf3251bc0ac3665217f834c0bb8b57945a138839d86bec58ef7c979a627fb2054a5166c35894e4063bd1972402516d7304c6423639f556ff29a SHA512 aefd613ab3ec054a6829b0f3471384726a05ce410a1f98ab53cca1857bbb19f3b76526ed867a93092fe29acf95078823b2ff8e6b9941705c791c9a42b6eff68c
 EBUILD clang-runtime-18.1.2.ebuild 1455 BLAKE2B 09d026673062eaf3251bc0ac3665217f834c0bb8b57945a138839d86bec58ef7c979a627fb2054a5166c35894e4063bd1972402516d7304c6423639f556ff29a SHA512 aefd613ab3ec054a6829b0f3471384726a05ce410a1f98ab53cca1857bbb19f3b76526ed867a93092fe29acf95078823b2ff8e6b9941705c791c9a42b6eff68c
 EBUILD clang-runtime-19.0.0.9999.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
-EBUILD clang-runtime-19.0.0_pre20240302.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
-EBUILD clang-runtime-19.0.0_pre20240309.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
 EBUILD clang-runtime-19.0.0_pre20240316.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-18.1.0.ebuild b/sys-devel/clang-runtime/clang-runtime-18.1.0.ebuild
deleted file mode 100644
index 38042f073a24..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240302.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 323c0b62c062..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240309.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 323c0b62c062..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 10fa51ac2d12..dd72ce374bf4 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,20 +11,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD clang-15.0.7-r3.ebuild 12523 BLAKE2B d2f9e112d8c8d782b9d19913332445b234870dbff770bfd520b646347d8d804258e5043a155bb5e15f40ecdb41b2c0d70ee72dbe908b5621c2349d37f181d236 SHA512 c4abe3701012b4f9da97ac182680dbaceed802e95be06ae065debea943fa4635e60f4a0f31b6f23e3f7818f2d30dfb1e2c28f1a85dc0175c158b4e5c68b5a23e
 EBUILD clang-16.0.6.ebuild 12452 BLAKE2B 446a354b58fc0535b81596a9a3785a4cd5d7b7ad52a461baa3b6b7beacdc12161f62da588cd837b8b9c8f35307b1a2c885b9d01bf8edc4af1b551efaab09ebe8 SHA512 58b5694a7d28a03edd4a71e3a99b0b2678285e616cdaab82bb196f092a8726e9cd3787ab07d724680113b4f6683e89103cab2478e49a85e7b5c75a633fb1ca51
 EBUILD clang-17.0.6.ebuild 12155 BLAKE2B 8d6a519dc8bfa2ddde7b7025928becbc9c275f470ee5d747c2b1b7437b079d88c4437779e1741aaf5105883628cc7022059f153a3bda809d76e4eca0368fe0a5 SHA512 06c1c403d819f10062732bf39cc7165ab250a7f1420f86a068562426e699603cc2cc9354629ff0dc8e7de64e30f8dc933715f837c4946bbd5e2a6246de28e6f4
-EBUILD clang-18.1.0.ebuild 12225 BLAKE2B d52fd24ce24fb92e1546160ac8aecbb2baef2c0cf40f89ae8acc0d79f381fa657ee11cfd1977d3225b00d0ca865603725f2d598fa513dc3a41baa48061814368 SHA512 9b7ea92fbf5bd44f98bb200069488319038419f468d7b45774840c6fec18de9069d67cedb064f0f395523d369776b723779e7b8e7bf03b2b3a87e606d43bfd9e
 EBUILD clang-18.1.2.ebuild 12225 BLAKE2B d52fd24ce24fb92e1546160ac8aecbb2baef2c0cf40f89ae8acc0d79f381fa657ee11cfd1977d3225b00d0ca865603725f2d598fa513dc3a41baa48061814368 SHA512 9b7ea92fbf5bd44f98bb200069488319038419f468d7b45774840c6fec18de9069d67cedb064f0f395523d369776b723779e7b8e7bf03b2b3a87e606d43bfd9e
 EBUILD clang-19.0.0.9999.ebuild 12121 BLAKE2B e9e8731b4b44f4d0fa46280abea5d33792816ab54c7f40dbff794e7fcdd1fdc1f37b47fdb79efe16f3ee5c5b86a4a6d62da4765da4283467457bf3329e01cb7b SHA512 95974fe447ad803577d6bcbada6dc33b32b7ae1a6626e754529b334c2565b3d5a26dd51c6391edbc6c7defe4450f103dbdbbdcfd4b241c882d922197ef0895ab
-EBUILD clang-19.0.0_pre20240302.ebuild 12121 BLAKE2B e9e8731b4b44f4d0fa46280abea5d33792816ab54c7f40dbff794e7fcdd1fdc1f37b47fdb79efe16f3ee5c5b86a4a6d62da4765da4283467457bf3329e01cb7b SHA512 95974fe447ad803577d6bcbada6dc33b32b7ae1a6626e754529b334c2565b3d5a26dd51c6391edbc6c7defe4450f103dbdbbdcfd4b241c882d922197ef0895ab
-EBUILD clang-19.0.0_pre20240309.ebuild 12121 BLAKE2B e9e8731b4b44f4d0fa46280abea5d33792816ab54c7f40dbff794e7fcdd1fdc1f37b47fdb79efe16f3ee5c5b86a4a6d62da4765da4283467457bf3329e01cb7b SHA512 95974fe447ad803577d6bcbada6dc33b32b7ae1a6626e754529b334c2565b3d5a26dd51c6391edbc6c7defe4450f103dbdbbdcfd4b241c882d922197ef0895ab
 EBUILD clang-19.0.0_pre20240316.ebuild 12121 BLAKE2B e9e8731b4b44f4d0fa46280abea5d33792816ab54c7f40dbff794e7fcdd1fdc1f37b47fdb79efe16f3ee5c5b86a4a6d62da4765da4283467457bf3329e01cb7b SHA512 95974fe447ad803577d6bcbada6dc33b32b7ae1a6626e754529b334c2565b3d5a26dd51c6391edbc6c7defe4450f103dbdbbdcfd4b241c882d922197ef0895ab
 MISC metadata.xml 1318 BLAKE2B 704c1a64297b25da1b2e0eec23cbdf4791273da1babf23292160b6163d43438e62fe214df7afa09232893599951918440954c17a9bfa0c6f829a7d706f564192 SHA512 4677ad146739dd41e025a2335eec353a3d35ac8db7482948fee611566d84b41c4e6bdd75bc3d78f8933d4d9818a36bf222e1aa89e52f945501ff918479fea3b6
diff --git a/sys-devel/clang/clang-18.1.0.ebuild b/sys-devel/clang/clang-18.1.0.ebuild
deleted file mode 100644
index 142fc3861de3..000000000000
--- a/sys-devel/clang/clang-18.1.0.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-19.0.0_pre20240302.ebuild b/sys-devel/clang/clang-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 79df96923121..000000000000
--- a/sys-devel/clang/clang-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-19.0.0_pre20240309.ebuild b/sys-devel/clang/clang-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 79df96923121..000000000000
--- a/sys-devel/clang/clang-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index ecdc83cab5c9..b8f6b3938c20 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD lld-15.0.7.ebuild 2269 BLAKE2B 322d5608e3acfb87bfb720646404ed405a3113c4faf1059428663a50d5566d7842fcff57ccf3aeb5e97b1a9acd4efd862db2368f130e088944ef4f0faf3c90f8 SHA512 e50d1d99fe18b6aba57c06eb6853f3212be1f7b7f2f3c70dcd226a69a4defc753eafcce77eb74f30eaa31b010fa094738718c1cdb23e584ef6e33eb72e536719
 EBUILD lld-16.0.6.ebuild 2324 BLAKE2B 9b849aea16a8188e4da4cfcf0c85fb3e997007e1287ec062aee182c7955c7bc78132e761c2611198c7207283fbe930fbee6bdc9a39b922d6d5387bedadaf1b76 SHA512 a7c3d4c1508e5435ba9f6250c6b2fd3157fb4f2c205a6888736f79fa739c59eec3e901927b53af81de3a3c6d4fa5d576be3eaa6ad45c60e5d952ed4ad9706c2f
 EBUILD lld-17.0.6.ebuild 2365 BLAKE2B 5ff558c13ce011886f81d3e46219fe7252533ae90d076a1e5c92f19ac3816d1cde812c09e52eb54829d2443fc900fab338630a65ec7ec5325ba67ce979973c32 SHA512 c8375f51bd0993a4e164a127f9765789eb5308fa2265aeec777b501e00ed2b2ebd4e20bd21dd5a3b6fb686ac5ded522026ef4c1d8b80ba32c90249a1f76216b7
-EBUILD lld-18.1.0.ebuild 2373 BLAKE2B 3c077afb30cf364f50baa371a6df7bfc20ca719ea8fa450d4276cb375b4503a70a4d87488f23e17b304e45daa61ae44a7c8f33da98cbfdedd07a95221ff15719 SHA512 94aa33e741b4a79c864ff0e49ed09fd115cab80612e96712fbb8344d49134d7d7ec2acc4e3526ab3d184f4c703e9290d8124fb15b8dc248f4df23252947f2cc6
 EBUILD lld-18.1.2.ebuild 2373 BLAKE2B 3c077afb30cf364f50baa371a6df7bfc20ca719ea8fa450d4276cb375b4503a70a4d87488f23e17b304e45daa61ae44a7c8f33da98cbfdedd07a95221ff15719 SHA512 94aa33e741b4a79c864ff0e49ed09fd115cab80612e96712fbb8344d49134d7d7ec2acc4e3526ab3d184f4c703e9290d8124fb15b8dc248f4df23252947f2cc6
 EBUILD lld-19.0.0.9999.ebuild 2293 BLAKE2B 18ee4d77344d5fd4ad0cab1d0a7d54d02edda3b3969dc9b5fbbb16af1296e4a65be293a0472911598c1cab3e23e45a115495fb1368b3a4db48dc4fdc0c7061e7 SHA512 3ad276dc89c7be26ed0e6c90eb1e8f951b0f6ecf163a6534071f63add887619444fdd8f05135a4e23c195773758320a4aede1683a7d0c4779696b60deef19e40
-EBUILD lld-19.0.0_pre20240302.ebuild 2293 BLAKE2B 18ee4d77344d5fd4ad0cab1d0a7d54d02edda3b3969dc9b5fbbb16af1296e4a65be293a0472911598c1cab3e23e45a115495fb1368b3a4db48dc4fdc0c7061e7 SHA512 3ad276dc89c7be26ed0e6c90eb1e8f951b0f6ecf163a6534071f63add887619444fdd8f05135a4e23c195773758320a4aede1683a7d0c4779696b60deef19e40
-EBUILD lld-19.0.0_pre20240309.ebuild 2293 BLAKE2B 18ee4d77344d5fd4ad0cab1d0a7d54d02edda3b3969dc9b5fbbb16af1296e4a65be293a0472911598c1cab3e23e45a115495fb1368b3a4db48dc4fdc0c7061e7 SHA512 3ad276dc89c7be26ed0e6c90eb1e8f951b0f6ecf163a6534071f63add887619444fdd8f05135a4e23c195773758320a4aede1683a7d0c4779696b60deef19e40
 EBUILD lld-19.0.0_pre20240316.ebuild 2293 BLAKE2B 18ee4d77344d5fd4ad0cab1d0a7d54d02edda3b3969dc9b5fbbb16af1296e4a65be293a0472911598c1cab3e23e45a115495fb1368b3a4db48dc4fdc0c7061e7 SHA512 3ad276dc89c7be26ed0e6c90eb1e8f951b0f6ecf163a6534071f63add887619444fdd8f05135a4e23c195773758320a4aede1683a7d0c4779696b60deef19e40
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-18.1.0.ebuild b/sys-devel/lld/lld-18.1.0.ebuild
deleted file mode 100644
index 0d20224dc323..000000000000
--- a/sys-devel/lld/lld-18.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos"
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-19.0.0_pre20240302.ebuild b/sys-devel/lld/lld-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 5440a5c89919..000000000000
--- a/sys-devel/lld/lld-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-19.0.0_pre20240309.ebuild b/sys-devel/lld/lld-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 5440a5c89919..000000000000
--- a/sys-devel/lld/lld-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 074319775c88..fb797e5f8a52 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD llvm-common-15.0.7.ebuild 1014 BLAKE2B da3b7ec6cd3c1e57758312fb9ea25e693305e1ef72b350eea85fbde5a1e636269d84bd491b6f528aee8a9cb8229f6304b371f99e6ac416c661c6519706b83b61 SHA512 68b9d672372fe71e39f2b8f9d80eb1dcb5138b8b9b961f56a4eeb81b3fc4054448a51a46b3a62547ebb6262425512f39bc146e5f2c3703de10ab520f1594e7a4
 EBUILD llvm-common-16.0.6.ebuild 1034 BLAKE2B 1e0a0b6cbb746a7eb45e3f553bc949b69314afc3d913cda004d395e7b322c17f976496eed074cf08718dc2d9efa7f3db81dec4f38394fe6ea2b77793b74f4371 SHA512 8fbb211a6b05d24409642fcb00a4fb798499721cc30c4c5fa2df120ed74d9da7286916cf3788ea26f2cb21e334876417b05a4336fedff99e95d1ebe358f8b311
 EBUILD llvm-common-17.0.6.ebuild 1038 BLAKE2B 520c87adc7e5a3aab9b000c040610bb22da789fde0c20a9ee9042b3a2441a9403d82d1048144cb2e01e7215645872fbc7679ccc6e5d52d0258de3e595aed0d48 SHA512 9e8eae21e06bbe7179fbdbfe6eb7e77e9cc793c4f26605d2b96ca07b5e8e197e13fff8ce8d878d0b87375ba243bc08e48940b880f7602d145d16039515ec77a5
-EBUILD llvm-common-18.1.0.ebuild 1041 BLAKE2B 6fd0cd984783dffba5a2d72e77983646fbdcf8f87cb053a5fbf593c8d53faab420d63f820d5e9a08763f33a5514c2bcf3e10387a5d27fff8e6602a97259ecfb3 SHA512 67162ca5f0ff161b155d8eaa8550091debee142e2bb6498440438b3ea96803e5ac79f6aac00da1396ed0cc644a601ef5473cc688cdd43b12ccdb2ffaf1a50369
 EBUILD llvm-common-18.1.2.ebuild 1041 BLAKE2B 6fd0cd984783dffba5a2d72e77983646fbdcf8f87cb053a5fbf593c8d53faab420d63f820d5e9a08763f33a5514c2bcf3e10387a5d27fff8e6602a97259ecfb3 SHA512 67162ca5f0ff161b155d8eaa8550091debee142e2bb6498440438b3ea96803e5ac79f6aac00da1396ed0cc644a601ef5473cc688cdd43b12ccdb2ffaf1a50369
 EBUILD llvm-common-19.0.0.9999.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
-EBUILD llvm-common-19.0.0_pre20240302.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
-EBUILD llvm-common-19.0.0_pre20240309.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
 EBUILD llvm-common-19.0.0_pre20240316.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-18.1.0.ebuild b/sys-devel/llvm-common/llvm-common-18.1.0.ebuild
deleted file mode 100644
index 32e5c3f51d9b..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240302.ebuild b/sys-devel/llvm-common/llvm-common-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 2d8f35a84179..000000000000
--- a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240309.ebuild b/sys-devel/llvm-common/llvm-common-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 2d8f35a84179..000000000000
--- a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ce373939cfdd..e347a08738e2 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,20 +11,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD llvm-15.0.7-r3.ebuild 12162 BLAKE2B 3e6a38608a1cb09871b4eb9588ca40c3d732d2f8a7e94de0ad0aa1275e21197a27ee8a1210cc2e33c26424da25c6935aafee04c442cdf2b43db4f0e6e3a32def SHA512 82d20e9caf679963e8394aa1b55f86989a795775de68298c297a1c2ed59b2c1e7271e18e834413210f3acc88cee3562fd8aec51e91f4ee3afdfc484469c3fc3d
 EBUILD llvm-16.0.6.ebuild 12467 BLAKE2B 081ca2fbadde59c6b288a9d6faad3fd0fdf13fe36efb8f175131664c64a74db28710c430e6b6aef9034d84ce8891dbf4468d2993668991ba0c2f34c72ebfecb8 SHA512 b9610f54e368e0d9f4842e0325210f610ae9ccf25b0ea9adf2f82b27077eb4253619a884e10e3805a9d00fb1c198b7a6e48900867204bc063aace70069049d60
 EBUILD llvm-17.0.6.ebuild 13118 BLAKE2B a2581eff59019ad026d64cb37a0ea71674ee5d44870e400fbe2f7c533696877fbcefa343efd990a6b5804816ea2f17bdddfa9da265bca6ae4ba73d4205b97d7b SHA512 594afae8db5cf5719ac410e35870020d219aa302ba78cd6e2afbaf40a1268abb91c6ab14afc3a0bf24e6103d90149564b2e9a202a5531255dbbced8ed2eba9ad
-EBUILD llvm-18.1.0.ebuild 13174 BLAKE2B 82f9aa33675edf8d3f8c8628914ed22995ff9a49382b02d441c824e7c107334abc4d077b7f5d42ddd511662711c9d40eb80e0efc7b456747ba93f0f52c9ce384 SHA512 3aa1e60432a89a9e53ff6f20dca88aff76cf7e1120f508006983716ce369a48cdbdd26fd3518eac05fb3cf1f6bdb65f1aafc581bcb88cd5567203b6428ae1a76
 EBUILD llvm-18.1.2.ebuild 13174 BLAKE2B 82f9aa33675edf8d3f8c8628914ed22995ff9a49382b02d441c824e7c107334abc4d077b7f5d42ddd511662711c9d40eb80e0efc7b456747ba93f0f52c9ce384 SHA512 3aa1e60432a89a9e53ff6f20dca88aff76cf7e1120f508006983716ce369a48cdbdd26fd3518eac05fb3cf1f6bdb65f1aafc581bcb88cd5567203b6428ae1a76
 EBUILD llvm-19.0.0.9999.ebuild 13059 BLAKE2B 5600d64d2102dfa36b656aeadca5139bf3d0b790d158c2338e13cd51540437fd6b43276b9375234947e9c3d6680c5df16bee511e1df58e3535608e66033e7046 SHA512 dae4e03c9b86e02b45d2c3f866c7784fc5d83455160efaf3cb2e95dd4bd60829be93cbc5fc88365abd37febaca1c079f311f504f17ab6ee5b57793239341b604
-EBUILD llvm-19.0.0_pre20240302.ebuild 13059 BLAKE2B 5600d64d2102dfa36b656aeadca5139bf3d0b790d158c2338e13cd51540437fd6b43276b9375234947e9c3d6680c5df16bee511e1df58e3535608e66033e7046 SHA512 dae4e03c9b86e02b45d2c3f866c7784fc5d83455160efaf3cb2e95dd4bd60829be93cbc5fc88365abd37febaca1c079f311f504f17ab6ee5b57793239341b604
-EBUILD llvm-19.0.0_pre20240309.ebuild 13059 BLAKE2B 5600d64d2102dfa36b656aeadca5139bf3d0b790d158c2338e13cd51540437fd6b43276b9375234947e9c3d6680c5df16bee511e1df58e3535608e66033e7046 SHA512 dae4e03c9b86e02b45d2c3f866c7784fc5d83455160efaf3cb2e95dd4bd60829be93cbc5fc88365abd37febaca1c079f311f504f17ab6ee5b57793239341b604
 EBUILD llvm-19.0.0_pre20240316.ebuild 13059 BLAKE2B 5600d64d2102dfa36b656aeadca5139bf3d0b790d158c2338e13cd51540437fd6b43276b9375234947e9c3d6680c5df16bee511e1df58e3535608e66033e7046 SHA512 dae4e03c9b86e02b45d2c3f866c7784fc5d83455160efaf3cb2e95dd4bd60829be93cbc5fc88365abd37febaca1c079f311f504f17ab6ee5b57793239341b604
 MISC metadata.xml 2835 BLAKE2B 07816d714509d62c0e0a443cc4af1f1f049497de75431f80a981f662b4f2281a16655be3e733a26099d0d814d5ce26d80cee13aa7a4e8d079168846a8e02670f SHA512 292ccb0a05a0239b5b00c6a84be11b4b385900d6467a6a139af03588c61aff9ac0e4bbcd23e89b2a7d7947f7d8cf8ba9323f2539a6c563a338b73f5ac6ffd00f
diff --git a/sys-devel/llvm/llvm-18.1.0.ebuild b/sys-devel/llvm/llvm-18.1.0.ebuild
deleted file mode 100644
index af10d82f811a..000000000000
--- a/sys-devel/llvm/llvm-18.1.0.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="
-	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
-	ncurses test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	use kernel_Darwin && mycmakeargs+=(
-		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
-		-DTerminfo_LIBRARIES=-lncurses
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild
deleted file mode 100644
index b4633658a186..000000000000
--- a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	ncurses test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	use kernel_Darwin && mycmakeargs+=(
-		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
-		-DTerminfo_LIBRARIES=-lncurses
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240309.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240309.ebuild
deleted file mode 100644
index b4633658a186..000000000000
--- a/sys-devel/llvm/llvm-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	ncurses test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	use kernel_Darwin && mycmakeargs+=(
-		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
-		-DTerminfo_LIBRARIES=-lncurses
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5b9b51e06724..8786cb019851 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 98dbb01a99ce..71adcb5aeedd 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,11 +1,5 @@
-DIST fuse-overlayfs-1.10.tar.gz 104797 BLAKE2B 112dc4814fa817f41dbf938d835366ac38cfc1963cffa7d2e84baaed6e91c7f7db8aa28b3e898b4334aa3f5a4cec8489490a8973ccb3a9bf5781ed6e7e859856 SHA512 cb399a56f2cb0ccf3d294d82cfaa9682db6812e709b1b6d3edf6ce4f7653ddddeffb2810d1c5f8a4178dcdb42e0f65af878fd5c007b31ed18538464482ad1dcf
-DIST fuse-overlayfs-1.11.tar.gz 104921 BLAKE2B d4048957681255a8cce0293b2e899ebd0709ca33c45eaebc5a58ac3db470a573ddf47fe22d1fa460bc2ea4ac6c90003bdd2ce82ed2edd8fb3d64668afd9d07eb SHA512 871424424f76c3d35a9b6005c1fa3d392044581f27d62a6b6c04f4d57ad12421301415c5ada7798e0fbf71043aa90a0194e49922b638b988a355e09fef909d61
 DIST fuse-overlayfs-1.12.tar.gz 99684 BLAKE2B e7ef075c043738d506efcf973ecef7eb321e9f2b2812b318a4087d2a913f022240ed4b0d46e47463daff6976dd99fb587a5819a22c7e58dd52029930e92abffc SHA512 f113ac20b389d2f1c5e5ff160a60c308017e74c9c85d74a7200bab81a4cfa30335a64740c173f17c91ab4feddffb138ca4378e92894645a67eea5ac73d42890f
 DIST fuse-overlayfs-1.13.tar.gz 99775 BLAKE2B 7a0643a5ef029db7f3d1009e9dd4e7a647bf936205723fc3656dfd6d14d622e98f9df15590783492f056ab3f151fd658b6fe65f7177f9499532d02411138ac7c SHA512 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b
-DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f5b0cf1f154f12c13850e5c37b30a0ad84122aa06c7f96c3825cd89cc2d26874abecb8ffbf0ad4edec5e0ffc854962944 SHA512 2199f9a5040832537b57792fe361943065c6132d31613bb1f838e931049703011902fca3abc25f6d7136efb2eb5505161f11c252b91dfb19158ac663e1ec15c2
-EBUILD fuse-overlayfs-1.10.ebuild 577 BLAKE2B f1954ba03a58484b860418c1cd9a06ad5516ae76a5f0e237e1f8f9c1af4929f6f38a366ad22742a4f294e7c970234f42562a38348d521e5a643423036f35536a SHA512 219a921d55250aa326421fddd7e3c08966232833ec70d2c01e1ab7ccded3a52c094019ad3146ce4f660eba1de9fc6cc6d4a01b0b40dd12c2449d69eb687af0da
-EBUILD fuse-overlayfs-1.11.ebuild 504 BLAKE2B 584f9cdd21a7f956f6e34c2afc935feeae031dff27b816fef1c79bbd6a229bd22cfe72b305f564bfa79d2a182278140e3da6afd9ea45db38aeada2b065ab64ad SHA512 6e64dc415bfa62b85e763fbaf6c5d8eb216e9fefc167a687c34f9723540125b99a19d60c5c24250d0d99213c9fdf3abc341d457c58bccc8b738c8ac0926609b6
 EBUILD fuse-overlayfs-1.12.ebuild 504 BLAKE2B 584f9cdd21a7f956f6e34c2afc935feeae031dff27b816fef1c79bbd6a229bd22cfe72b305f564bfa79d2a182278140e3da6afd9ea45db38aeada2b065ab64ad SHA512 6e64dc415bfa62b85e763fbaf6c5d8eb216e9fefc167a687c34f9723540125b99a19d60c5c24250d0d99213c9fdf3abc341d457c58bccc8b738c8ac0926609b6
-EBUILD fuse-overlayfs-1.13.ebuild 506 BLAKE2B 8af54cc3dc5cd34cb916b71adf2b5a564d76c6ae3be534499bfc41cee91bb83a501c861f0f6e1e0aefcefb2fbf327b038e52cfbf59a336e93fda582d7245015f SHA512 499206cbf1282e7aeba3b3fe816209200d784b15cda41dd5b92deecf8b54fc5e08e3fc3eb0366585a442e54fc86455cc4a4336895c3055f6f7acd871ac568086
-EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58
-MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e
+EBUILD fuse-overlayfs-1.13.ebuild 599 BLAKE2B 05d0ee702441d8ca190293cac13c3da6872a16401621afbb354eaef15a7a5061b627de9457ee441f3254b40f1b04e97c69e8e4b2a21df042efe6136c541e752a SHA512 473580f92035c8f8e28da4e9ad06f270debf39a0588b4c461a8c81252b9ec495f635246e1283dab8ab098a7535ffa206dba3f58c76cfe418fbc847dc2063de75
+MISC metadata.xml 588 BLAKE2B 5871bf7c5b838fc87673fbe00610b2aee63be3140af6cc46050f98dc299e922096bdc9928d6700d9779f4ff3bb9212258e7a86d27d764a623b9b53047078b2dc SHA512 aea63b5ea32b83fb24ee7422bd5df24e4f1250f8a33b7281d381531df3d230d2a9c257c3a5d0e379a252c82a82f490b448f6bd2f416d766cd6e000e354408438
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.10.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.10.ebuild
deleted file mode 100644
index 69042c3cdffd..000000000000
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="FUSE implementation for overlayfs"
-HOMEPAGE="https://github.com/containers/fuse-overlayfs"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-RDEPEND=">=sys-fs/fuse-3:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.11.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.11.ebuild
deleted file mode 100644
index 48a89849ffc5..000000000000
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="FUSE implementation for overlayfs"
-HOMEPAGE="https://github.com/containers/fuse-overlayfs"
-SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
index 14a1eaaa7e50..9d71ab06f2f8 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
@@ -17,6 +17,10 @@ DEPEND="sys-fs/fuse:3"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+pkg_pretend() {
+	kernel_is -lt 4 18 && eerror "Linux Kernel > v4.18.0 is required" && die
+}
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild
deleted file mode 100644
index ac1ce4cae8e2..000000000000
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="FUSE implementation for overlayfs"
-HOMEPAGE="https://github.com/containers/fuse-overlayfs"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
-
-RDEPEND=">=sys-fs/fuse-3:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/fuse-overlayfs/metadata.xml b/sys-fs/fuse-overlayfs/metadata.xml
index bb6d344e280c..f802fb94fd07 100644
--- a/sys-fs/fuse-overlayfs/metadata.xml
+++ b/sys-fs/fuse-overlayfs/metadata.xml
@@ -8,4 +8,12 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>me@rahil.rocks</email>
+		<name>Rahil Bhimjiani</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index bb5da269cd1e..dfd67951d4dc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index cb71ea0d8e2d..0198c541207f 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6648 BLAKE2B 89d90e750bc9c3c35e8a42a259fd84bc147ed9b7ed66168435f0010ef8adaf35e04e2cd43c1acc144668e04f5c229ca3cfd99aeb01b4ba2e46f10dd4615e131d SHA512 4f290993d65b7a17280c5ea9a9d19e13cefdde3aebc2236271e02bb1517655895e8eb3adc2047a849ce11dbacf8d7eddec715ab14523122089d856c21ae123a0
 EBUILD compiler-rt-sanitizers-16.0.6.ebuild 6615 BLAKE2B 3ca63eefd87ce02510afa912e809895da7356a8e248f402f3fca1583048feebf80cba20f076e1b28fa4ad7f7c06781910948fc49d980b03276a900dc75114e06 SHA512 7f34e0416b520c75457f8267f28630f7a665f05e22d3f5c2d96ea631fcda79a584b6c0e75cba8b7fba7bf28b87a6b19b49be3b4b8770393caabc5ebc83831ebe
 EBUILD compiler-rt-sanitizers-17.0.6.ebuild 6449 BLAKE2B 98bb6906df46fa426d757e7fa3bacd587988699524b79427242a921b90cac2d59096d18e7179a53ebc89e6b89b3510d3dc5fea7d57ad6f8b7964bc84965b8e0f SHA512 4d37d28dd436dccbe843623507ef254e5019dde6b94f1b67182a89e431edb380b2809584c316257761e2b62f07463d7f2fd6f0fe1cc87bb9cf2dae37f850e46b
-EBUILD compiler-rt-sanitizers-18.1.0.ebuild 6358 BLAKE2B d68fe00a7d79a022d2c66f03d1987491c7d382158426a5f27923f84df05cf5d27697abacad984e94a5b5f333bcd1e60d080ebbc4708f4abe77086bc777aeaaf5 SHA512 fcaf7d7203ede21db563de3b24bbf4d2939856913ba5ee3fff4f29eef18d6e93789791bc3e0d0b4ecd761fd7e8772b3a9f7ea5149300a22f99ee46e6caafbcd9
 EBUILD compiler-rt-sanitizers-18.1.2.ebuild 6358 BLAKE2B d68fe00a7d79a022d2c66f03d1987491c7d382158426a5f27923f84df05cf5d27697abacad984e94a5b5f333bcd1e60d080ebbc4708f4abe77086bc777aeaaf5 SHA512 fcaf7d7203ede21db563de3b24bbf4d2939856913ba5ee3fff4f29eef18d6e93789791bc3e0d0b4ecd761fd7e8772b3a9f7ea5149300a22f99ee46e6caafbcd9
 EBUILD compiler-rt-sanitizers-19.0.0.9999.ebuild 6268 BLAKE2B 98422f1f8be179031ffed4ea9176843521842aff5be2cbdcb21f6ea2020a8d13a1c6fc4810e769c0ec0775f92af45831c4385cc70680765f474885c5ad5b389f SHA512 8677df281de24325290cb99cc4f6087460443c716ac2eea7b3c8175281daad874cd7aab0dda8f4d60213a1b73a8f1a921ae7ad0733d104a7db0e8e5f2ac35127
-EBUILD compiler-rt-sanitizers-19.0.0_pre20240302.ebuild 6268 BLAKE2B 98422f1f8be179031ffed4ea9176843521842aff5be2cbdcb21f6ea2020a8d13a1c6fc4810e769c0ec0775f92af45831c4385cc70680765f474885c5ad5b389f SHA512 8677df281de24325290cb99cc4f6087460443c716ac2eea7b3c8175281daad874cd7aab0dda8f4d60213a1b73a8f1a921ae7ad0733d104a7db0e8e5f2ac35127
-EBUILD compiler-rt-sanitizers-19.0.0_pre20240309.ebuild 6268 BLAKE2B 98422f1f8be179031ffed4ea9176843521842aff5be2cbdcb21f6ea2020a8d13a1c6fc4810e769c0ec0775f92af45831c4385cc70680765f474885c5ad5b389f SHA512 8677df281de24325290cb99cc4f6087460443c716ac2eea7b3c8175281daad874cd7aab0dda8f4d60213a1b73a8f1a921ae7ad0733d104a7db0e8e5f2ac35127
 EBUILD compiler-rt-sanitizers-19.0.0_pre20240316.ebuild 6268 BLAKE2B 98422f1f8be179031ffed4ea9176843521842aff5be2cbdcb21f6ea2020a8d13a1c6fc4810e769c0ec0775f92af45831c4385cc70680765f474885c5ad5b389f SHA512 8677df281de24325290cb99cc4f6087460443c716ac2eea7b3c8175281daad874cd7aab0dda8f4d60213a1b73a8f1a921ae7ad0733d104a7db0e8e5f2ac35127
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0.ebuild
deleted file mode 100644
index 192ead8311f8..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240302.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 57f868d54be6..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240309.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 57f868d54be6..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index ce66ef852dda..b008ee3a3e96 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,21 +7,14 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD compiler-rt-15.0.7.ebuild 4238 BLAKE2B 22d56dbe24c92400bf58942390b06af70fddba89d8fecc9b85162dd7a41c6ee592eaaf883f5ad483f65f74fabccc28f94528688410ee36e2d5279efcc6066de0 SHA512 ca49d23def580d4dcfc4058768eeb9deb6e59ea44575da272d1c142fffe0bf4e3d3c7c9fa6182ab348a3aab11879af116a549cb1a3a03b27b4bf4151cf892aaa
 EBUILD compiler-rt-16.0.6-r4.ebuild 5226 BLAKE2B 7d2d76d79ce49f3d175de87fa982439ceade80787a4f4f96cbda9a0e7c161e89fc49646908e32fd35ed3629956ed0ff79ff2f74754a705264f2d6e2f02f831cb SHA512 14ba6b2644e4b0bcab31e686d395b859eab9ee8ba7adb2242e4fd80d07290cff1243cd644ee8fec53f536dd13d150a16761255ff938ed0c6e717f26165e93945
 EBUILD compiler-rt-16.0.6.ebuild 5198 BLAKE2B 2fe2310703d44d330d97b1fa1b407d99898070604037be31ca762fe65043e1d3d1e046298dc74f3d0cbb3493f985661e362b217170cbe1bf74a47dddfe8987ca SHA512 cc9aabc22f689bfc677ceb74793441674aeca2586a28ff96b812af4822d1b8b5a4147484e41f0bf95ae995488d3e8ee77684fd684b9dab8ade4f1fa57e80c709
 EBUILD compiler-rt-17.0.6.ebuild 5220 BLAKE2B 2c45e13981ee1c101cb58f8f271215a3a9b629d6dea83a7e555035783e919001965c696bae3af8b50ffe31e5ac4908c28eb9d686e6affc42cd9cd0d0a8e0fb70 SHA512 daaec1e40b198a4eb764c7c226fa75c6880df89a33ec2bbba66defbee8834f477ffbea8f9762aabb09459b597653ad1849d6eceb89eab7e65a895cf5ee8882cc
-EBUILD compiler-rt-18.1.0.ebuild 4971 BLAKE2B 74a850ae9ab5c05d0806f6fb6403b7b54141cb0fe43b0e2bfca44d0eb7a25579d390988082fc277b21a66e3b978a37ad9ed1c39ace261aeabf1ab230427e5f3e SHA512 23283ed4a7b7704a4237ec2628633ce81554d501fae10391b90e1983dfb64d86c9dc0d7cbe8d3ae2525591377fac783ae6c1dae8093596ad2ac7d6dda911433b
 EBUILD compiler-rt-18.1.2.ebuild 4971 BLAKE2B 74a850ae9ab5c05d0806f6fb6403b7b54141cb0fe43b0e2bfca44d0eb7a25579d390988082fc277b21a66e3b978a37ad9ed1c39ace261aeabf1ab230427e5f3e SHA512 23283ed4a7b7704a4237ec2628633ce81554d501fae10391b90e1983dfb64d86c9dc0d7cbe8d3ae2525591377fac783ae6c1dae8093596ad2ac7d6dda911433b
 EBUILD compiler-rt-19.0.0.9999.ebuild 4868 BLAKE2B 479ff19239f03c3bcb25cde41a2cb5c6a9a8569e376fc08a2a5affd62bc766a85d68ea080570a373d6f3258c0b1f96211bbe552e82255186ad105fca88f597a0 SHA512 4e19eaf37ca1d3d140be8a4d2bad0f3d69d62c0884d131aac9b3ee4bc58a5e1dd4ca0540cc1153cc293c9bd9521bea1688f7f2b298ca8a24c4c0aedc20d3d753
-EBUILD compiler-rt-19.0.0_pre20240302.ebuild 4868 BLAKE2B 479ff19239f03c3bcb25cde41a2cb5c6a9a8569e376fc08a2a5affd62bc766a85d68ea080570a373d6f3258c0b1f96211bbe552e82255186ad105fca88f597a0 SHA512 4e19eaf37ca1d3d140be8a4d2bad0f3d69d62c0884d131aac9b3ee4bc58a5e1dd4ca0540cc1153cc293c9bd9521bea1688f7f2b298ca8a24c4c0aedc20d3d753
-EBUILD compiler-rt-19.0.0_pre20240309.ebuild 4868 BLAKE2B 479ff19239f03c3bcb25cde41a2cb5c6a9a8569e376fc08a2a5affd62bc766a85d68ea080570a373d6f3258c0b1f96211bbe552e82255186ad105fca88f597a0 SHA512 4e19eaf37ca1d3d140be8a4d2bad0f3d69d62c0884d131aac9b3ee4bc58a5e1dd4ca0540cc1153cc293c9bd9521bea1688f7f2b298ca8a24c4c0aedc20d3d753
 EBUILD compiler-rt-19.0.0_pre20240316.ebuild 4868 BLAKE2B 479ff19239f03c3bcb25cde41a2cb5c6a9a8569e376fc08a2a5affd62bc766a85d68ea080570a373d6f3258c0b1f96211bbe552e82255186ad105fca88f597a0 SHA512 4e19eaf37ca1d3d140be8a4d2bad0f3d69d62c0884d131aac9b3ee4bc58a5e1dd4ca0540cc1153cc293c9bd9521bea1688f7f2b298ca8a24c4c0aedc20d3d753
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-18.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-18.1.0.ebuild
deleted file mode 100644
index e2a452caad61..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.1.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang && ! is_crosspkg; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! is_crosspkg && ! test_compiler ; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240302.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240302.ebuild
deleted file mode 100644
index 75ff3c155c03..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang && ! is_crosspkg; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! is_crosspkg && ! test_compiler ; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240309.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240309.ebuild
deleted file mode 100644
index 75ff3c155c03..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang && ! is_crosspkg; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! is_crosspkg && ! test_compiler ; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 2c2233e84eeb..a889df8cd643 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,20 +6,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD libcxx-15.0.7-r1.ebuild 5283 BLAKE2B 4380fc5b851054a5ec226ee4c92a2b79511d73ac9b3f8bccc977211601eca36113fc0ae605854da53898507021f24a8b319197605c556244d84253bede7b84f4 SHA512 0a5859269422e794deb43ed960651a1dea830af28b5e395f32e28de8e67a1f399507340230af1c84248853f554e751709a60a9a78aeb0eb42804cb41907dbfce
 EBUILD libcxx-16.0.6.ebuild 5300 BLAKE2B 4714e22ad2fdcb07c62ead4cfa47fb4734e45dc055700b63a0f24cd6e93dde960c638fa16f55f4c04c6130fc2a7fa5729814c4aee12e9953f603ea5ccb706cc1 SHA512 3eab779107b5c737d971abe29b7bd9f44a73570957bd7d54d6aaa98ec78a6045d7d69272d611f7f09c60e1aa30bbad46b4bd1358b0b2c69e5bc686ab21444857
 EBUILD libcxx-17.0.6.ebuild 5282 BLAKE2B c046d9e3f2b466f5463e10ff253114c014cc35f3f00f372d2df856a768270f3470d94dda9dc0e93f66a13039a5a8001459d8559217c2329df571f14a1625d23a SHA512 8bb2deee9dc94133632e9054412f9796f082632ebfcdd4dd9aa29bf19fd4ded2c98a1e21462b0849abe3cde4c73de97144f9549969710e5826cde742ce236477
-EBUILD libcxx-18.1.0.ebuild 5447 BLAKE2B 262f4dd0ccb046dcdf7f6970350381a9a48530f7db546f1b6cef5493b5e2a657a403bb0b5fda0d2d100420c6f8f1bac82f635efa8ad6c70d4476ad101c35eb13 SHA512 74ddb2227a2c8cd3d106861dc8155720f757011933835a36b8a5c133de68db80c14d93ad0cd8c3fa62232ce1e0871889b6db15c4bd53d2c1ea34762d93addc0c
 EBUILD libcxx-18.1.2.ebuild 5447 BLAKE2B 262f4dd0ccb046dcdf7f6970350381a9a48530f7db546f1b6cef5493b5e2a657a403bb0b5fda0d2d100420c6f8f1bac82f635efa8ad6c70d4476ad101c35eb13 SHA512 74ddb2227a2c8cd3d106861dc8155720f757011933835a36b8a5c133de68db80c14d93ad0cd8c3fa62232ce1e0871889b6db15c4bd53d2c1ea34762d93addc0c
 EBUILD libcxx-19.0.0.9999.ebuild 5397 BLAKE2B 800024bbb9b69c7c159d05bf481db08bfb4c89b93a517410a892cd80a0a0bbf07119d0babcc952283bfc4dff51dd4ea4253a63cbc3f301db6e281074e4a2061a SHA512 61a3676d06d6e5f44e5a6f0de8f05c0af5384c3e940b2f504bddbe6b9a806ae5c5ff8311f6986a284338761e554894ddb1bec7f5e1b324a6e211b1d60f0eb635
-EBUILD libcxx-19.0.0_pre20240302.ebuild 5397 BLAKE2B 800024bbb9b69c7c159d05bf481db08bfb4c89b93a517410a892cd80a0a0bbf07119d0babcc952283bfc4dff51dd4ea4253a63cbc3f301db6e281074e4a2061a SHA512 61a3676d06d6e5f44e5a6f0de8f05c0af5384c3e940b2f504bddbe6b9a806ae5c5ff8311f6986a284338761e554894ddb1bec7f5e1b324a6e211b1d60f0eb635
-EBUILD libcxx-19.0.0_pre20240309.ebuild 5397 BLAKE2B 800024bbb9b69c7c159d05bf481db08bfb4c89b93a517410a892cd80a0a0bbf07119d0babcc952283bfc4dff51dd4ea4253a63cbc3f301db6e281074e4a2061a SHA512 61a3676d06d6e5f44e5a6f0de8f05c0af5384c3e940b2f504bddbe6b9a806ae5c5ff8311f6986a284338761e554894ddb1bec7f5e1b324a6e211b1d60f0eb635
 EBUILD libcxx-19.0.0_pre20240316.ebuild 5397 BLAKE2B 800024bbb9b69c7c159d05bf481db08bfb4c89b93a517410a892cd80a0a0bbf07119d0babcc952283bfc4dff51dd4ea4253a63cbc3f301db6e281074e4a2061a SHA512 61a3676d06d6e5f44e5a6f0de8f05c0af5384c3e940b2f504bddbe6b9a806ae5c5ff8311f6986a284338761e554894ddb1bec7f5e1b324a6e211b1d60f0eb635
 MISC metadata.xml 598 BLAKE2B b7a60449e0d8e4e7605ec203dfaa45b17a265b024e21a3bcfe05a3aeb6c3d19a1d2a218cb1f9ac9ed52296f0d6e723fed251f364341fb70cbd91b747962db580 SHA512 a23f912efff52c4687767023da826ace8c6e5dcd5e69ece86aabbea99da89e48ba81cdc292f03193e2e8a05743e62ebf4d4735d038e0cc4b42714fa277569335
diff --git a/sys-libs/libcxx/libcxx-18.1.0.ebuild b/sys-libs/libcxx/libcxx-18.1.0.ebuild
deleted file mode 100644
index a6fca47e6c29..000000000000
--- a/sys-libs/libcxx/libcxx-18.1.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="+clang +libcxxabi +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		dev-debug/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-src_prepare() {
-	# hanging tests
-	# https://github.com/llvm/llvm-project/issues/73791
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || die
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals* || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxx/libcxx-19.0.0_pre20240302.ebuild b/sys-libs/libcxx/libcxx-19.0.0_pre20240302.ebuild
deleted file mode 100644
index e29d57a316d3..000000000000
--- a/sys-libs/libcxx/libcxx-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +libcxxabi +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		dev-debug/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-src_prepare() {
-	# hanging tests
-	# https://github.com/llvm/llvm-project/issues/73791
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || die
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals* || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_INSTALL_MODULES=ON
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxx/libcxx-19.0.0_pre20240309.ebuild b/sys-libs/libcxx/libcxx-19.0.0_pre20240309.ebuild
deleted file mode 100644
index e29d57a316d3..000000000000
--- a/sys-libs/libcxx/libcxx-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +libcxxabi +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		dev-debug/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-src_prepare() {
-	# hanging tests
-	# https://github.com/llvm/llvm-project/issues/73791
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || die
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals* || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_INSTALL_MODULES=ON
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 3872f05e5ff0..4b7ea1a06533 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD libcxxabi-15.0.7.ebuild 2911 BLAKE2B 5f2004d2f68fe4eddb0b22be82d28fcca7954d0e3ad9a5510744adc4d0dfd7a1ab9fd928404adcd3eeecc58703f51117d0a80e5895b53e0ae7b71621ad5a435c SHA512 5b8e2c6abdec785649aa41b7f05ab86ecab30ff0631d6078c9b1052b406c320c5847b8f16ffa6d9e62ba4a6bca5959b18770810924d6e6da264fb08d6ff738d0
 EBUILD libcxxabi-16.0.6.ebuild 2932 BLAKE2B 837ab88ee88d5497b8bddb9f001d4b4ddd44ed982ef47114c965174135ed136abd0e3a6f3848a4aba53d0ca3748c54674cb28de8d46fda3bb7a90f326d41c7c6 SHA512 e4ebf7f35d2cad3bf3ba02754c85fee1cd1c4e52887770698ebaa3ef2fe66873f468677d307ea2d6956c2f6d3ac9b61943461193a5315f1e8a2846f2463b0581
 EBUILD libcxxabi-17.0.6.ebuild 2934 BLAKE2B bdc36d4751d76c5cc18cfd16bf6390a64bcde7c97bd8ee60ffc0be4120474a6aedf8b18936159e605698647a8078f465155f6f12593f6010938201349d916879 SHA512 d0a621dccc711c64fec580af200f6dcef19f8fb3b812fd4971362fc50ef21be0ad1996a32a18b684b9b9a5089dec3414cc39543232d0a7beb37186624ff0bcc6
-EBUILD libcxxabi-18.1.0.ebuild 2764 BLAKE2B 1d716983ec2cf1f3ad73b9a3947feb5deddd91750495d7fe5eb9d3ecea9545c7dd4bde00a348272e92aec46845286f9a844077ece2b91a80222bae44c22a514b SHA512 7d94d2fe04acbbc8651c1b7588f9b94603de10aaefc949aaa408d7e7f8d53ccca9b411a2a7f3af7edc2a4f05008977dddd039c7ac1cf17968ba59c7484b3bb68
 EBUILD libcxxabi-18.1.2.ebuild 2764 BLAKE2B 1d716983ec2cf1f3ad73b9a3947feb5deddd91750495d7fe5eb9d3ecea9545c7dd4bde00a348272e92aec46845286f9a844077ece2b91a80222bae44c22a514b SHA512 7d94d2fe04acbbc8651c1b7588f9b94603de10aaefc949aaa408d7e7f8d53ccca9b411a2a7f3af7edc2a4f05008977dddd039c7ac1cf17968ba59c7484b3bb68
 EBUILD libcxxabi-19.0.0.9999.ebuild 2684 BLAKE2B d72cf1584537afd3d13263975a4f903819f6844cac728daab626b269f460865cac59c3199d38ced179ce041294db940b31f07ca74eeabd452f8e2f775e3e206d SHA512 ac7f20fa097c17349959154cce8c75a2083b04d4fb1241d6917c0fd14348a848f9158d050b9791754fc02ec4cd1bc2d82a8ef678a7b025e15524e5af945c9bc1
-EBUILD libcxxabi-19.0.0_pre20240302.ebuild 2684 BLAKE2B d72cf1584537afd3d13263975a4f903819f6844cac728daab626b269f460865cac59c3199d38ced179ce041294db940b31f07ca74eeabd452f8e2f775e3e206d SHA512 ac7f20fa097c17349959154cce8c75a2083b04d4fb1241d6917c0fd14348a848f9158d050b9791754fc02ec4cd1bc2d82a8ef678a7b025e15524e5af945c9bc1
-EBUILD libcxxabi-19.0.0_pre20240309.ebuild 2684 BLAKE2B d72cf1584537afd3d13263975a4f903819f6844cac728daab626b269f460865cac59c3199d38ced179ce041294db940b31f07ca74eeabd452f8e2f775e3e206d SHA512 ac7f20fa097c17349959154cce8c75a2083b04d4fb1241d6917c0fd14348a848f9158d050b9791754fc02ec4cd1bc2d82a8ef678a7b025e15524e5af945c9bc1
 EBUILD libcxxabi-19.0.0_pre20240316.ebuild 2684 BLAKE2B d72cf1584537afd3d13263975a4f903819f6844cac728daab626b269f460865cac59c3199d38ced179ce041294db940b31f07ca74eeabd452f8e2f775e3e206d SHA512 ac7f20fa097c17349959154cce8c75a2083b04d4fb1241d6917c0fd14348a848f9158d050b9791754fc02ec4cd1bc2d82a8ef678a7b025e15524e5af945c9bc1
 MISC metadata.xml 438 BLAKE2B 0a830a06a53a6cdaf138ad7620fe366fae05c1c1451267d6a58caf7da5ce8f5a26d302fab53b9460920074ab5a65991d3bd24fde087809e8dc12188dd94c7676 SHA512 d53e13c497569636fb453a159c5ca5ddfabf8e5debd5f92e5149c52d54c876753842ab73293d6d08e2d9b279363b4f0c743eed3a5027a61246c6b60496be8e87
diff --git a/sys-libs/libcxxabi/libcxxabi-18.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-18.1.0.ebuild
deleted file mode 100644
index 8865a2ce4c2c..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240302.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240302.ebuild
deleted file mode 100644
index d45de5993114..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240309.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240309.ebuild
deleted file mode 100644
index d45de5993114..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 0c9d5164ccf1..ad15b192ddbd 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD libomp-15.0.7-r6.ebuild 3474 BLAKE2B e8ab2666defb3a2d0582f0413ade0efce3d5e5d42ee935dc89915c079dd3d7e2c9dde77edb4e3dadee7b1a60a311615f253feef33f73dee90a0ddc9383bbfaa1 SHA512 e6e672ff57b1419b33b2c0da4e2535005b720e3cd34fa18245fdf319bbe70235bcbaa8baeca36381684041f57032ef4a7f0ece4ad1a84336ebd3087759fe31e9
 EBUILD libomp-16.0.6.ebuild 3988 BLAKE2B 31eee2f5b764917a62cb307fab6dd0744594dc0ebdc04c359a85eb6372421a42431dd9de792671e1f0d326d798df1bbae5949529a22d7f2a99cae02d6734a37b SHA512 4e62220e10ab0aa1b64ae9557055b1ac6ecc145ae81cbe94445a335ad4e0d7e541dd13db4ffcffaaf80a50e2f13136982828d4d0211e5dc925a0b6ef2a2825a7
 EBUILD libomp-17.0.6.ebuild 3991 BLAKE2B 12cfa3e181654b85caee03e7f288631f5cbdb85b1fca67468fda21fc1b9c909a2dbddc9d3c52e46a841149b95a26811217a625cfa1889bf6a0dd93d038291f1e SHA512 e6bc4697f9d8972da5cfa6f6c33328c590ea0c8d394247b6ce5c7ba3a3fb199e3b8f3649341524f7e4217d7ac3ba385c1008b925b8e92d780ae60f24158b766d
-EBUILD libomp-18.1.0.ebuild 4292 BLAKE2B caf7eb6cc41f1ca979417a19250ae25bf5ac6852683d91a912ae085fff40cb7300bcf78eb3a5524c88ff4172d998f7d748186b9834f5d7b46e01f47668f1bc3b SHA512 0dda79f63040ab93d28a9890fb1243c17c39285da1cc6b735ab7838038fc2ff28d6df4d213041d15ee07a8a521bea6bf6311dc2df54bd2881536db66692a30c3
 EBUILD libomp-18.1.2.ebuild 4292 BLAKE2B caf7eb6cc41f1ca979417a19250ae25bf5ac6852683d91a912ae085fff40cb7300bcf78eb3a5524c88ff4172d998f7d748186b9834f5d7b46e01f47668f1bc3b SHA512 0dda79f63040ab93d28a9890fb1243c17c39285da1cc6b735ab7838038fc2ff28d6df4d213041d15ee07a8a521bea6bf6311dc2df54bd2881536db66692a30c3
 EBUILD libomp-19.0.0.9999.ebuild 4208 BLAKE2B 9ed99689a6cbf2d1c3f8f384e046276247f1e3a21cfd1466ae640b21b748ae38fccf29e36be3e87c76859888670f14b8cfad29922275f2f937f284062d931462 SHA512 573165cd67e695dd9140cd8fa6e7e6324e8a7de2b35ae5d2563012eeda275edccbe9daa369752960d3c287c4e55bd767ab2b5e29db604e381c752143eb9b1a3e
-EBUILD libomp-19.0.0_pre20240302.ebuild 4140 BLAKE2B 61eb192159e506145a15670a15549b69555d29e4da39a2d910fa51ee3dd189ea828556debdd13f97d221a50ce09321b3441ff12eedc58f7c662ff674f9b3a1e4 SHA512 adf985a8fdd31f53d5dc6953dc032a02cd45c8b6e69da9d2e8a0c80cfd010341bd063f30432d9665ee2b97e01ed087987b44deb9e3d6f070b2340f6e35561c0b
-EBUILD libomp-19.0.0_pre20240309.ebuild 4208 BLAKE2B 9ed99689a6cbf2d1c3f8f384e046276247f1e3a21cfd1466ae640b21b748ae38fccf29e36be3e87c76859888670f14b8cfad29922275f2f937f284062d931462 SHA512 573165cd67e695dd9140cd8fa6e7e6324e8a7de2b35ae5d2563012eeda275edccbe9daa369752960d3c287c4e55bd767ab2b5e29db604e381c752143eb9b1a3e
 EBUILD libomp-19.0.0_pre20240316.ebuild 4208 BLAKE2B 9ed99689a6cbf2d1c3f8f384e046276247f1e3a21cfd1466ae640b21b748ae38fccf29e36be3e87c76859888670f14b8cfad29922275f2f937f284062d931462 SHA512 573165cd67e695dd9140cd8fa6e7e6324e8a7de2b35ae5d2563012eeda275edccbe9daa369752960d3c287c4e55bd767ab2b5e29db604e381c752143eb9b1a3e
 MISC metadata.xml 883 BLAKE2B 127e896b82a49633a6866b33ca776ebe2dd149a5d04da4484a53186f219a85db0ab9d826bc1cc61d4df9fa54c9bcc546be070a0b28985174925fd947aa09cca2 SHA512 dc32cae01401feb93eede6506b3955c766ff19b44976fcc67277559b23ac151993377daeed9ba83b2dd71dbdeea330cd1208dcb0c9c5f56be270883b31f9b15f
diff --git a/sys-libs/libomp/libomp-18.1.0.ebuild b/sys-libs/libomp/libomp-18.1.0.ebuild
deleted file mode 100644
index 79490dd692cb..000000000000
--- a/sys-libs/libomp/libomp-18.1.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	use offload && llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-		mycmakeargs+=(
-			-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-			-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		)
-
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-
-				# prevent trying to access the GPU
-				-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-				-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-19.0.0_pre20240302.ebuild b/sys-libs/libomp/libomp-19.0.0_pre20240302.ebuild
deleted file mode 100644
index ce432b31535d..000000000000
--- a/sys-libs/libomp/libomp-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-IUSE="
-	+debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	use offload && llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-		# prevent trying to access the GPU
-		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-		mycmakeargs+=(
-			-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-			-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		)
-
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-19.0.0_pre20240309.ebuild b/sys-libs/libomp/libomp-19.0.0_pre20240309.ebuild
deleted file mode 100644
index a40d0aed1c41..000000000000
--- a/sys-libs/libomp/libomp-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-IUSE="
-	+debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	use offload && llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-		mycmakeargs+=(
-			-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-			-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		)
-
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-
-				# prevent trying to access the GPU
-				-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-				-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f696ea50589c..24eb9011f5dc 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814 SHA512 b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
-DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232 SHA512 7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
 DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2 SHA512 a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
 DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390 SHA512 1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
-DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 BLAKE2B eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71 SHA512 687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
-DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 BLAKE2B 5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5 SHA512 b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 BLAKE2B 855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82 SHA512 ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.6-r1.ebuild 3440 BLAKE2B eafe21a3de172043ca0039ba27c80c64d32b02cc86bdb5a6d108ded35770e0352216337cbf24ee4fde43b699a68a85c8145be2d17510d525452bfd5a02674998 SHA512 164fdc1c62405e02c035af7997b8522b51f5b9337d2bb66d7fc9b1f45df74ec70d31b26dc5324c59792d32c543fe18abf74ed3b07a64c131e3c1bb4f9f733c5d
 EBUILD llvm-libunwind-17.0.6.ebuild 3443 BLAKE2B aa12631c752811bb9f4102c1ee36bdefaf43a90bbef93314878afefa8e7ddccb6142cb256c88b99bf8f926df7d7b23f7ce0711b7c56453d0a4474cf8c5bb3e31 SHA512 3b7908e764835a26c9b101bb6b9a7f57294b18af68b39c2d4ab1ae52ab678b8a5b7ca4950e9dea1d521d9ea1f54655ccef77b96a5aa23db8b7990ca26739a326
-EBUILD llvm-libunwind-18.1.0.ebuild 3407 BLAKE2B 6c48a4e9caebd60890460e91e7e64324d66a97813023d582c869b0060468576de1b307160c435587f013ad632335a9968d61731ee4157c5d2272d817ee74a309 SHA512 919fda22d1de77a0db1c6fa14eeee7b6d7444af767e849aacdf952e9b66732c0ac06ae14a6dca2176a59df9738223e11ee8035d3c99bf0ea13799699fadb7d68
 EBUILD llvm-libunwind-18.1.2.ebuild 3407 BLAKE2B 6c48a4e9caebd60890460e91e7e64324d66a97813023d582c869b0060468576de1b307160c435587f013ad632335a9968d61731ee4157c5d2272d817ee74a309 SHA512 919fda22d1de77a0db1c6fa14eeee7b6d7444af767e849aacdf952e9b66732c0ac06ae14a6dca2176a59df9738223e11ee8035d3c99bf0ea13799699fadb7d68
 EBUILD llvm-libunwind-19.0.0.9999.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301
-EBUILD llvm-libunwind-19.0.0_pre20240302.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301
-EBUILD llvm-libunwind-19.0.0_pre20240309.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301
 EBUILD llvm-libunwind-19.0.0_pre20240316.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0.ebuild
deleted file mode 100644
index 944fc4144f4e..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240302.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240302.ebuild
deleted file mode 100644
index df7d3e6095bc..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240302.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240309.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240309.ebuild
deleted file mode 100644
index df7d3e6095bc..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240309.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 1ab71687ff83..909e794ac66d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index 15c486658129..a6ac35a62c5c 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -8,5 +8,5 @@ DIST btop-1.3.0.tar.gz 1142088 BLAKE2B 9f29828e646a8a4de2cacb8d5eb2885afbb5cf776
 DIST btop-1.3.2.tar.gz 1144620 BLAKE2B dfe351fff0b9e0aa376ebc93d76e1542a1cd93eec695bc9056cd296a11d563d676a0f0a61e911d20cbbaef276feb5bf20cafbc5f063475393b82139e0d08386a SHA512 9bbe983aa1336566f78396b829d49c22fe709e4e3d959dabc7524b61defba2638f3b0c50658f755fd1f02dd70572c78cc3cfc8b01772e174d0f34a48e4e178b2
 EBUILD btop-1.2.13-r2.ebuild 1780 BLAKE2B d9827a95372e03d53ce07d17d694ca4b87dbb9d3c935e27152fe3fa9fa56aa1f9c61cad7c2e6934df4d191ffb17feefb1cacdbfda98fcd8c510c5d71c77498ae SHA512 eee2cacd39794ca82cede5fa59d69939e3f503b1c36ef91d714c7ceb12141563b21f6106e4431cd13a0dedc434e0e14373c099118c6fb9e2a48f354c09e82193
 EBUILD btop-1.3.0.ebuild 1287 BLAKE2B 7e939057c6442d058289af189613b8b843ebf03489cb777179a321ff7357f3cdbf665ccaea8ea584ba66575e58e304b5f371b4838f5b91019edcde2093d4e0da SHA512 77cb2c4099214033e04b9447d4f7e4d744c3c30cf2695b9815b7b5c665cbcc186de6306d0d6721d4503a752f07549b8ab2cc42df03711bc76ad39d3afcd69c97
-EBUILD btop-1.3.2.ebuild 1174 BLAKE2B 914d3046676ed030df9fc9c0c9068118188368eb8718072b26d8e281e19a7726e7a4a7a8818aa5dc638030be846c92b76b1997326458525950cc1776206b837c SHA512 a681ff19c5ae9830fdf9802648c76ab4daf72fbeb7c8b832d0f87b670567c38298a140a0f7050c69cca43dc7ca185776ec489ef2a068ca3f2a063164017f37ee
+EBUILD btop-1.3.2.ebuild 1171 BLAKE2B 72abd0d6d6384ccdbe1050c83fb6a1a168083ca665bd0a3a731ba92f389db0dc0d88470e6e1d146ed853a786ce6428b3104be57f6df3247509c6bdda6fabd995 SHA512 56761f95304671cfb9c9a57f3dcd9230c7d9721c3a33ac7a02895762638ebf354484f050a1fa5b3294bc88147fd5dc26adbc36ae5baededcc44d737eb9f4e244
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.3.2.ebuild b/sys-process/btop/btop-1.3.2.ebuild
index 680f75abe713..5b3afb603702 100644
--- a/sys-process/btop/btop-1.3.2.ebuild
+++ b/sys-process/btop/btop-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86"
 
 pkg_setup() {
 	if [[ "${MERGE_TYPE}" != "binary" ]]; then
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 9b94dea801ff..0ae5da616c47 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index ff18c6a88318..0e304c500fcc 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,7 +1,5 @@
-DIST libxfce4ui-4.18.5.tar.bz2 906155 BLAKE2B 2fb977ecbb6c02c485ed2575d189140c5cdce4090529aabbd6a220986cb53241aecfa3a1d1ed79ae873a53d14fa6af80c0732050c6d6aace949e47ba2d71bf8f SHA512 b8b64bf2b71bc327a94c9292b6e1ad5647c6f91b3a806faad894d9973955ec3b05f14a28c0486604c518f7cef1f676337c1405f7d04a8b7b8698f1725346c0f5
 DIST libxfce4ui-4.18.6.tar.bz2 906477 BLAKE2B b9b1a6a3a82760147cdcf9cd462c58044f640bb0c6eaa96f1f56247d6d01ce3ca97d47f6ffa03206452d0501250d6c72fd0c018870ed2c679e9226f44e618ce4 SHA512 1c704dd26793a304fef98c48bc3ca860248e746e9e5c39f22e984439e1a20209763e80e40e6bffcf8f0d773b323b825ebd5da4d88352582e56dfeb7c9b2ca47c
 DIST libxfce4ui-4.19.5.tar.bz2 1185047 BLAKE2B 3c05d0b4d7756699d0591154765f66ffae6e528d1e58963f182921e7070639e708fbbe924bd54d9cb76fca7423b56fe6938c669a8c6f2268831c97aa22158403 SHA512 c8db19e04e3c529c2374238444cc77ef9d3454de4734fff269c1e60c9d1011c0c66cadb926561c7f122485707c75d88835c7dbb4af674c1ad0ff772af50a38d5
-EBUILD libxfce4ui-4.18.5.ebuild 1726 BLAKE2B e23c8583f73eec79dcd1c1a37e9ecc402a3b22b83e025dc6603ee1cfe7db099b77458bbecd411b96be4e73c79bcc0ed9c9b6f131143f79cffc430e2e2a170ce1 SHA512 5fb1006207baf756135c918fb29675629efefcf8d2000d0c5934cebefc7eb4f8b3c3039c21201b6769066ca543f3bebe99cf8da7f53329145ddd0feb1e97b353
 EBUILD libxfce4ui-4.18.6.ebuild 1726 BLAKE2B e23c8583f73eec79dcd1c1a37e9ecc402a3b22b83e025dc6603ee1cfe7db099b77458bbecd411b96be4e73c79bcc0ed9c9b6f131143f79cffc430e2e2a170ce1 SHA512 5fb1006207baf756135c918fb29675629efefcf8d2000d0c5934cebefc7eb4f8b3c3039c21201b6769066ca543f3bebe99cf8da7f53329145ddd0feb1e97b353
 EBUILD libxfce4ui-4.19.5.ebuild 1935 BLAKE2B e4423a610a0988c00523a7f899747df677dcec9d54e9cb8cc8e8f90d2d413786aa3484f8030066cb3cf160c5e634fcd3cc4b7ef40f17075f642c1b4cf8d0880d SHA512 818a370851236cf9d33024b29592e0f269edcf13b67c3acfbf664b91a23bbaa2dbba9c26dd5cc7bef08b6302b4fd780e3586973bd37cb01fefc674d5bb0dda3a
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild
deleted file mode 100644
index bc3c10b62bdf..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4ui/start
-	https://gitlab.xfce.org/xfce/libxfce4ui/
-"
-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"
-IUSE="glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=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?,vala?]
-	>=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
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
index 16b930e109e9..115c27f4bdfb 100644
--- a/xfce-base/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
@@ -1,7 +1,5 @@
 DIST tumbler-4.18.2.tar.bz2 619513 BLAKE2B d93b6dc3b0da1b8ed04af740dec4979daba376572f36e80e6f33c791552a8615fc9f6d6452b0008030a83b322179d1a6f8daa6e5a60344ba09706d0d34de270a SHA512 043e4e7058d1bf0eb4f037924161387042111c7a1bfbf78f8417d0b6463d6b7e72506741f395ca14d6150e2cc0b79d97b2ee3270a30e0d18a0161f639627e255
-DIST tumbler-4.19.0.tar.bz2 692513 BLAKE2B 6b391cf11670dc0dca582ae5052e9d5dc0f8e240c75f14a52ee17f6779a9f0ccc1daf43cb4fad6eff92d6ac52424c769b3e21785b7c743a003340303d9a2d76c SHA512 62fb373f9f9b6d186d9d64a8f4d94a4dc57840e231749b6a0458d582bd205f29c837983901caf53a698ed44667b9e12a000d8dfbbbe9c2e3224622ae41a560e7
 DIST tumbler-4.19.1.tar.bz2 704299 BLAKE2B e6b24c5f9393d661b409001d02db29c36c74ae241279c2880e20cd2935eb16429ab105023ec918014e8899abe0dfa1fe199d2cb7ba22fefda3f0a4db58aded62 SHA512 ed38c9263741dc8c621974eb058a970b8e50c9e0efa551945a12e836fabc8015a4d70c2a558271b11a9783d6778bbacb886c0925618ff0f7850a5680580e2e4d
 EBUILD tumbler-4.18.2.ebuild 1776 BLAKE2B 5ce6a85a7283dcda0c2627fa10ca6b75badd118a1827b99a2686cf1106ba5d5f660cae6cdb955c6e215382b970ae43fb2174796ffdab8aa4bd03271978b6e463 SHA512 1f5fa702472591b2d63e92dbcdc0215caa92f539a23396f1a752e805e3bbcff46f39d2740f063133a03edf80122d7656722a4819c8df30460871a59ceaae2c3f
-EBUILD tumbler-4.19.0.ebuild 1772 BLAKE2B 83b263b026118cff062eabe379ded7576545584b5d69afdeee8963a571ab34050f9f96e2fea88de3ce676aba5f9c643b01c7e90fb1bbfa04e4f810ee14590ecd SHA512 0b1d91e70994332ed3e72ba56485e39bb75f516ae7c506d2bb47398b956f8c9796485f22655dd8a918eaf1952b79f6e26e0effef7a01aaaedd89b2782d25b84c
 EBUILD tumbler-4.19.1.ebuild 1772 BLAKE2B 83b263b026118cff062eabe379ded7576545584b5d69afdeee8963a571ab34050f9f96e2fea88de3ce676aba5f9c643b01c7e90fb1bbfa04e4f810ee14590ecd SHA512 0b1d91e70994332ed3e72ba56485e39bb75f516ae7c506d2bb47398b956f8c9796485f22655dd8a918eaf1952b79f6e26e0effef7a01aaaedd89b2782d25b84c
 MISC metadata.xml 470 BLAKE2B 0fe0650488303d2daadac810327d41b97e1b3b1a42d928865b854f5e74451d428f4b5e56abada30be41024916c8469fe7cd3da31da638343388082e38388f654 SHA512 3728ab31403249dc4c5e92b93ab0cd9afd82de2acacba5076d08c7c11cbdc426e5ff114ad2bc156731c24395fec80b0154274f18c4c0cea0d276941dc998b27d
diff --git a/xfce-base/tumbler/tumbler-4.19.0.ebuild b/xfce-base/tumbler/tumbler-4.19.0.ebuild
deleted file mode 100644
index 38c64f347a48..000000000000
--- a/xfce-base/tumbler/tumbler-4.19.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/tumbler/start
-	https://gitlab.xfce.org/xfce/tumbler/
-"
-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"
-IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
-
-DEPEND="
-	>=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.32.0:= )
-	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] )
-"
-RDEPEND="
-	${DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable epub gepub-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	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-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 6c168e42e4ee..4754333b3a92 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-panel-4.18.6.tar.bz2 1595352 BLAKE2B e4f4eb2f3838cde69a2614021be184ba7281910e595cc868180eba5ce40898fb538cb82ef5317f8316273b6a926553e051730e4918f3d2d339e03729ac8c2a85 SHA512 a1c4597bbbb72d2f3ef90abe0082abe3404e0ea7fa6027e26ca50e31e03645464ce3e0a72f4d927e84c5775a775e3a70f70e25bd3d2e4358da869f9c474e6174
-DIST xfce4-panel-4.19.2.tar.bz2 2192543 BLAKE2B 67fb4732f15160df9f54d1ad84a73ebc280b7e57e518b0032b008586fca521fb686b4fdb02f226e4a4c9ee3c0cdbd0b8ebbe88825bd89ac18ccb6f49f8266759 SHA512 c5db0cf3565e471c9099c97e913de23e1a3038a37fc960397bab5a8ff2908e88a424fcea5aa86b5fbcf903403f972b16cbf7d26386c30408ba4a7d0fc45895c0
 DIST xfce4-panel-4.19.3.tar.bz2 2187643 BLAKE2B d6b597a8abb1d8a079315ccb386797fb98c4bdd332bbafacfcdc5965f528eeb34ff99a08f4c9abaa57be60bc642d164ef11a69b7a847cdeeebfded3ca2ccdedc SHA512 4d7912052bc4dae50fe1d32503987636d8579baa75313f038c647ba3c4662da63c4317ffa9cda3d0188d3e05357df038f739217f2a3f64d7151d8f8c9af261b7
 EBUILD xfce4-panel-4.18.6.ebuild 1556 BLAKE2B fe2bd5784ae8a7ef78b49aaa817a836bd521af830483073e579babcf8bca08c682849ad8c7766a5238e47c18983da7b1cf6d8f4d724ab2a1d6498123da03820e SHA512 f392bdbfc0a9238be123f2cdc69b5c00ae94dd8c3f68b9a7e523aac019de54fd8c454ba58dfaed9c6435e2de838d35477e0eec2541c2aeb75dd66ad87563a2bc
-EBUILD xfce4-panel-4.19.2.ebuild 1849 BLAKE2B 5e3902a04badf9e6c13963df09a3a14d01e0b846ad1aa708b8b5487778130f2aaf108505692b7ea1530ea4c4f7d222a86c12cb8aba9b8feb8523930863c42414 SHA512 69887535b4e2b398fa8e1f79761c214b0b283b6f8f346f991e77875edbef624654947d4b61ceb31de1a67ff1d8b7ce1ef691fbe529dcc940c92b7194abfe6948
 EBUILD xfce4-panel-4.19.3.ebuild 1808 BLAKE2B 40ddb156f53e444748d6821c5b016cec27441fd14fc0a0d62adc027c5720836fc22597d662e2c4fc6878a20996cb99579a912296da12a5b6e10873fd0f07c92a SHA512 99fbe723e1a9cbd425b734a2b6596ce1414486988ee0eae89b1f1cd57e2d57aa95481c36aa0ee07c9291016dcdb9d325357af2c1a3d06001717c8850fda42ef0
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.2.ebuild
deleted file mode 100644
index df24c52871b4..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.19.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-panel/start
-	https://gitlab.xfce.org/xfce/xfce4-panel/
-"
-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"
-IUSE="+dbusmenu introspection vala wayland X"
-REQUIRED_USE="
-	|| ( wayland X )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.72.0
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?]
-	>=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/libxfce4windowing-4.19.1:=
-	>=xfce-base/xfconf-4.13.2:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=gui-libs/gtk-layer-shell-0.7.0
-	)
-	X? (
-		>=x11-libs/libX11-1.6.7
-		x11-libs/libwnck:3
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-		$(use_enable wayland wayland-client)
-		$(use_enable wayland gtk-layer-shell)
-		$(use_enable X gtk-x11)
-		$(use_enable X libwnck)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 8ecfa1116ede..8638f2d0c986 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,7 +1,5 @@
 DIST xfconf-4.18.3.tar.bz2 648479 BLAKE2B 021198bba84c651f05cf47a1034617e088dcce6502eac6f0f160f8000e2309bac5f44b57cc0a4156f907a25002cc3c539ab0c16fc5b3018bbc8ae9a58b212133 SHA512 e1aa133f79ea584af067369f6fd059cd444c4743270ed90a8b0dfe158f7ae6fbc78af62fab67c64674060c2fd1404f06602ac8c019b0db8b70779a17fde4a327
-DIST xfconf-4.19.1.tar.bz2 762466 BLAKE2B dd0ae72fc5ccb1146d69e1e0a9b67e89205ea460f75fcc4ccee1cb36b600f5b145f75d9f10f576bc3040bd065aa8d855788e79fde78541c9853f3cf04f0b5bb3 SHA512 4adb08005caf8373da82ef8db1bfde1f91d723c73b8c836516611d52ccbed86eea6a8dbef8e2a17b9eb4d5199c54bfbfdec970836bb35eb1a951584d75c8faa3
 DIST xfconf-4.19.2.tar.bz2 764445 BLAKE2B d8deed120a8f6b901c544edff48f5748d5d0959cba886a817dc61cefca3cf169d7d557f2ac23c7167f0d294d8cee649d391041250a5475315f9b81e55be5de4c SHA512 fc72592013c2d9375ca66b917585506083e05d60325ced3b2c00877404b4c188ca028c7a213f50a2bf88ec8590864200f32c7fb56df2993baa233abbc1871673
-EBUILD xfconf-4.18.3.ebuild 1718 BLAKE2B 828824afad75a647bccb28c0f56ecdba14624a57351760fa2f89199fc7a2a3bacb8de763f284487b386e0263bfe633b96b5bf1d2c805c369366ad3d14ba8f69f SHA512 996886a10f4a2ae194385a7c2ec0319a76df80798100c1ac9d921b2b73f46ff23456ec36d3ab3b6de303d185d73072708fc71c85f4a4a9082272add50164163b
-EBUILD xfconf-4.19.1.ebuild 1714 BLAKE2B 73b3d692f49f50ed150cc9912d760d05eef45ec8bb586f74301eee2b2aedc6a30e237aff96f051b48182e89f58f012da65be5f74c5d057c4a4a640e306081801 SHA512 58c1d04992f5cdd2dd8beaf15ccb6e5261e7360bd928768a62dec0f29b97992aabf0178591e3fd95fef7740a50a57e41b8736873487876f78c24febb81158048
-EBUILD xfconf-4.19.2.ebuild 1714 BLAKE2B 12a703f1a34026d0c9c844e2c6f360615e106339d08e9203011e77db5d4f62b2555b8a64c405ed4053dc5e9f93c1377c8d00116ce934ef2bedfcbe24022280d2 SHA512 56e7212281e22ea62cea70a22ff3590a9d9dde865a373b79f149b7e1232de5b53ca14dc13bc7f7d5cfac3a40c503d966f74c1ffbc672cb25c690e2bb50a4b9f9
+EBUILD xfconf-4.18.3.ebuild 1718 BLAKE2B 1d92b688c67ba78d86e8e1b2acda74b2db2676199d812a2824d9dbda5d1ec8c30e274fda6883b44320cfe15b27ae6d714d0aa86060e495fe5b3332c6e6cd86d6 SHA512 8be5c3a4c7c8b1382d783b63fbd21d43d328c01521ebcf4b8ded0f03971c0e80a3301261d66ea3369e268bb2632dc842ca677f97c77f294745158fd74c8230d5
+EBUILD xfconf-4.19.2.ebuild 1714 BLAKE2B ec04e6c9c4d432e41990e7d77b8b3c1d095b58af09610e1a3fb07483d23d3ae748946177bf3c390815d7c5cb7ceeadedd60ef19e47ad5e8e818bf31c0996d219 SHA512 6ac99ed6bd94114eff3223d6ee011814a55984e71f7c6a5c3e29aac5019baa363aa2fa1227ade82ff1c11f384cab6f8d53db6fe846ad12719ae70bad9e710dba
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfconf/xfconf-4.18.3.ebuild b/xfce-base/xfconf/xfconf-4.18.3.ebuild
index 2d89a4cb507f..bd96c6897a41 100644
--- a/xfce-base/xfconf/xfconf-4.18.3.ebuild
+++ b/xfce-base/xfconf/xfconf-4.18.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit bash-completion-r1 vala
 
 DESCRIPTION="A configuration management system for Xfce"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 HOMEPAGE="
 	https://docs.xfce.org/xfce/xfconf/start
 	https://gitlab.xfce.org/xfce/xfconf/
 "
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
diff --git a/xfce-base/xfconf/xfconf-4.19.1.ebuild b/xfce-base/xfconf/xfconf-4.19.1.ebuild
deleted file mode 100644
index b60487dfb1ba..000000000000
--- a/xfce-base/xfconf/xfconf-4.19.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 vala
-
-DESCRIPTION="A configuration management system for Xfce"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfconf/start
-	https://gitlab.xfce.org/xfce/xfconf/
-"
-
-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"
-IUSE="debug +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	sys-apps/dbus
-	>=xfce-base/libxfce4util-4.17.3:=
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable debug checks)
-		--with-bash-completion-dir="$(get_bashcompdir)"
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local service_dir=${HOME}/.local/share/dbus-1/services
-	mkdir -p "${service_dir}" || die
-	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
-		[D-BUS Service]
-		Name=org.xfce.Xfconf
-		Exec=${S}/xfconfd/xfconfd
-	EOF
-
-	(
-		# start isolated dbus session bus
-		dbus_data=$(dbus-launch --sh-syntax) || exit
-		eval "${dbus_data}"
-
-		# -j>1 often hangs
-		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
-		nonfatal emake -j1 check
-		ret=${?}
-
-		kill "${DBUS_SESSION_BUS_PID}"
-		exit "${ret}"
-	) || die
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-}
diff --git a/xfce-base/xfconf/xfconf-4.19.2.ebuild b/xfce-base/xfconf/xfconf-4.19.2.ebuild
index e4afc552334d..dfd1888f2be8 100644
--- a/xfce-base/xfconf/xfconf-4.19.2.ebuild
+++ b/xfce-base/xfconf/xfconf-4.19.2.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit bash-completion-r1 vala
 
 DESCRIPTION="A configuration management system for Xfce"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 HOMEPAGE="
 	https://docs.xfce.org/xfce/xfconf/start
 	https://gitlab.xfce.org/xfce/xfconf/
 "
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 5d0fd744939c..b46a52cd06fd 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 894467901f5c..b907177a1eba 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screensaver-4.18.2.tar.bz2 714671 BLAKE2B b83e9c0a77672f7ed24d396c2802b77a57eab39d9b93d8df6364821fda426a2ff3b4ee8715d66920a319c9b838defc098e8dafa4cf85d66c92c0162b5ee40cbe SHA512 5ffeeabd1c8c425a6de8e70cddb6afb54a2e64d6df821655f564e118a9924da4fd21e2300515583fe97caa1c76aba3745801cccc377eb056eeecb98303b08df1
 DIST xfce4-screensaver-4.18.3.tar.bz2 722788 BLAKE2B ee3aafc2250209a20a69fefcd0581bc80fe8f4c5a71d394850efee90c0127ba20bce95e6aa1a411e2b619e2dff70d4d36bda35395c24bb985823141a1f9629dd SHA512 1be2227bf108ccbe48647feb64d532251c3e636fcc0163801f62759828c2549490b0fd13047f68fff3c10ee09033a526311db63629b889453aaf64797097e871
-EBUILD xfce4-screensaver-4.18.2.ebuild 1855 BLAKE2B 3ee8862960cbe22647301c473406882304e30be194647c856f9d9349562826c5d43fc54d3106c7e7b87293aa69c299eecdb07eb4980f757fa0a3320499d5324b SHA512 284dad4bc81a1d0f7d0cb70997600c5858667167bc8e17a8545a6bd5a3ed478f3f5f9d532033e60a6130f11464a53e247b6527296e15f3e47626eed22cf5cc4a
-EBUILD xfce4-screensaver-4.18.3.ebuild 1859 BLAKE2B 36ab82329433acfb96eea7ecae59c0ce8bf101a0344fd8b7e2c318bb4d53f5d480f90db8cb00404c237d624aff18ade56e7ca14c7abde4857eaabf6cded6451f SHA512 26dd4dd1ede70356d62504a09a7ae18b40d85b29a978a5bb961a62a40767c5484888e115e1b526f60de628d2957009c66ba09dbea9e7346af13c8429f976d5c9
+EBUILD xfce4-screensaver-4.18.3.ebuild 1855 BLAKE2B c2abce277169ad02665b88074df1b091d4fbae0f162acda4040088be285eb6c705d150793f7ec737c37ff3011e8bb16928093c956c620c0f108fbf7e105c2e57 SHA512 1d55e7406bcedf9a437f15eba05a96e8cd972ddcf8f147d3db8c6ddbc97c741af1b7a46259b06764e58c1ceffc72c1c907d7048456c91af790c67ce6a94e0cbd
 MISC metadata.xml 292 BLAKE2B cc7b9f7a72918097fc69b330b539d32dbae696c757c3a069bbc4514a8ff1f1931d2643ecaba63a28b7b58299fe1064c3425be00ae4c8f23d5413cef25ab738b3 SHA512 801d1715cbf897ea4ff01e49b7675b8522f07917b1e5908025c590fe18ae0d50463144f5d21ef7b33e9b3bac325f4cf96644c54eb62b8aacf7b512c612b10234
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild
deleted file mode 100644
index 1bc850e4abfa..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="
-	https://docs.xfce.org/apps/screensaver/start
-	https://gitlab.xfce.org/apps/xfce4-screensaver/
-"
-SRC_URI="
-	https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
-"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-DEPEND="
-	>=dev-libs/dbus-glib-0.30
-	>=dev-libs/glib-2.50.0:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=x11-libs/libwnck-3.20:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.18.4:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	elogind? ( sys-auth/elogind )
-	locking? (
-		pam? ( sys-libs/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		--without-console-kit
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with elogind)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-		myconf+=( --with-pam-auth-type=system )
-	fi
-
-	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-screensaver/xfce4-screensaver-4.18.3.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.3.ebuild
index b00901bad5c3..fa23b7780750 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.3.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index cbca80869917..32eeb72b81ed 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-weather-plugin-0.11.1.tar.bz2 3100215 BLAKE2B 454fd3d4f1d40123b4ffd6f648b43079be444fccb876e123604deeee51741819ab3b65d81e56af9f25dce720f34d706f6c87211619a8e55b7f9f41bb5fc530e1 SHA512 625b2aab1ded60eb39171969cd67224569cf7477c0a6e47aa5600a4a09b4a2cecd4b830f4c01669e6f2289edd4e7d882b15d56526a1211b8b5b86141b585778f
 DIST xfce4-weather-plugin-0.11.2.tar.bz2 3096214 BLAKE2B e12d4e0a888b5c9602a0aa0bd595b89bc76a30fa3c250c16c2ddf328d4183c752a624a5e282447b4c987ed4a9ed1dc8e7f9413b3107956e1f67e96fce7213ec8 SHA512 011868165b17501a8b5aacb0387c23be635a1f4037a49501a823cf4aeb2be77d40aad51a4f1d1ccb1057b49e82d4cce2b2cffb82d165cf695340fbab99665ae2
 EBUILD xfce4-weather-plugin-0.11.1.ebuild 1185 BLAKE2B 013f3c7c2653c8cec34d855b88835a376feae6d64d97813974914296f6d9a450d7e3b370139c6ed827a20b72ee09692e1941cd93314eb2415648b27624a59166 SHA512 69d3b750a616e986aceb8c6e2bd0761553152fcf8816c79d15dea64ab09aa6cb2b2f361647cdbfde43cbb6b584e30a7c35f9b11c647d4278cb38fdf0f466be67
-EBUILD xfce4-weather-plugin-0.11.2.ebuild 1217 BLAKE2B 9fdfd06977a2df234ae1ab742181001e3af7e30a5bb0b81502e3996993daa51aa2386a92079cbd4ec2040b5e8283d8a3a08d39ff90426b2af42f417c6f88499f SHA512 c1e28fc01467de6aba2412a4599858b3c7bed7463dfb6cf22700feca0e7031376dd362817f6dbdf03e5bc2604da1ca6637cc76c03f6f0ee63683e37a1cbd4084
+EBUILD xfce4-weather-plugin-0.11.2.ebuild 1215 BLAKE2B 4637d15f40c0fc52c42e12a20ea6c1c19407a9231ae2ff4d499cad802cec0b0221a0e3948996a887f975748cbcaee1688ee522bdf6977b7448b660bf7bf75173 SHA512 d98f1eaad64eb4f4ce9d71c71d9e9a69ee62a165fe151f6852be1bf9e3ff29d7196ac2e2f97602704696abeb28e826df747d353dd6c0ead7883fd7b8aeed52ff
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.11.2.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.11.2.ebuild
index 3ede79a2b03b..33e80da894ca 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.11.2.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.11.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="upower"
 
 DEPEND="