gentoo auto-resync : 25:11:2023 - 16:31:33

author: V3n3RiX <venerix@koprulu.sector> 2023-11-25 16:31:33 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-11-25 16:31:33 +0000
commit: 8cd3c41aa0ccead302235680b9e2fa9903d7548e (patch)
tree: b6f2658c42bd34d0f1dc8b5f572aa5f5886c3d5d
parent: 2900e684ae4bdce1f20652587728095cd01a30a1 (diff)
564 files changed, 2297 insertions, 14428 deletions
diff --git a/Manifest b/Manifest
index 4f55acd392a9..982da78414bf 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29272 BLAKE2B 7bf27950046afa09468d0d7fc75af84addb46b40f50e34d0013e3acfaca0eb2165716c8c9d11401243b190f60df50b9c7f24a5fb546f465285db22afa33c52eb SHA512 e8a2805d0af7cb13437fd5b741101db238a04ddb732c3d5729232dccefe6d1c3f00d0ce2fd21c83faacf2905bd778acdd863d4c4da1e5bee490f998c86e5d4d3
-TIMESTAMP 2023-11-25T09:40:27Z
+MANIFEST Manifest.files.gz 29273 BLAKE2B d0c954578ccb220b0bc8ae921f9c3c0f3b0ea37d9b7a23b136f16853d9b9b92ebf55f3ba69c510895a82f56e4d7fd551c0f084df1959055b405b2be73580d5eb SHA512 544a564183335b57bd439818e5bdcd63a7d1f00b4bf24c522220a487d8ee5fe8a1af00a5925a2deec3f0fce5eefd3d79087ce1d5c6743b2f73514ff795f5389a
+TIMESTAMP 2023-11-25T16:10:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVhwQtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmViHHRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAdJQ//c1x+p2SlBAO3C+4BFC5KkgGy2FaX0vRdruARGkmmwRB3b1n/IOzvA/GA
-qRiJUBUetgKIqNBc75o676YmnUfjo5jE2HTQI9cfyLcVGBFFHcI7BTJH+/9Pq6Nn
-k6TFlY1/dmf78F6O1bTQYwNmeweUxRu7zJE0ppYfjsO1qJ55Vq5BbQUYFWK8r59j
-ecZHEndPiygBsMUtlUEiW0IHBXcj2SogciDFNoNb+DZuZDdTVr9durJRGvc/4wwK
-4lXvSh6P1Y9yOPQofUAu07oT5QALZ3vWJsGsOMZSXwPpHG4ys6WS4xOZmIBx28MR
-aC+iY4xl4SGzsALW69OFjhCyJ0YK8FxLjloXVYKW49gQe9xGDwaV4zPY1RJZYhtE
-+y79hpl0Gimj3h/Fu7qWozpF/Aqz/SKkUl/6fc6+E1nbICtBgWgiX388xfo0ONDe
-C3/El6aSNatRLhtRFP8QUJze6RVVJXsO1X6gsL85Z46Ed1l3QYkHk5ynijqiEUxc
-7CKcZlau9GJRSesDSXw5ZvUcIbfPW7o/DeFmsnE1pjM5mNskN9KiGIglkSQUuf2b
-rWx3fQUDo6nYez1uVDKbfnfUejGbQQGQIpEsgPM6nl0yWzVgZMeY/jAHqgchTJ7I
-vAxOdZCxi19kDj5aWgal+rQW0yuv5ZGG3slpdsK3d9j4ceBMj8w=
-=Y7zZ
+klAriw//VQYgjx90t5nOOYYST2m4XE+CCmat5KCDaPy/XhLiFgYzunK5dpdY5dPI
+ACU5/42ux3fDmsjeyj1VydY2cppvOF0/nfCo/5o7t8Pl3WqSSUDi0aDqz9RgBkQ4
+uBNoCmV6hi0j+jzufSZJ1STdIdfTq1o0x3a1Tnq+4Zs90EuuN4/94YcLZ44tXMTO
+XTSpGUogZTtubhBUecKTz3I0fcs9rrreYFt4dVgaQCZrlyOIKPpAuywO2ZslbOs7
+xpoTvUmKa8rNWTbNfhnvBmObfVt2ug6IOTuHODeE8a7+I6EuJxlBhY46ANC+A9mL
+AXRqoo4rB2xDRnPN4flPIrlsuIdc6cyCergNX+gC/u+EgfDoDVbafixz5NJMmjV2
+XHaUkOCXuZnmAXqQJUuJFJ1mnVD8ZvR+dC97oncQJ3pa3xg3mwKrw3U7ZHz39d0+
+ae5TWBsvpQn3ZG6yDOgHzaUACEZXYbjMFVJHqm57chDEQjF8gwQpL/SytG1QRuYj
+UxgRcXAjK243oFUg9wSZmUIMmIIXeUYaSwRJsojqHgOX7ccZE5lG17Ie52jEiB6A
+Jeez+1VL6bnA3oNNQVhFB3T8Q9u0YVX+ejTKJOQ8qnVEwehvutm4Y855FfBYVGXh
+q7phYxU+DIXp0dGv6nly6Y+Cs5j70D9mXB08dAvVSicPwQuSZOI=
+=zxtR
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7e3ff53cada2..0a9ad20de815 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f138d4f09b49..c9a8ff07efd2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 954be3a4eb3d..af62f9f42a97 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,21 +1,7 @@
-DIST aws-cli-1.29.78.gh.tar.gz 2573503 BLAKE2B 6782a7774568adf5296461e19d71b9de992d9301e3d9c50b97c641448ea0fb9e161feb80cdbce50291fce7d37eaabbc92740ca6b26f432cc5b9105233c2949f8 SHA512 455e6cacb935c1075d9730dda3147dc17598ca01ff9224b9a5f0dffa003a10fb3f2f2e17db1aea9e44b353a5fdd1e3b692308b895ba79ef6433804156ba54b1d
 DIST aws-cli-1.29.84.gh.tar.gz 2576584 BLAKE2B c442a433b0deaacb8b0a94ecb4ce296b60eb6f364bf5626d4ccf606d35b8ad22a2859c29486c9eaa8091edc9f796d271b5b7308638d10f72f128b4548f5250bf SHA512 6f46bde5016df5d227861ed80e847a893144f290dba11c57966f6ccf043690fad42dcc11d18e1b2d27225c8b070063a2c20b8a622628bde37887e44d0e0e7fb5
-DIST aws-cli-1.29.85.gh.tar.gz 2577082 BLAKE2B 8d16b3a989b6a12a154baa8b5d25be6c35c6201f6041cc9f100274815f746c55b1107274575dee928250743b72f02d3db17c8198a9fd3bff7c3bcd827def5cdb SHA512 88164eeddc9d99811d20aa7cd607720fafaa8324738db3eb0aaa76cdb2e8710b828f64c0da3fb14409130fb41880c724918617742a1a3e8d92200f9707865db8
-DIST aws-cli-1.30.0.gh.tar.gz 2584557 BLAKE2B d88e0987b019ca6a86ffb599ee894b8270dda4c4cae2a4bf0a74438d821533d5875d379132f76c70e93bc8b3136f3a8374b60d797f064921597b259589bd5bfe SHA512 5fd1ee8e4f978cfc4964799b3556eae8c0a7cec367dd4f0c096971a948d1ce7b8bc008b05e84c67723f0d603470777d075cc12a014cb2466789033de62e9078e
-DIST aws-cli-1.30.1.gh.tar.gz 2586590 BLAKE2B 6520fcb6818213d4ad9c002cf4dddcf16b35c32fe0a0048a3247a1ba3fd7cbfb32df95715d4397132a0229cdf5aebbe9635f012c5e4f8fa212f41c5a8e1c07bf SHA512 78f7bd8286cdd5e433e2024c0bcac3cf3a9a74f9eca344c4d09b0506c314b3e38c34d8d2c85bbc91a3ac6395bbc319c6bb91536a364a587e7c27902362fdc005
-DIST aws-cli-1.30.2.gh.tar.gz 2589683 BLAKE2B 786aad7e939d3d8349d2d1930c82bad7b0bcdaa36f9df389f155f23e610019ff2f0bdd52da2d6ac4f4e1896a236d7aee895641245a518a3cb094ba3e43e3a594 SHA512 8fbbe9b951942d7230d9875a153403f2fa952657e124686926d94a6f816b9ae093ec025b595ccd7f7a532a930b8b3e516f1030ba7d7038dddaa188c5d3ee5ea9
 DIST aws-cli-1.30.3.gh.tar.gz 2594517 BLAKE2B 67ffda10491b734a15119ed3963735e53a66d868954e908816ef918b0adb706ef23337a4dde76758bb1fc957be8a6794106c2d26b9865a9e9dd6e11cc70c4016 SHA512 9b9474a6206cecd0d9f15aabf1c94421aabf4b0ea2d5c829e59747d5fa68093e6f79b0e554ea1dfb891774a0ab49d1143cd582521bd21735e209b40f040973cd
-DIST aws-cli-1.30.4.gh.tar.gz 2594809 BLAKE2B 2c4ec84c853f18045b3bc29719a4218e250594df3eade300f755d4c0aeec3f8a6001cee3a3a99c9973b848707a1c545b338958341e8ab9028a6b75ef45cb5533 SHA512 18692c83db93a60734fd689ac9808b00cccee4bec2b0ea420e265bead1d14324eaa522f5022c763b2a2835860ec6bafc9e18412197fbec37c12523628df0b3a5
-DIST aws-cli-1.30.5.gh.tar.gz 2595898 BLAKE2B 3117ef5dca0880c761b5284f52cbb732b7e4aff9f720b3beb361a63923b1351b39a1167eeaa9786fab5f06c97d20111cabdc0ba9e96706ccc5b6d5da9d912817 SHA512 f649f876864985ff5798bf53a98cd49b7f6b2d73d4b610251f5faa3686606c908c4f56b8067098580e517c17d0d08d19afc39cc3e960bb91614dfd01014539fc
 DIST aws-cli-1.30.6.gh.tar.gz 2596217 BLAKE2B 3b4cbd540ede2826d212233e76a4431f090fdaa1848f3ddd5e52c3d637e8ccb6ed406072b5b4b3f62b67a29a995d984bfcf1f961915594459e52199dba2341b8 SHA512 8273d234428eb42e8845052c4122e06bb6d0693d2878296a101fa3ce72c5690787c6151aa8f819db83fe36f5263d14efd1e4b469494da8994d47d1f213c394b3
-EBUILD awscli-1.29.78.ebuild 2910 BLAKE2B 37d7473c4ae2ce51a088101ea974c7457ebedc620209987825142b72d3e66031c3316d644802e47f638c95e9c0136092f777985f99254f544fab507b27a1fffa SHA512 cf420614db3c119e1172b4c414815dc9849e42ae111817c6d1b36f9f7483cb6b146ecb2e25d2247afd6d434e77c6be1e4ad45fa3b0a7cd5ef3fd83b87ab63946
-EBUILD awscli-1.29.84.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.29.85.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.30.0.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.30.1.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.30.2.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
+EBUILD awscli-1.29.84.ebuild 2729 BLAKE2B ab4ab697b7133db15d9148aaed10613cde4010ff6edd0075a5cb036011f577fce75aca06c55fe101599b21758e57e74706066d79b7f503f17b86a556febf44e2 SHA512 15436fbd6b0aa43524d5db6ffb3840e4e5f00434e6c45d3c6b7c7bd2197849700c80c6527a99551ce32e9adcc55b1877b0ebdc53ccd9dda9cf63bc71332dfaf8
 EBUILD awscli-1.30.3.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.30.4.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
-EBUILD awscli-1.30.5.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
 EBUILD awscli-1.30.6.ebuild 2751 BLAKE2B 8a51dd7be20208a7fde6fb8836e136abeb6f3e679e43fb8bd6e817df6b7eed1183079b9a170dc1d4034a0167a05b3ad7d2c2c867dc33f483316c1fc972126a17 SHA512 48eea9498ca084097d04d2853bc75bcf1e89a6e7c0a6a1f44b2df3006f8ba0b2a610f10b44152c42e797a8664dcb17c51531b004278eaef0b69184d2b326c9ac
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.78.ebuild b/app-admin/awscli/awscli-1.29.78.ebuild
deleted file mode 100644
index e2d79f63aa58..000000000000
--- a/app-admin/awscli/awscli-1.29.78.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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.29.84.ebuild b/app-admin/awscli/awscli-1.29.84.ebuild
index e5b1ee0667a3..41e916b44553 100644
--- a/app-admin/awscli/awscli-1.29.84.ebuild
+++ b/app-admin/awscli/awscli-1.29.84.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.29.85.ebuild b/app-admin/awscli/awscli-1.29.85.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.29.85.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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.30.0.ebuild b/app-admin/awscli/awscli-1.30.0.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.30.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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.30.1.ebuild b/app-admin/awscli/awscli-1.30.1.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.30.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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.30.2.ebuild b/app-admin/awscli/awscli-1.30.2.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.30.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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.30.4.ebuild b/app-admin/awscli/awscli-1.30.4.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.30.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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.30.5.ebuild b/app-admin/awscli/awscli-1.30.5.ebuild
deleted file mode 100644
index e5b1ee0667a3..000000000000
--- a/app-admin/awscli/awscli-1.30.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 40286c3bd9c5..d0af7d7bfe23 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -16,6 +16,6 @@ DIST rsyslog-doc-8.2308.0.tar.gz 6668327 BLAKE2B ca82fa7b69b19ba03fd30adbdf2bdc3
 DIST rsyslog-doc-8.2310.0.tar.gz 6674428 BLAKE2B e951d564a63c57c1d9d130a315c4bc9f4c25c9cfaf83bece1bbda582eb40260f000c7d9805faca550d8df7b0f6074aff6cc86ff877706cad69909040c3dff5b1 SHA512 cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143
 EBUILD rsyslog-8.2304.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2306.0.ebuild 13411 BLAKE2B faa038d4e8aea22efbc79a226f8ae7e4a7691971db9e28faed0f9e0fc358505e6e24465b5bb174af6e0112bac9bbcb23fcf8cc3c241c78b9606b9320ea306280 SHA512 71252b5d282a5e99df7159e5da266edd3231e4cfcc486aabb4ee7a58710d43af023eeb6f74081792813f2b5ae5e5100fa8f3112fb03e3fca2b1b4fd6970d36b2
-EBUILD rsyslog-8.2308.0.ebuild 13413 BLAKE2B 5f1e31b155100e744172c1d4bd37ac73983cfbe52469995657ebeb71849d9a5fe62453a9cce771a0b0943bfe6e7cae458c429fedb37c83f744a3e0e16e1201e4 SHA512 1163b4513f129f2ab7ba27dff3efbef80d95bdc2ecc2841a40031c2a3d929275b9e1f96720ec049678c80c9514fad46d2bcd9a0b0e5b267b87f9e8ff991a1454
+EBUILD rsyslog-8.2308.0.ebuild 13412 BLAKE2B d81c8bf295a501fe6684727115bc87d3ff382bc86bf4f2dce29cc73ba8b98e548cd69427f096cc2837cbfe9fcb735cf3eac4f81f5b891a22b1306e5996e89d5c SHA512 613bef716c3565a457644b62c5f81e9aa1fb0f9cabcb2f00f0dcb959096db5ecfd3d75f774b92ba56a3ab1035b43b9da15acac467726d113a75d68af493c5839
 EBUILD rsyslog-8.2310.0.ebuild 13413 BLAKE2B 5f1e31b155100e744172c1d4bd37ac73983cfbe52469995657ebeb71849d9a5fe62453a9cce771a0b0943bfe6e7cae458c429fedb37c83f744a3e0e16e1201e4 SHA512 1163b4513f129f2ab7ba27dff3efbef80d95bdc2ecc2841a40031c2a3d929275b9e1f96720ec049678c80c9514fad46d2bcd9a0b0e5b267b87f9e8ff991a1454
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2308.0.ebuild b/app-admin/rsyslog/rsyslog-8.2308.0.ebuild
index 3a033bc82a76..a3a2a0b44378 100644
--- a/app-admin/rsyslog/rsyslog-8.2308.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2308.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 479ae0b782ce..76205dc9ae82 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8b52f398aa41..efad73322904 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,6 +10,7 @@ DIST emacs-28.2-patches-4.tar.xz 6168 BLAKE2B d2968c5f96dcf285f987d32aa8e2ad38c8
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.1-patches-3.tar.xz 2264 BLAKE2B 7003dc29c991170f4bf893aac3d0d82362c625fc9e872f79339e20cea64a8a36145201c66c9a3a9004a638f2854fc9288a954858985f91b6ca204cb3e455bdb4 SHA512 e5ab678512c8d1cb15428e47c2cd7d97daa6140a71866eed35708fde123bcc31da437cd881d18d1535c744250f36989e46d11f6a749a26b3f8977f3aa55edc45
 DIST emacs-29.1-patches-5.tar.xz 3640 BLAKE2B c5f2d55b49961167f9da96fceecf07d526b62dd7e8198bedd16efce51602013d3a1a78de01d397e6605338715510e437eceff5584ca689f7519e88959846728e SHA512 2d6dd89612f45acf6b6d0fe98f0508664ead1d2412c75ed75c99bbd4306d2f348e8a25b904f7b0ea9c07a86d3028a97288d00473348746edc9f54c328925be0c
+DIST emacs-29.1-patches-6.tar.xz 4128 BLAKE2B 95cc5af614f66ae067569cc6f6153bdb8bfbd28cca87d55434f3f528f41252f54d7b42029fce85f97d67ee82f942aa4f13bd701933a7c86216c295b19829c573 SHA512 3be686f300a1e6a53b33ccfb4cc43d473a02ddb9458e9ed1562a5446059b6a441e3cbb1521950b3c52f3165d606143369090351439dbf25bbcc9cbf5d754d017
 DIST emacs-29.1.90.tar.xz 52134992 BLAKE2B 01cf0b56fc9b4cf598b187271c0996f59316f874c5bd9d17f8551cb58e33d742ccb21dcddb061f88f0c6a3f670014a2d130d026ddc97c666958a64c0fbc709fe SHA512 f6120850328d3d7380b009061a64659804e2106eca6117c5430abce1890627c926b635b11f0a972ded6c59fdd13aec440860200fe44d18763ddc61fcdf72cbd8
 DIST emacs-29.1.tar.xz 52081008 BLAKE2B 5bec8fd7c63c04b93b2ad87c12c48373930c1b3c6984d139938ad1eb692af76417dc5494057225a04f77ce4797958056aa3522f50e3b0565ef5f060bb15f5402 SHA512 de10f2af462682019af680e6a82fd33feb05ce6d995bedf5756264fa06e29d90cab02c5884b0aeade1c5ab39cf064e0fb6ff9f78d9eedbd162f0a985945b9ec2
 EBUILD emacs-18.59-r15.ebuild 4342 BLAKE2B 08852c5c45cc4330fb7684be880272a3d2ebe71ad736226f6fb3300ea3a5ad615509ddec3f3f49cc9a563e12e37d3bce4c227f8778634a02a8e632c539877d13 SHA512 85e85041bdc5f509d874602602c7bf5a7ce220a8fbdb7af571570e50e37fba89ec07cfd312b555386aa82a87fa010737787cd829689a83506cc61f4eb84a3839
@@ -18,8 +19,9 @@ EBUILD emacs-26.3-r16.ebuild 11847 BLAKE2B 1aa5aa7ca3cf69a1f5d99623f8d0d91aa15c5
 EBUILD emacs-27.2-r14.ebuild 14379 BLAKE2B 14b13ae5c72bc6c00580f43e6d1fae406147c114a7ea5d5ddaf58b0923a3422f586e056089e693f62c03435931f0beaa0dc7155400e594aa62a8323b6b97b385 SHA512 a644bf252127cae2b78eecd891d37ad81da8e5da935fd0dc08870a443a1d164c92302c323672e5fad457000fe481eb057185fe9a3926e2bd04234a6f794fa181
 EBUILD emacs-28.2-r10.ebuild 16888 BLAKE2B 2722538b39418a2bdebe677d024b687d848829bbd58656c99e4b95953b747bf7d385c7cc263054971263c7042b30d93a5e445b0e609f5b2a29b107ee382891d4 SHA512 2bacafc70fa9454f30bbb1083c9939f6038dce92fd61535e339df99380833597a7c278bf70ebaf583702a421c669e980a43679f7d46daff163cb0c68c49bd71c
 EBUILD emacs-29.1-r1.ebuild 18597 BLAKE2B 71dd2c29145575dc8afc7c78efacc10ff522ab02f1ce0d5e7276a02813df4e70c3e08e0e31efd026b24200847d7f8857384571571d36588c07d67fb608b959fa SHA512 882c011761c347c7cb2be4441a7ebd2927ecd65e16abb0f3e7399409d5f20d3b8353d9143007dd97522b54278ff280e90953544d0778fee6a3b6c170dd5ffe4e
-EBUILD emacs-29.1-r5.ebuild 18762 BLAKE2B d615badac8eeef56a9c01461f619e918c707769a5acac1106ab613886c2b162a6b8d603eb3951de1946b7758a7562ef96d8de39919d61885affdb50dc63d1d88 SHA512 f219e0f1336fc1df83a160d0fdbed490e8fdd2f885dec1c98cd68173a2587875b5704f83db1cea3985f3f73c73909c514d652cf1417b651d4bd9362857f2e9ba
-EBUILD emacs-29.1.90.ebuild 18626 BLAKE2B b8566b6c6d52b60a6916aab90cfc1ad7c1e1c9109f616a7b35617249aed2e41f9b5ff5e6429e363b613e7de80e5d03215772054f7d082efe4a30de50f1237279 SHA512 6a561c7ada31015bf19a52ba77c85102f118ad09d468b75017464f656dd87b039add9ecd7381dd2f292706da80dd90a8b68ad85fbc28e9cea6caf53c5b8804b0
-EBUILD emacs-29.1.9999.ebuild 18626 BLAKE2B b8566b6c6d52b60a6916aab90cfc1ad7c1e1c9109f616a7b35617249aed2e41f9b5ff5e6429e363b613e7de80e5d03215772054f7d082efe4a30de50f1237279 SHA512 6a561c7ada31015bf19a52ba77c85102f118ad09d468b75017464f656dd87b039add9ecd7381dd2f292706da80dd90a8b68ad85fbc28e9cea6caf53c5b8804b0
-EBUILD emacs-30.0.9999.ebuild 18680 BLAKE2B 1f734d31b25ea43a5ee501ba65779a3d47cd11bf1cee8d6140b067d73631e175bf4aa9f7da13a916ee223fac560a7cfec4c7a267a386097487bd5d9eea56f9c9 SHA512 54223adecb484a5386c917e9bc772e4ec9e066cc95b9f33a76fa8cd031172cbe3be6ffc92ffe619f40ce23ede25cf885c69cfefca53e1b08b45616d4c8db3e1b
+EBUILD emacs-29.1-r5.ebuild 18780 BLAKE2B 74ed594eebb6c1479dad1495ee1b1516d94e98ddb15e3fbbf3a9729fe4cba0cd596cebf2f73987b433ea76e951526c548a10c63752b3c9bc5874d2095906d68f SHA512 dc619c07c9ca31f43b82622981d24e94882129705b0269e3a4da608e4fdf060ae6ca6017c08b7a3dadc05a7879ec325b6f8c6dba7ea3b30c2bedcc9df23338ae
+EBUILD emacs-29.1-r6.ebuild 18784 BLAKE2B d7732c2f257cfe473c2c3b9268806e2e7a4b5e48e3c717315a0b5d8c551271c4b536418e37e3a3e253992985cc92287807b89092f6abe3097ab9f043eb59b05e SHA512 f9f21a9d3b63365728e55eeb91f62cbe1d95aee816ce118789c734166dd5aea7ea43d157ae852bb0ec615f827d0384c76842accbb178ccf0f3eabea6e0354490
+EBUILD emacs-29.1.90.ebuild 18645 BLAKE2B 742617206ee49916c97b19a022a1760c14fd8d7810bbb93d5cdcb25609fcab1e88017e96eca6e3cea5a01915cd968228bcb4eefbe29d9850aeedf9c97113cf1c SHA512 cab6b3d6c086befce50c56cceee6a0a4edc2cc66d53771b3570b7d49f0e1dc22459c5f84479fb957c728c92e162bfd269f395b11964d4d8925efdde05ac18210
+EBUILD emacs-29.1.9999.ebuild 18645 BLAKE2B 742617206ee49916c97b19a022a1760c14fd8d7810bbb93d5cdcb25609fcab1e88017e96eca6e3cea5a01915cd968228bcb4eefbe29d9850aeedf9c97113cf1c SHA512 cab6b3d6c086befce50c56cceee6a0a4edc2cc66d53771b3570b7d49f0e1dc22459c5f84479fb957c728c92e162bfd269f395b11964d4d8925efdde05ac18210
+EBUILD emacs-30.0.9999.ebuild 18699 BLAKE2B 1cdb2c577585d2888311b03332c5facb8feade70555ca5c6dee970b9d2e549dc8ea789f2c49f26ef2211bc40b8fba8bcadaeb7a95f41aba2078b0c6bb587c711 SHA512 131c2032529f5b93c719b977b34a03c3acac347ee2ed71778c510b84dd3f22bb80245d7417adc17e76504610ab7351d37c2558aee72cc6db14e14b898f163f5d
 MISC metadata.xml 3389 BLAKE2B 83d648a1e68be02a802e42c19ca7353c3739e10a516b02c09869ce337297926f472ec988a7aee84950eff40e3d40b1399db628e9b20db5e7c4e9a69cf7db9faa SHA512 38bc87ab7efeff1deca382b29ba1f3e961b81e6628cd4b3394753222ca8c0ae6719e1ea54834f72e03af4fc8d2528dc12cef10ac3951956832c40b5e5e52735f
diff --git a/app-editors/emacs/emacs-29.1-r5.ebuild b/app-editors/emacs/emacs-29.1-r5.ebuild
index 4b7c9693bece..4b2d050109b1 100644
--- a/app-editors/emacs/emacs-29.1-r5.ebuild
+++ b/app-editors/emacs/emacs-29.1-r5.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@@ -393,7 +393,7 @@ src_compile() {
 		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
 		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
 	else
-		unset EMACS_EMAKE_ARGS
+		EMACS_EMAKE_ARGS=()
 		emake
 	fi
 }
@@ -443,7 +443,12 @@ src_test() {
 }
 
 src_install() {
-	emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-29.1-r6.ebuild b/app-editors/emacs/emacs-29.1-r6.ebuild
new file mode 100644
index 000000000000..530bf23e5be8
--- /dev/null
+++ b/app-editors/emacs/emacs-29.1-r6.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-29"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux small-ja-dic sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+
+X_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-misc/xbitmaps
+	xpm? ( x11-libs/libXpm )
+	xft? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXrender
+		cairo? ( >=x11-libs/cairo-1.12.18[X] )
+		!cairo? ( x11-libs/libXft )
+		harfbuzz? ( media-libs/harfbuzz:0= )
+		m17n-lib? (
+			>=dev-libs/libotf-0.9.4
+			>=dev-libs/m17n-lib-1.5.1
+		)
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		xwidgets? (
+			net-libs/webkit-gtk:4.1=
+			x11-libs/libXcomposite
+		)
+	)
+	!gtk? (
+		motif? (
+			>=x11-libs/motif-2.3:0
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libXt
+		)
+		!motif? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	)"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		sys-libs/zlib
+	)
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	tree-sitter? ( dev-libs/tree-sitter )
+	valgrind? ( dev-util/valgrind )
+	zlib? ( sys-libs/zlib )
+	gui? (
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		webp? ( media-libs/libwebp:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		!aqua? (
+			gsettings? (
+				app-emacs/emacs-common[gsettings(-)]
+				>=dev-libs/glib-2.28.6
+			)
+			gtk? ( !X? (
+				media-libs/fontconfig
+				media-libs/freetype
+				>=x11-libs/cairo-1.12.18
+				x11-libs/gtk+:3
+				harfbuzz? ( media-libs/harfbuzz:0= )
+				m17n-lib? (
+					>=dev-libs/libotf-0.9.4
+					>=dev-libs/m17n-lib-1.5.1
+				)
+				xwidgets? ( net-libs/webkit-gtk:4.1= )
+			) )
+			!gtk? ( ${X_DEPEND} )
+			X? ( ${X_DEPEND} )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? (
+		!gtk? ( x11-base/xorg-proto )
+		X? ( x11-base/xorg-proto )
+	) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	if use jit; then
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=" --with-zlib"
+	else
+		myconf+=" $(use_with zlib)"
+	fi
+
+	# Emacs supports these window systems:
+	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+	# General GUI support is enabled by the "gui" USE flag, then
+	# the window system is selected as follows:
+	#   "aqua" -> Nextstep
+	#   "gtk -X" -> pure GTK
+	#   otherwise -> X11
+	# For X11 there is the further choice of toolkits GTK, Motif,
+	# Athena (Lucid), or no toolkit. They are enabled (in order of
+	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-pgtk --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x --without-pgtk"
+	elif use gtk && ! use X; then
+		einfo "Configuring to build with pure GTK (without X11) support"
+		myconf+=" --with-pgtk --without-x --without-ns"
+		myconf+=" --with-toolkit-scroll-bars" #836392
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with harfbuzz)"
+		myconf+=" $(use_with m17n-lib libotf)"
+		myconf+=" $(use_with m17n-lib m17n-flt)"
+		myconf+=" $(use_with xwidgets)"
+	else
+		# X11
+		myconf+=" --with-x --without-pgtk --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with xpm)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if use gui; then
+		# Common flags recognised for all GUIs
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with webp)"
+		myconf+=" $(use_with imagemagick)"
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation aot) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with small-ja-dic) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with tree-sitter) \
+		$(use_with wide-int) \
+		${myconf}
+}
+
+src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
+		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
+	else
+		EMACS_EMAKE_ARGS=()
+		emake
+	fi
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: not yet known
+		# mml-secure-en-decrypt-{1,2,3,4}
+		# mml-secure-find-usable-keys-{1,2}
+		# mml-secure-key-checks
+		# mml-secure-select-preferred-keys-4
+		# mml-secure-sign-verify-1
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: fails if bubblewrap (bwrap) is installed
+		# "bwrap: setting up uid map: Permission denied"
+		#
+		# bytecomp-tests--dest-mountpoint
+		%lisp/emacs-lisp/bytecomp-tests.el
+	)
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1.90.ebuild
index 14dd93aefa00..350b224b93a8 100644
--- a/app-editors/emacs/emacs-29.1.90.ebuild
+++ b/app-editors/emacs/emacs-29.1.90.ebuild
@@ -390,7 +390,7 @@ src_compile() {
 		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
 		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
 	else
-		unset EMACS_EMAKE_ARGS
+		EMACS_EMAKE_ARGS=()
 		emake
 	fi
 }
@@ -440,7 +440,12 @@ src_test() {
 }
 
 src_install() {
-	emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild
index 14dd93aefa00..350b224b93a8 100644
--- a/app-editors/emacs/emacs-29.1.9999.ebuild
+++ b/app-editors/emacs/emacs-29.1.9999.ebuild
@@ -390,7 +390,7 @@ src_compile() {
 		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
 		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
 	else
-		unset EMACS_EMAKE_ARGS
+		EMACS_EMAKE_ARGS=()
 		emake
 	fi
 }
@@ -440,7 +440,12 @@ src_test() {
 }
 
 src_install() {
-	emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index ab14d02c094b..a157e4eceac9 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -392,7 +392,7 @@ src_compile() {
 		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
 		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
 	else
-		unset EMACS_EMAKE_ARGS
+		EMACS_EMAKE_ARGS=()
 		emake
 	fi
 }
@@ -442,7 +442,12 @@ src_test() {
 }
 
 src_install() {
-	emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
 
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index abce00c08214..e05c834d2be7 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,5 +1,5 @@
 DIST featherpad-1.4.0.tar.gz 1105701 BLAKE2B 31311a9862f64554d57bc6c0688e5ec551a331f6f016b0bd3ab53225afd050347cc6758199ad17ebb5d7aba44b88a971f1e754d8ccd925369e09ed6639eb0131 SHA512 eb3f13dbad799d3a55a8c048a94c2acb2b9286775e75aec482f475c792e2b74078fc4d5cc43def8ba7b4f592ecb5b684c5890629edca5a488ccac336021cb7e8
 DIST featherpad-1.4.1.tar.gz 1109511 BLAKE2B 127f0b18252ac020d6f66e315090968825e7a67309e3b5d66b8f119975f91b273973c9ac1b8a8c1bd46d2eece43df649eddb7b838d79fee0f5ddc2d4caae3fb2 SHA512 485d6e731ad5927bb6fd4499536d45b40319eff5bfd8a9b1cd9acc063dcb5fb35ced033e2e5aafa60c6bb87426fb1cb95fe5d78ffb5a2f361702d23320508ef8
 EBUILD featherpad-1.4.0.ebuild 769 BLAKE2B 0c3e2b01cd05356f1bd3823524a254393f063c09cff421a746278e41a578a01f037757ddfc4caab3deff193d6aa3c711fdc99ff76ecb6edf36027723c47eb33d SHA512 8152b35f8e1a66dc7e1e225c6c14130da5df5072bb239cf19a267772e07f26ca1f5a250441b113d0c0e5b4bdc715f58378afbdcce58dfa2ae5065708d3581d14
-EBUILD featherpad-1.4.1.ebuild 965 BLAKE2B 1b6bdb36f2f4680b56234165f9458a871cf4c8da7ffd7db5c3cff090c8ee80ce96f03b79d936831cf4cffdb4e5c12912245fea3c96bb9654a399c6826e35a51b SHA512 a793dc2c49c55533f6e85c6c1b8d1f672ba096223983ff7b60e988231ffb92907c52406cf081835a71338dd66a14fe6b8f521f65e42cf370755641f19c68de86
+EBUILD featherpad-1.4.1.ebuild 977 BLAKE2B f310eae08382ef03f92cfdd4332e3e06f37c123305e2406eb58a7144d9ca990a0abcb2b8283204fa4cbd7a2a551190a53d630f8b361f63e35a5812a0d8c1ae29 SHA512 0c84e24b144cd4928a93dca8a030585c44fcfd2b0905ee07c3b60873d98e069f2da28711261d4f5d7d90111645603898e463436871f729b6337047616d3d64e7
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.4.1.ebuild b/app-editors/featherpad/featherpad-1.4.1.ebuild
index f39d1be78c82..6bbac1404231 100644
--- a/app-editors/featherpad/featherpad-1.4.1.ebuild
+++ b/app-editors/featherpad/featherpad-1.4.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FeatherPad-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="qt6 +X"
 
 RDEPEND="
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 94958ac034bf..d915de6bc2a3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/regex-markup/Manifest b/app-misc/regex-markup/Manifest
index 4be11b2fb8ac..459aa4f289d2 100644
--- a/app-misc/regex-markup/Manifest
+++ b/app-misc/regex-markup/Manifest
@@ -2,5 +2,5 @@ AUX regex-markup-0.10.0-locale.patch 646 BLAKE2B 6e445af3492563105352ca63930e7f5
 AUX regex-markup-0.10.0-r2-configure.patch 570 BLAKE2B 0e0a8857c6dc1a18d37a7c32bd230a7d84996d687f43a7d2d9dcbde86e6e07e428618fc2b1cd19857016f4cc95e90f8103ff647319b97b2f8151a4cf941e7909 SHA512 5b9cbd6c37c484eb48df789792ae216bf240bd92ce36b35d17226343578e80730b65aecbb75c3769aee6e72dfd55cacdbf58eb38a80207aa520982fda254dd93
 DIST regex-markup-0.10.0.tar.gz 424480 BLAKE2B 1b1aa0054c754b4ec36e7a06a38617b01fc86699159c98c709fd9b2bd7394644c8eb69eb0b1e4b39fa157c02daa3a55767edce831bcc7f4ceff7f40786b4efbd SHA512 fddb43b41771e5f75a140798304023087931da383cdee0b6fa9c0bd867e9e5280f484bc6182960c08993d91963de22fa9f0052e867a58067dfc39d9b761e0e9f
 EBUILD regex-markup-0.10.0-r1.ebuild 675 BLAKE2B b0aef5017ff3a2c513a5ba24f84acfdd27bd7b86870c533af2eeecc0b6f53667708feee8a431b85a0df121efb987886c3a305fe03beaf1a309fbd736913fbcaa SHA512 b41ef5ef2f0b7d2037dccb5fb2493e5c827e55b8cd9da4da2f7a0a482906e9b3021b9435af7b696664a66b62e7643eb5b1b2afef3c6d970298263437d817f234
-EBUILD regex-markup-0.10.0-r2.ebuild 803 BLAKE2B 736dcbb4777b50291ec236c9dad5b49047ae9aabdf54f6aaf10ab92f62ef83eb9710b1c52c348df58e949e988b9b919684b0b44e9789e2210638c5778cdc6cba SHA512 cd5da82aefbf0a2890449e0b10a2e88849c14e03aa6b90a9a9597df8cf715823c862659e9869b7bbf49eda270a173c5128033f55de76cb10eff3ece3294bfbe6
+EBUILD regex-markup-0.10.0-r2.ebuild 801 BLAKE2B 5949217a3e82dddf91050981eb47115d6f4c2fd0f74d16d2290118b5d23c3ef4dca01ee16a316397421c49b757db25fab3cc5b02d3311e69cf2a43880948915a SHA512 7421233179e30cc9b0c013cb55c21b85744e9dee43551d17efcc9fd9343c9b41004bba549b26de0fc52faa053f877fdb101a6cb4fb230e1dac2014ba60b46a17
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild b/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild
index 5de67300b596..f5859b0d630f 100644
--- a/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild
+++ b/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/regex-markup/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples nls"
 
 PATCHES=(
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 02f8797653da..fdc03650821f 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index e43d22f4a2b6..2a8ba29d2221 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -1,6 +1,6 @@
 AUX xsimd-11.1.0-c++17.patch 1429 BLAKE2B 23be29fdd74ed37632bd1fba0ffdedf08af48f14985494f5befac4afb34622bb44e294e954d9d4e57a07ee6e9d988a48a93dd1b66a6f6206b79bd7c0cb600cc8 SHA512 41a474a6d768aec39e6760d4ff60017a5e3d5c4349bf244d3de1464bd9b06022d6cadcd4f91cc17a6630f38f1b0fe0e3aa4fa5a6810b8c57d649f5a8da28c217
 AUX xsimd-11.1.0-no-march.patch 3720 BLAKE2B 21adb3c35d8161db849c90363781642fa9c1051686e6dba00e55396adc905d1276540c663d34ab7bd124daa3fe6e367c5c41c17d7e0f31d55b82b1488fbdee0f SHA512 567f535a2a0dcdb02f05b53beba48e9704ef40d63df9531014257e0773a8df09854245ec5d22e6b7cffdf7541e8f48e55e2ea8faa513ca93f952aa177757bb3a
 DIST xsimd-11.1.0.tar.gz 219350 BLAKE2B 2bbbc4f7dbe489a407fe798b146c008aba44664efc943c2e1507d5c6e7da2a03ed91abf0d872e5abf9bd94be3e76bef276ec5b47d4e356b42a7b4c680bd6f3d9 SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3
-EBUILD xsimd-11.1.0-r1.ebuild 1022 BLAKE2B 527d0e4ac2c141b398b69da27409761acec4401cdf0a24a8b073960ade6405492bb20845336550c93a59ed545c3987d5e9948c4d0d6d44aa4c8f314a89e8bb5c SHA512 a3bc555f79bed843e4a19667c5f7a1d35e96db8e8f2c773c0877a05deff217ec9230de660f580daa0ef6d03599b8e73bb953e271a1197032f6f3864c84009dad
+EBUILD xsimd-11.1.0-r1.ebuild 1025 BLAKE2B a251da531321f0a3011da5a238e0bcdccb3e9deede46e6192120170cef6ed1bc097af6dd0aa4845e9e40de91a233fff75a5643a60ec1d06619fadf56d7f3859b SHA512 73e7843d1fc2a01eac08b497dc67e4910f7d17e9c9e09b32cd81546b7aae75dad2f08f449b066471354a75978dbd4910752be8a0fba16c2612dd81d44789b3a5
 EBUILD xsimd-11.1.0.ebuild 971 BLAKE2B eac1966e1309d91318f895e1a329bd0b2d15be9b934b4a7226840268f895f1f8970bc26f6d3537053bab6ff3cc941c82cff2909b3388bd2fe8aa2ee801055296 SHA512 ab2a1ff69571ea8b9027fb5a9549020ca52234563aba1559d08df98964be050332e3fe756daa6081de7c180536df1211b7e9eed2e0de14dffa4bc854762c109f
 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885
diff --git a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild b/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
index 2e369a6e422d..01e6bdd5118f 100644
--- a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
+++ b/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index eda61c6f3d1e..5a8e3a4d8043 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e15019697f1f..04c2b5b6b9d2 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -6,11 +6,11 @@ DIST go1.20.8.src.tar.gz 26197375 BLAKE2B 1d6c5eb4da9f2f892b30013427b54039feeaf0
 DIST go1.21.1.src.tar.gz 26974429 BLAKE2B 716f7c94d29dedd2e69f33a6d9d3cab9d7b02635915bfeab00dcadcc10a40812cd8fe76c1388f0eb8cbfa3cf84e2fd2d2595eab6d2c8782b3ea760e154be21d5 SHA512 b6bee4a461ed91958c334b2f8b78e8f0c45f07409ba6968ae393b34d9cd21a9b1a29df357d191144e99f8ea73f491926ea0027ecbcfcaa198349e67fa33e0e3c
 DIST go1.21.3.src.tar.gz 26976568 BLAKE2B 5c2f76c43f9e98e36f65af38d3e9644693ca9f6921ada29918c7c736d5c9d65dfb454be324117e6423d31d1b55f2c1117941c7431ea9f057cd4c249e40b3ae06 SHA512 c98d31b9c477c0ac4b6f6933adefb40fdce5cdbb171e5236e3b694fec9e5b04695487af734259eab304dd42e86341240621a781f54b60c719627fd7b5efe4742
 DIST go1.21.4.src.tar.gz 26979154 BLAKE2B e56ff80953471add7db8f2860e9212922bee9656f624a5c090f25a509709fa0473ebe6f3aa175463f8c67214410ba777954ac714f50c7f58ce1b32ad94c29b5e SHA512 a6019d51876d7705f7737cddae748f9df3b4e1b40d678094465d2e81b18a4a99b93c3979d318d6c0c6d314e44554894105d07665b7d81acbbfd80203d3ed95bc
-EBUILD go-1.20.10.ebuild 5386 BLAKE2B a2abc40f6b34f56dfe020ae4ce04ec2c3f0344b7c816f7157f9a4991c073d5542689cc628d23b4b363355a87d721bbf042eb8ee322eb4542aa06d1000c50922a SHA512 28ba949e17ca6bfa1738ac6ed472fc1d24008c145809063cf74b3623439c4e837bb473ef9c4c702f816e5742a4b6c54a87364859c74b38a794f665e516ca4741
+EBUILD go-1.20.10.ebuild 5385 BLAKE2B 161e5bcf4c08a899a90237983cfdd35724057f933ca12d171d0a2b036ff8770ed25f52da4b403299203e6de1ac6bcd876651f8569f55f1ef93bbe7920c107ae5 SHA512 65cab89cd5e8a26020b6d55bcc1e98ec1bda8d7f1f964cde416d77a531c2b46ca797e9893e7d8811750e0b3e2129698aa830ca6d0b49e8ab2a8cbcbd283adf5e
 EBUILD go-1.20.11.ebuild 5385 BLAKE2B 161e5bcf4c08a899a90237983cfdd35724057f933ca12d171d0a2b036ff8770ed25f52da4b403299203e6de1ac6bcd876651f8569f55f1ef93bbe7920c107ae5 SHA512 65cab89cd5e8a26020b6d55bcc1e98ec1bda8d7f1f964cde416d77a531c2b46ca797e9893e7d8811750e0b3e2129698aa830ca6d0b49e8ab2a8cbcbd283adf5e
 EBUILD go-1.20.8.ebuild 5385 BLAKE2B 161e5bcf4c08a899a90237983cfdd35724057f933ca12d171d0a2b036ff8770ed25f52da4b403299203e6de1ac6bcd876651f8569f55f1ef93bbe7920c107ae5 SHA512 65cab89cd5e8a26020b6d55bcc1e98ec1bda8d7f1f964cde416d77a531c2b46ca797e9893e7d8811750e0b3e2129698aa830ca6d0b49e8ab2a8cbcbd283adf5e
 EBUILD go-1.21.1.ebuild 5204 BLAKE2B bdeec45b4dc16b3be6e23c25d4e3dabc949ff686556d5f8a831a1a997c487c2335dc600b6d5db52e5e1990106c3d0f943b4f09f42b930809c5ffcf3955f63b8d SHA512 e59c19ce7327b7c866a2826c21710d280766a853b50fb3871a5aba7de7ea85b81c70b16baf4bb176489bfa383c01bcb93334d2f5767d8792c72445c1a115f27a
-EBUILD go-1.21.3.ebuild 5205 BLAKE2B 6c612680ea50728b5554810edd79e4c88d56fdb44876da07e64b28042bbb35e5026649ec66006b65d84c08b5ee37cf4d51ca9daf6b79de962ba934741e0d2354 SHA512 2371738e27a8fe104e96a758f7931f8f6b47a4b5d4f513c029872d9112a6618e3413659ae5d4ac8a21b0fc37bf66229fc1362b178400ffe483dcc705a71e3e8a
+EBUILD go-1.21.3.ebuild 5204 BLAKE2B bdeec45b4dc16b3be6e23c25d4e3dabc949ff686556d5f8a831a1a997c487c2335dc600b6d5db52e5e1990106c3d0f943b4f09f42b930809c5ffcf3955f63b8d SHA512 e59c19ce7327b7c866a2826c21710d280766a853b50fb3871a5aba7de7ea85b81c70b16baf4bb176489bfa383c01bcb93334d2f5767d8792c72445c1a115f27a
 EBUILD go-1.21.4.ebuild 5204 BLAKE2B bdeec45b4dc16b3be6e23c25d4e3dabc949ff686556d5f8a831a1a997c487c2335dc600b6d5db52e5e1990106c3d0f943b4f09f42b930809c5ffcf3955f63b8d SHA512 e59c19ce7327b7c866a2826c21710d280766a853b50fb3871a5aba7de7ea85b81c70b16baf4bb176489bfa383c01bcb93334d2f5767d8792c72445c1a115f27a
 EBUILD go-9999.ebuild 5275 BLAKE2B e936390dbefd94fc50ae23e8b81d621ec72611a44e8cb02eb795825a9c165355482bf21296d78c5e995d756021e6ec8d92aa2e845a389eb988064852788b1d5f SHA512 c6b7db5f9e3ff2b3f6dd2a2b379a2ebcdde8118de97f250c578adf2079ded4f1c0b439070ccf53615a9d33ae07bb8023d3dede26418608d70ff2a930bc1cfc4c
 MISC metadata.xml 589 BLAKE2B 341e4c0e91d73ca668c1795035e1223eed60f85c724afd989ef1f8fb69649f7f6eaaf8a5228f6c8f587ffcc40a438c47d332fbe6866839f5a0829872a983f642 SHA512 fe58ddddfbd4d0d060516cb035592a80c0f48e125bb59c95d3c6fac0c182271e2a9ec9bd055b9cc8e6cb8c449e6c483bff4a23c362f532c24255febfdefc273a
diff --git a/dev-lang/go/go-1.20.10.ebuild b/dev-lang/go/go-1.20.10.ebuild
index c7f2b1196eab..ff581b99e355 100644
--- a/dev-lang/go/go-1.20.10.ebuild
+++ b/dev-lang/go/go-1.20.10.ebuild
@@ -23,7 +23,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.21.3.ebuild b/dev-lang/go/go-1.21.3.ebuild
index 46b961c611be..c03a5ea43e57 100644
--- a/dev-lang/go/go-1.21.3.ebuild
+++ b/dev-lang/go/go-1.21.3.ebuild
@@ -23,7 +23,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 8fde9e138a0f..143c80402855 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -48,7 +48,7 @@ EBUILD python-3.11.5.ebuild 15105 BLAKE2B 4833298b9756cb8191488cd8a34eb9a8fb4817
 EBUILD python-3.11.6.ebuild 15109 BLAKE2B a209b6e1acb3fe5f4038832d59cae9c2d8742296f6e14cf949e82f8368cfd4fbb4c28658431c3c6a7802adfd59646aac7a080de5bdbd1dc917d812ba805e532b SHA512 43d3b912dc0366216e80925f9abd99fa9afcd948afb94f7b8ba0adf195cfa2040c5bb760a1f91b376a624fca90f5927ba7c5b97f787a6d272f180db753e5d484
 EBUILD python-3.12.0.ebuild 14668 BLAKE2B 8a10e603b20619b2872b8fdf2065c6e3a3807f5c3544a73976c80b7b7a13fd72915f644bfc03e76229f0ed25f28ec1bc3e9e1e15b12f2412f52acd57ac980491 SHA512 488c55f614c85c95c4ce837f24d42fc19b5d30f8222d90f61fe603ebe5f21755b74f1f8821a8d6b085721582ce1ce16e8ad708bb43987721f14bad0d663a4610
 EBUILD python-3.12.0_beta4_p2.ebuild 15030 BLAKE2B 6334d4642ac5ad9d68c3602a99c2e97c50263a22dee9a5d4ae741a3504c592a52d196997f8671b5a7b622e93eebb1a9178307cd47e545ac4595f4a845b60aaef SHA512 9c0903ecfc934dd88271d7c551277b2a9288ff6e6efd30f35008a6b68b939c96f063df2f2bfc908dfe4ca1f039fcc02b3abab82b89d72ce5e86bf2d3e66c38c3
-EBUILD python-3.12.0_p1.ebuild 14673 BLAKE2B 8cea6ceaa4a2b8ebe30d6d85f494e47a6b31ffcb89b1952daa7f26cb58f7bdf71d9f4eade3cac6a3c1d35990c1758d0e821ae5676cfbab38ba330c053cd6e761 SHA512 765454cde068682f67a8935c153240db5c0d456a49108a9f498d9ed958366725e8925878cd2563ae18ff8058c08c8c1c1294862ec0b58e5f7cf16629ebdadb53
+EBUILD python-3.12.0_p1.ebuild 14671 BLAKE2B 8ad2e5433dfcd884c5b82d7f41f29dea0bfc615a8ee311a17958e4539b1ed5dc2ba119fea27c4108d3ea9d6136ae2835f5e60a9d3c74b4f58ae87fb37ef31c88 SHA512 02255e8a325e822343efd093e50d481fcc5c06818f2965926e505e63417df971071ffac96d06b871b7180794a0602099d3274b63df77a9827bb61c2528489610
 EBUILD python-3.12.0_rc1_p5.ebuild 15029 BLAKE2B 7c3fa11fbaeaefb49a8273fe46f95f81b9eca0dd76a5ba094e1641cd997347d8880258332905fa01491741b996317a5b774ea93f1b0a935b7b1a224669d33c73 SHA512 58a56c77e6af472c315dca3bf1c21a6735a5b6b15d35d0441b70bd4d1f7b9366187cd06d85a32a31c147ddaab392fc6704a189c8ac1ed7d2a32f8e4968132d1c
 EBUILD python-3.12.0_rc1_p6.ebuild 15029 BLAKE2B 7c3fa11fbaeaefb49a8273fe46f95f81b9eca0dd76a5ba094e1641cd997347d8880258332905fa01491741b996317a5b774ea93f1b0a935b7b1a224669d33c73 SHA512 58a56c77e6af472c315dca3bf1c21a6735a5b6b15d35d0441b70bd4d1f7b9366187cd06d85a32a31c147ddaab392fc6704a189c8ac1ed7d2a32f8e4968132d1c
 EBUILD python-3.12.0_rc2_p1-r1.ebuild 14673 BLAKE2B 8cea6ceaa4a2b8ebe30d6d85f494e47a6b31ffcb89b1952daa7f26cb58f7bdf71d9f4eade3cac6a3c1d35990c1758d0e821ae5676cfbab38ba330c053cd6e761 SHA512 765454cde068682f67a8935c153240db5c0d456a49108a9f498d9ed958366725e8925878cd2563ae18ff8058c08c8c1c1294862ec0b58e5f7cf16629ebdadb53
diff --git a/dev-lang/python/python-3.12.0_p1.ebuild b/dev-lang/python/python-3.12.0_p1.ebuild
index df871bbf0ed2..be7a24c77792 100644
--- a/dev-lang/python/python-3.12.0_p1.ebuild
+++ b/dev-lang/python/python-3.12.0_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 02c6d0738759..12140c0fe120 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index e614b9bdfa89..de40583da1d5 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 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.4.ebuild 1745 BLAKE2B 06cd1ba6e6dd6fe46dc18d1191821040d1e94dea055864d0320d959e4cb62cd7f0d60999356caed7d7e16eee4965b23bc83be232ea4410142396c96ffc54b194 SHA512 8a23f0be21e082adbdeb6bb2161ed40e0fbf84c5f5f1bf6c6fdc0b4817a5f11a2baafadd9a0c224e3ceada297c448943c31d5b4b072e1c9a4af332d4ce3c7472
 EBUILD libclc-17.0.5.ebuild 1745 BLAKE2B 06cd1ba6e6dd6fe46dc18d1191821040d1e94dea055864d0320d959e4cb62cd7f0d60999356caed7d7e16eee4965b23bc83be232ea4410142396c96ffc54b194 SHA512 8a23f0be21e082adbdeb6bb2161ed40e0fbf84c5f5f1bf6c6fdc0b4817a5f11a2baafadd9a0c224e3ceada297c448943c31d5b4b072e1c9a4af332d4ce3c7472
 EBUILD libclc-18.0.0.9999.ebuild 1715 BLAKE2B f82abdc9c110b6f6b317aead9273000c5b3cdadf69bd2e9ebf5c480c74a50c072c92d2945b16d83fc8a28365be4c329269a21788e94391ba7d1f3cee41c9d0a2 SHA512 a26879108f8a308273a1bc81eea612403baf48ad20480eb8b8760176928be7083cc062f223535e01e5dd19372bcbb3d63769121a57ce26dfc723987e5b3fbb51
-EBUILD libclc-18.0.0_pre20231104.ebuild 1715 BLAKE2B f82abdc9c110b6f6b317aead9273000c5b3cdadf69bd2e9ebf5c480c74a50c072c92d2945b16d83fc8a28365be4c329269a21788e94391ba7d1f3cee41c9d0a2 SHA512 a26879108f8a308273a1bc81eea612403baf48ad20480eb8b8760176928be7083cc062f223535e01e5dd19372bcbb3d63769121a57ce26dfc723987e5b3fbb51
-EBUILD libclc-18.0.0_pre20231111.ebuild 1715 BLAKE2B f82abdc9c110b6f6b317aead9273000c5b3cdadf69bd2e9ebf5c480c74a50c072c92d2945b16d83fc8a28365be4c329269a21788e94391ba7d1f3cee41c9d0a2 SHA512 a26879108f8a308273a1bc81eea612403baf48ad20480eb8b8760176928be7083cc062f223535e01e5dd19372bcbb3d63769121a57ce26dfc723987e5b3fbb51
 EBUILD libclc-18.0.0_pre20231119.ebuild 1715 BLAKE2B f82abdc9c110b6f6b317aead9273000c5b3cdadf69bd2e9ebf5c480c74a50c072c92d2945b16d83fc8a28365be4c329269a21788e94391ba7d1f3cee41c9d0a2 SHA512 a26879108f8a308273a1bc81eea612403baf48ad20480eb8b8760176928be7083cc062f223535e01e5dd19372bcbb3d63769121a57ce26dfc723987e5b3fbb51
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-17.0.4.ebuild b/dev-libs/libclc/libclc-17.0.4.ebuild
deleted file mode 100644
index 08fac3e3b1df..000000000000
--- a/dev-libs/libclc/libclc-17.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_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-18.0.0_pre20231104.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 33b0826b8285..000000000000
--- a/dev-libs/libclc/libclc-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_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-18.0.0_pre20231111.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 33b0826b8285..000000000000
--- a/dev-libs/libclc/libclc-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_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-ml/Manifest.gz b/dev-ml/Manifest.gz
index de8c913681e2..711e509b0dbd 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 7bceeefd4b5f..cba39014a53e 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.6.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
-EBUILD llvm-ocaml-17.0.4.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-17.0.5.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-18.0.0.9999.ebuild 2506 BLAKE2B 2fbeb9ebff375b4c4e1822a55bf09533f3a89ff7605c4641b56f863b7ec2e697072db0bfd983f64b7629754a15e5ae97e9171923af99653761660b47327dca00 SHA512 982f934cedee3aa837db349968410c685fcdd45b539b578b86da5258a0691576840e3e446d0dd1751681ff6a0e117c70348e8ddb829b16d055189e71b322a135
-EBUILD llvm-ocaml-18.0.0_pre20231104.ebuild 2506 BLAKE2B 2fbeb9ebff375b4c4e1822a55bf09533f3a89ff7605c4641b56f863b7ec2e697072db0bfd983f64b7629754a15e5ae97e9171923af99653761660b47327dca00 SHA512 982f934cedee3aa837db349968410c685fcdd45b539b578b86da5258a0691576840e3e446d0dd1751681ff6a0e117c70348e8ddb829b16d055189e71b322a135
-EBUILD llvm-ocaml-18.0.0_pre20231111.ebuild 2506 BLAKE2B 2fbeb9ebff375b4c4e1822a55bf09533f3a89ff7605c4641b56f863b7ec2e697072db0bfd983f64b7629754a15e5ae97e9171923af99653761660b47327dca00 SHA512 982f934cedee3aa837db349968410c685fcdd45b539b578b86da5258a0691576840e3e446d0dd1751681ff6a0e117c70348e8ddb829b16d055189e71b322a135
 EBUILD llvm-ocaml-18.0.0_pre20231119.ebuild 2506 BLAKE2B 2fbeb9ebff375b4c4e1822a55bf09533f3a89ff7605c4641b56f863b7ec2e697072db0bfd983f64b7629754a15e5ae97e9171923af99653761660b47327dca00 SHA512 982f934cedee3aa837db349968410c685fcdd45b539b578b86da5258a0691576840e3e446d0dd1751681ff6a0e117c70348e8ddb829b16d055189e71b322a135
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.4.ebuild
deleted file mode 100644
index a496042b570e..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	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-18.0.0_pre20231104.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 7447a6d6c7fb..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	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-18.0.0_pre20231111.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 7447a6d6c7fb..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	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 129d460e8f80..a91f1306d156 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 9f365267b70f..21a3083d3fc9 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -2,6 +2,6 @@ DIST black-23.10.1.tar.gz 597307 BLAKE2B 1f7522653e6eb537bd57826c8f4efc0520bab6a
 DIST black-23.11.0.tar.gz 615416 BLAKE2B eaf2dc20060b9161bb03b8f9ff99afa948f7296fa9d8d1aead10469e4edd4f78c871f0846c66a5673b94e2e4e0dfa9d70906ff4324fec5f40f0983a367df54e1 SHA512 50c9d04f57cae3b8338abd90c54f5025b915e8d50cc79863b3b540a434250475f13cd6c48f15e9b955981a2a6dadec9b4eed4caa277f349a8406d7f8640f2a2e
 DIST black-23.9.1.tar.gz 589529 BLAKE2B 642e1bb7b83653d879b3cbf1e618472a3106c1d9c918cbb57e5f517a96a8838a501f0e49f0fa1822d87600b4a8cecaac8da2bc9f08d5bc4131a611a90099f60a SHA512 0732409800a131fee69fffa8e7be8c128d26f0f75038235ba6f8c7451901199eed4118a2cb640ec0a5e6b40238bf41991c4a0559534f3a9f13d29f118e5b4aaa
 EBUILD black-23.10.1.ebuild 1419 BLAKE2B 159bb6253fead0e9868fa730d93cda3942b8bcbdeba595a4ed853a7a5b38de2c1118f7014637adf229fa94faec559d2620093a0d8d442f85771dc13b711947eb SHA512 7891509019d71dd6a88f6b07cbf7b706136f36b20695abb14dd0a75305adec58fffe5ab0f817553e587b61800da15f38146c3779149e23e06b66df4c3c94dd11
-EBUILD black-23.11.0.ebuild 1311 BLAKE2B b38bf55cd9a09b0da7f3ac96fdbb90f4fd5c64e8e82dbb38f2f451f4f958987f7a1487d1d4cb79e2b2cd58236790d706844650dfda92372e1bb9454897d0b8fd SHA512 1fcb7c92a63d903116ac93b3d8304535507a9afdde07e5c6132c6dc2f2b14cc6fd73a89eb4079991526392a19f6d9749ced9e0cfd81ad3a78cd55e2a3a7a81c1
+EBUILD black-23.11.0.ebuild 1309 BLAKE2B 6200ecd06f62535828f19c6d512be9a1cff382a0cc93104d5fd5ba0f7ea8e33a31f1fbe0268f50428c926765409e6713875d2189c34cb988f9eda7f7f6180943 SHA512 bff5e59f0e3291adee02d7151ffca3227ce0e98059925f34f5e0fd19070691f2ce7f31d3f29f256acbd4049082259551104ec42b4341ef8ffe9f2ed6f1d3882d
 EBUILD black-23.9.1.ebuild 1411 BLAKE2B a34b33a3cfbf25f22b27e60d26931c86fcb5c8121d02660e7f6fd96fc3fbb0e19199c99f00a51e7a1ad40bcafb0213a59f13104537db38301a128748c0a2c38c SHA512 440d1b59f0fe0f4e1901a6181e819940123886ff0e28db0670c88b72dd57771447fbe5dcb2e815b8bc057690571e0d740106f4dbf7bad08b5e2371ecb71311cb
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-23.11.0.ebuild b/dev-python/black/black-23.11.0.ebuild
index 8ed349227179..0fa2598a0ef7 100644
--- a/dev-python/black/black-23.11.0.ebuild
+++ b/dev-python/black/black-23.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 34baf9452da3..6f1f34612833 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,22 +1,8 @@
-DIST boto3-1.28.78.gh.tar.gz 724185 BLAKE2B 5089a7d1eab11c23bd65699c41c3c6687f0666f10ebcc7fc4813f96225ceee5a10a008ae6969cd7927f43f09e0988178ea40386bcd91c473ac5fba1dedeeeef1 SHA512 e74f7348d369580e8d26f7c1f084276ec339d4bdd3ee628bdbe56cc6e4b1c0b22a759bb4ffe1075f0cb0d6f1692864db85a73d3cb884358dc97d6428f3fd9b0a
 DIST boto3-1.28.84.gh.tar.gz 728124 BLAKE2B 2fcc553a4a109b0bc92cdf0b08fe77fcef54792ee606b6b9ed7cde1ae92accabb9f9ce005d9ccd391601efac31eec407345471542c5b7298689ab1037ed8f41f SHA512 1b7f1fe951a9f3655a71bd51e9328f4474f9b320df82914b9ad0d64a32043aacf16fc5df1989304fd4d35430ddf6f58d0676fdb3985944d955c169a0ec58ce7b
-DIST boto3-1.28.85.gh.tar.gz 728751 BLAKE2B bfbc9b26b45e034949f13492987fdd43476d428d84da8b15e1ac67647acb410823bcc5e8710126a062a40779357ea49b5b4e1038831d38239515a793c6601dd4 SHA512 96165e6e5bd5673a364be445ab21916115e4f58c9e499f58bf0098d37fb7ba6ef28d5a6046f452e26618a305eb9713f5b5e5f10fd0c22868c499a9870fea4bef
-DIST boto3-1.29.0.gh.tar.gz 730038 BLAKE2B 3f6f853eaa18d66ffef1e159fb641e6e3d069b1cb8ca9df457a714b1682a210ccf52aca4900172812b195309a4cd1a179c4ff2dff2f0a3c519e73c1eb9380908 SHA512 d826bda41fcab62b9e868ad96e405d538f1af1b7bc31c96349330fce493c8efef282c1da1c47a45a4a0e0e3051c0ddb0847af1efc9e7e9a87419f3995db2a5ca
-DIST boto3-1.29.1.gh.tar.gz 731491 BLAKE2B 15d7aa771369afac957d1c0fac1c0cca9fb4322a7643d9dc2cb688908ab80c9f3815b92e9645266be0547d45959b6f2f20891ced2da0ab33df2de966dcfa510b SHA512 c07fb0bc3daab7aa6c21cec278b246b4df20f9e665b379f8005d2239a1d0bb637304d7308f1479b772ee314b99559bdb7f5c37503d6a9ef6801999270637cf87
-DIST boto3-1.29.2.gh.tar.gz 734398 BLAKE2B bc2816fd37130d4957873964b4020ec90f106fef5d034c4b47e9485610d577cdcac3106b66dcf20175335fcc49773dadcdabab9de65fb85caeddf5bea0845184 SHA512 dc5faf76f2949506db24888780cc07c792903707e54853258182a016b4b1b4f91ae79467e5f140ba0ce822d99e4fc570a16168211b10296bd9820eb245d9cbc5
 DIST boto3-1.29.3.gh.tar.gz 737012 BLAKE2B 4282de0bbe03b61cf6884b08cf0a16e93c1e27a0323d2eee93277f8ac62f5ef440612292ebc245f13de0bbac9c156cae0cd5c76e8ae5b7d018a125cd49a682df SHA512 e42064e2c825376dfe2a5aa0c92715d06d6d29c3cf8b194d8742c688a4743e216ba32111bba080d88505907e48ff26086106eaef62fa5048f34fcbf08355ab60
-DIST boto3-1.29.4.gh.tar.gz 737422 BLAKE2B afc98796b95bc82ca80e6fc20be8d3dd1ee786a23647628ff20822cb676bb520facd370828df1340d7515771fe879acbfde2d381109d0bb76c8fd430b1af9085 SHA512 a6b3d1aebc2594e0389acf090602276bea8ef1590f2beea285bb4dd9a8f5a81cf141a6f566c64fce5ab474830b84721f7d2833b80f06f0a531d6f64ac8c905c4
-DIST boto3-1.29.5.gh.tar.gz 738396 BLAKE2B d64d3529ec215e1ae01b13a3620125fe16f87c6e0b52a8b7b8974c06b0ee1fd540f36c6e718028055f1c6f3b6f5a9c7b863ebd267102d4616c1e677840476e70 SHA512 a199d28e817bcfec435f206d96a85e94b7b171ddc508cac29915efc532a1c73d4f1ba2288efe2677752e7a3ad29e73e25f9c369eb35c4c57de4281df8dce1030
 DIST boto3-1.29.6.gh.tar.gz 738684 BLAKE2B a42245ddc7a0f31329057016f47739fc4071a030dca1ced347b447860e9397e3c8bae8c70ca86629a4b6b3f403ed845887340e6aeb08fe33c006dea9cd3f6317 SHA512 551a3568f3ceb1f37c7d209e7aa011dbd87d01e02f7559f15563bbd06da6d7a1ff79a1a5ed8150cfbc183cd1c56041a1e36753939142962f056348362665c118
-EBUILD boto3-1.28.78.ebuild 1581 BLAKE2B 3321baf451888ad370e81162c39222de8ad2ea4217f54a1a4f3cd9818c7b612305ef84c795eff5e7f6d53991c0fee83de67b5a2edf1be8c084f69882920acac8 SHA512 c76202b2ee7ffc4810d03a1702a15829cf66816e372fd0d1acfe3cdc0415d26431a03e4e252549d6e546ab21a161af8740d915a87a2ae328814194af97f8ad8a
-EBUILD boto3-1.28.84.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.28.85.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.29.0.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.29.1.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.29.2.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
+EBUILD boto3-1.28.84.ebuild 1485 BLAKE2B fc702d3fd55d9c57599926d1e33f65863cd9a14b64aada18aab25ebac3b941904f0c709ded91eff33b7adc235aa649fd75da799a8538706c71cf6170786031e9 SHA512 11d46b930fb64352f68e31a34569d05e0dac9e5446a10a2b3e277b94f4a00b8be84e8e70b6938c6f63327d4d2012d294c98871d5f6d07e0974b654aeb100c0c1
 EBUILD boto3-1.29.3.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.29.4.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
-EBUILD boto3-1.29.5.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
 EBUILD boto3-1.29.6.ebuild 1492 BLAKE2B b917bb04deee77e6b65688e46eb6a2a0bf4c4550311821f0e1ec4fe1031430d56c7052b322ad1ed8bda21caf84d18770ed0aa44357870687af79fc8795ca999b SHA512 d72328e959f9a4567bc5aab853ed06f353d5248cb4158f02fbc49684f6065c9108101d7cc3a541e6d292014c2ffd142b00b3a729a0c82ed8fb9d28b1f5d68ba0
 EBUILD boto3-9999.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.28.78.ebuild b/dev-python/boto3/boto3-1.28.78.ebuild
deleted file mode 100644
index d677ff004c06..000000000000
--- a/dev-python/boto3/boto3-1.28.78.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.84.ebuild b/dev-python/boto3/boto3-1.28.84.ebuild
index 0604e0996a82..11e8804b494b 100644
--- a/dev-python/boto3/boto3-1.28.84.ebuild
+++ b/dev-python/boto3/boto3-1.28.84.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.28.85.ebuild b/dev-python/boto3/boto3-1.28.85.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.28.85.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.0.ebuild b/dev-python/boto3/boto3-1.29.0.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.29.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.1.ebuild b/dev-python/boto3/boto3-1.29.1.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.29.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.2.ebuild b/dev-python/boto3/boto3-1.29.2.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.29.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.4.ebuild b/dev-python/boto3/boto3-1.29.4.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.29.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.5.ebuild b/dev-python/boto3/boto3-1.29.5.ebuild
deleted file mode 100644
index 0604e0996a82..000000000000
--- a/dev-python/boto3/boto3-1.29.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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/botocore/Manifest b/dev-python/botocore/Manifest
index 4317819ef9b9..124cd3a07e16 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,22 +1,8 @@
-DIST botocore-1.31.78.gh.tar.gz 12035206 BLAKE2B 0dd1109d34a8cf99af76f1f615095776e75c0042717a573da3714d1e20efce5cf67bf38d5421c3c5558112821adb4307f7ca0791efc8e62c9ea2e9ba8c2ddc7a SHA512 68c0f68b699ff0c0276cc70f4d4843259a953511c9c2813a3101d7dc43c36a0a3bda68df66a7ab2c206977a96ce0d933830b4004898f03febf478c710beb5261
 DIST botocore-1.31.84.gh.tar.gz 12065719 BLAKE2B 2098241de47aa1f59c45287c2be66fa3562c2e549da081b1cd86626f1df5f3f175eebea1197396f39045aaebda241d37b1d47ebb378a0fb17e43c16215f89680 SHA512 097a25b4450513cf9c2722d7582cdfb969da8c083c05603f6a28eb65d1d69920106c745cb4f5e5b3bee1989eee64c89fe69c379f01df938edf2a92946c614cdf
-DIST botocore-1.31.85.gh.tar.gz 12070341 BLAKE2B b4867e351d209511db263654873f5a804f941c44d10af563eec656b041830c8543f2ec1f8d831a0aec2cce4d9b7dfc80bd3e73fd5fc456cf5e3ca00ab193b11d SHA512 0e26b6ad06e1075ec90f04d653873592fcc2ae4bdbec5bbbe4b38e368824bf000724551ac2598938b827ce81e3b327ffa9d5d23da0ccb915686a70e0f37ba161
-DIST botocore-1.32.0.gh.tar.gz 12086167 BLAKE2B 54e580c4d034b437d1e2e7748f1dd4785354db87459116565bc15d60bd73fe5d46cade212fd44fabd243614f3be55d9eeaef575ea6d6312ad83c0b6c1e741515 SHA512 9aba3cc3f823ba47ee7964517189d1227e5934c63ecdf1631ade59524594fb7cc20b9cfc7060dd8a69648d48e2d1ede0a377f204124d06ef843dd98a4cd1b11f
-DIST botocore-1.32.1.gh.tar.gz 12098630 BLAKE2B 3a2501da4bd2ec8d29f032a2df4d7946840682df426b4496f60bab487b0eb47580314b4c3029dded6a589463a8636c362c560fd4c2da02c113647ee10ebf079d SHA512 4ec58dcf896ef46f27f3c4af7c6e58efad62e5c2e3fb9aa8de9a90ee390d65b036116d9d8ba7c766b95b03e6e85e909cc620b838511152004dbcfb67968525b4
-DIST botocore-1.32.2.gh.tar.gz 12148168 BLAKE2B 29a70ed37526b8b5e3439a183b194d350505dd4ad0ac1e5d2ff729be29813b4b99b2b0806ca2f20a776efdcefc2b46295432af281e026ecf014fe45d5317c528 SHA512 775c5076e691605d6efe392e5565b84314ed7c93300ea394e5598ee34f4bb9e708a2c8479fbd646fdb619d36e0122fd4f6854e9ed40430c069677345bd76e335
 DIST botocore-1.32.3.gh.tar.gz 12176739 BLAKE2B b119a54fb4770757c8f2c75b7404e009be1c7b35598d8a97e892aa644bbcc301b5f6bb44fa0f37bc8f4523af5ca9771daeda877937e640dd557038c8283967e1 SHA512 398127e140edc33750553f33a14cdc140048f5ee03c162705c6681b9bf08d871c9ba29f824ba2b6f1b11592260c6f0614ab4c06464cdda98172e8ca81bce73e9
-DIST botocore-1.32.4.gh.tar.gz 12176332 BLAKE2B 0b0c2b1b481f88b23dad830f22dee4a79e947705a7b975cfda8f33e0154554eda930bf6e9f2d8e96b639706ae62c7b3b880e210d61e480afcd66f24375a4e754 SHA512 b3f8202a9144be2b7fa3d4030816d87a88959cb0d8340d100038e2d5c115071d272337d1570f1ff19d372bdd70a8d2643fb2e86f286e9a1d466cf0c8d84f9a1f
-DIST botocore-1.32.5.gh.tar.gz 12199009 BLAKE2B 6d48adf8f75089e366a775dd678c07c87d92eefe0194ce5b04e02333563325adf08b0dfb0c7e66a063dd43ad5d70f4aac7f2d91a3e5fee8a8a94e75b058ce560 SHA512 f55548b3473f8f9894b1d6404c66eafe8fd53952ab21ef56b8f243cbd16cabfa52460d63bec2981036c6f8e1d1c7ae5ab85e0ac629b29b6198925aed330fb6e1
 DIST botocore-1.32.6.gh.tar.gz 12201067 BLAKE2B 434581b5047aca3909b586c49b01085ed1cbad972b63156521f675c09f3934e04f6583bf543bfd772127afa6fb59ad993229306456ac10e8dc86dd3bb7c430bb SHA512 e175e23452d6956b995ff93a16ffc992cebcfae76e5a7671f60d719e3e8a2692d873f0e8d8830780ddc11f45ebea7a555d0917da5b33ff8249936dce106c7fed
-EBUILD botocore-1.31.78.ebuild 1592 BLAKE2B c5a131514206b9f7ef98aaed462ec767d932eeea538773e42ca99947021c1041dbffcd6e2f46d892031cc069e60a9a0ca607d9550ac1c5aeed89d1054e00a1b2 SHA512 056d3df23d41a7a44604241a9cad27b7052f065f5e4cf9fc335cc0228ff6e27cdc744cc9e1a33f5b77414dc598467ac436588e6f1e1375464b8ea5961dbec73f
-EBUILD botocore-1.31.84.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.31.85.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.32.0.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.32.1.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.32.2.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
+EBUILD botocore-1.31.84.ebuild 1517 BLAKE2B e056da584f834fcb5026f593a9187a613e82f1a6cb8df7b6fff6a997b971905e62ee8cfe8c99a0dbf1a6c514499860d8cb0a0d27e9155715ec07de46a8d8b325 SHA512 f5fd3af7a1209b7ecd8e7b8ac4aad92ae0db0477678d02c88394aeb7b9d1984e6c0975cbc4d006cc2df480f7fbec625ad8dd660edabf148dd44c2785085b9366
 EBUILD botocore-1.32.3.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.32.4.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
-EBUILD botocore-1.32.5.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
 EBUILD botocore-1.32.6.ebuild 1524 BLAKE2B 8a2471391e1a0e596e0b8d72ee09df50c3763a3d03db51169f45b1b571ba3df97eef93a43374b196ced5e1dc978bc2f3de52099675a6b19c1d5fe933922466b3 SHA512 bdde6ff5fcea64cad2e42bf6b2e8cb49f096ed5b17c321246651936878ff07347f4fea7805bb7083053aab2014c3e4a50fefcb727e89ccee3aa6a5860d71b249
 EBUILD botocore-9999.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.78.ebuild b/dev-python/botocore/botocore-1.31.78.ebuild
deleted file mode 100644
index 1a33d7446a78..000000000000
--- a/dev-python/botocore/botocore-1.31.78.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.84.ebuild b/dev-python/botocore/botocore-1.31.84.ebuild
index 05766e84276c..d33c969b31de 100644
--- a/dev-python/botocore/botocore-1.31.84.ebuild
+++ b/dev-python/botocore/botocore-1.31.84.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.31.85.ebuild b/dev-python/botocore/botocore-1.31.85.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.31.85.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.0.ebuild b/dev-python/botocore/botocore-1.32.0.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.32.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.1.ebuild b/dev-python/botocore/botocore-1.32.1.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.32.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.2.ebuild b/dev-python/botocore/botocore-1.32.2.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.32.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.4.ebuild b/dev-python/botocore/botocore-1.32.4.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.32.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.32.5.ebuild b/dev-python/botocore/botocore-1.32.5.ebuild
deleted file mode 100644
index 05766e84276c..000000000000
--- a/dev-python/botocore/botocore-1.32.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index a65053d907f7..7d917b254439 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,3 @@
-DIST cachetools-5.3.1.tar.gz 27985 BLAKE2B f8fa7c4e0f18d23c319b121fd951c7929277a6e3177687c7151bcc2028b0f1dd1bda18ee996f4f3a24f7ff56527ad3e80a8f90cf15a7d943e251170fedabbda3 SHA512 7e5d92b580660c1a768a65f9dc8343bc9e57c5df5c44a30137558d08a270a2ec7b652d10c1a78c240218a865527a49fa4b6d545c0bc62fe1f79b5d74da1b58cb
 DIST cachetools-5.3.2.tar.gz 26510 BLAKE2B c3cf15b69d7d6950c3a78d6ef4dbff317206bf08aa504081a545523244cfee8ca4013b0227bf7525ad7b82022b55e5f67633587d006e21e6b6b8ca9af151bf6c SHA512 1a6e32acefdd6165b3348dc32df300c5d3cd5bcff23c5f8eae5d7b6bc40a9aab7b5d6dee4bf23ebb49dea9a434570e854e24325028680a581f2b359d16e5d836
-EBUILD cachetools-5.3.1.ebuild 503 BLAKE2B 33d006959dc0d35ab309887677392bd573223bcdfeaca4ae7d669ea8a2ebe6082a0f28b21b7c303114f8105db6c0cf583a1467934fd257d10d4d8a6cbdf07140 SHA512 6118f7018851a90b15a7081285e6e49f066c4af16e1296b270678ec814d8176dab51e3a18ab46c4638d5ef4eec7047e7033b5f0a99c16a660eda904611cbd148
 EBUILD cachetools-5.3.2.ebuild 503 BLAKE2B 33d006959dc0d35ab309887677392bd573223bcdfeaca4ae7d669ea8a2ebe6082a0f28b21b7c303114f8105db6c0cf583a1467934fd257d10d4d8a6cbdf07140 SHA512 6118f7018851a90b15a7081285e6e49f066c4af16e1296b270678ec814d8176dab51e3a18ab46c4638d5ef4eec7047e7033b5f0a99c16a660eda904611cbd148
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-5.3.1.ebuild b/dev-python/cachetools/cachetools-5.3.1.ebuild
deleted file mode 100644
index 6f75455ac22d..000000000000
--- a/dev-python/cachetools/cachetools-5.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ac489a127a0c..eb700328c9c6 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 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.4.ebuild 1205 BLAKE2B 18081510503b8096976c6e8586ddfb9ec357b99104a32132133c0d008bbe8c1f5ded7156d59154596332df2355a3e63c9b4a6d86ca56a0d532cc8dfa7bd9614c SHA512 54ed491aba58444e19ed851f1fe8c77955534608ec271cf21702d374f733dd81e8f34ddae0599a5602cba063497b8e199b34b34efed3be0c44107a577d3e2438
 EBUILD clang-python-17.0.5.ebuild 1205 BLAKE2B 18081510503b8096976c6e8586ddfb9ec357b99104a32132133c0d008bbe8c1f5ded7156d59154596332df2355a3e63c9b4a6d86ca56a0d532cc8dfa7bd9614c SHA512 54ed491aba58444e19ed851f1fe8c77955534608ec271cf21702d374f733dd81e8f34ddae0599a5602cba063497b8e199b34b34efed3be0c44107a577d3e2438
 EBUILD clang-python-18.0.0.9999.ebuild 1170 BLAKE2B 90973d66df90d8a0bca727049d90e2e0cd08d084d133ef6eae9a82eef22151a2a668f14b725ccf693092ff7bb42088696f5777454a84fb201278a56332b62cf1 SHA512 ab723719d9f4d2f2252c34626e7fc7631e72ccdcb8338d4072d9ce571dd55c51aba191b49c5f12fb252f78517e7358154273b89bc1fe7c39cd34070220a69085
-EBUILD clang-python-18.0.0_pre20231104.ebuild 1170 BLAKE2B 90973d66df90d8a0bca727049d90e2e0cd08d084d133ef6eae9a82eef22151a2a668f14b725ccf693092ff7bb42088696f5777454a84fb201278a56332b62cf1 SHA512 ab723719d9f4d2f2252c34626e7fc7631e72ccdcb8338d4072d9ce571dd55c51aba191b49c5f12fb252f78517e7358154273b89bc1fe7c39cd34070220a69085
-EBUILD clang-python-18.0.0_pre20231111.ebuild 1170 BLAKE2B 90973d66df90d8a0bca727049d90e2e0cd08d084d133ef6eae9a82eef22151a2a668f14b725ccf693092ff7bb42088696f5777454a84fb201278a56332b62cf1 SHA512 ab723719d9f4d2f2252c34626e7fc7631e72ccdcb8338d4072d9ce571dd55c51aba191b49c5f12fb252f78517e7358154273b89bc1fe7c39cd34070220a69085
 EBUILD clang-python-18.0.0_pre20231119.ebuild 1170 BLAKE2B 90973d66df90d8a0bca727049d90e2e0cd08d084d133ef6eae9a82eef22151a2a668f14b725ccf693092ff7bb42088696f5777454a84fb201278a56332b62cf1 SHA512 ab723719d9f4d2f2252c34626e7fc7631e72ccdcb8338d4072d9ce571dd55c51aba191b49c5f12fb252f78517e7358154273b89bc1fe7c39cd34070220a69085
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-17.0.4.ebuild b/dev-python/clang-python/clang-python-17.0.4.ebuild
deleted file mode 100644
index d4a2cc4e8854..000000000000
--- a/dev-python/clang-python/clang-python-17.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 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-18.0.0_pre20231104.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20231104.ebuild
deleted file mode 100644
index e1394f43bcd1..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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-18.0.0_pre20231111.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20231111.ebuild
deleted file mode 100644
index e1394f43bcd1..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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/cryptography/Manifest b/dev-python/cryptography/Manifest
index fc3dc8051672..80d5cb2bed7d 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -59,5 +59,5 @@ DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 EBUILD cryptography-41.0.3.ebuild 3422 BLAKE2B 14b468cc902a594d49a1d023354671a94a29de5bc0a7a7f22e77341b2625da4996dfaae4d89ca1e5c18992d8e73d4324b6489c3da35f248cda76e92d77af3ecc SHA512 39c2188ea76a13710e107219a8edd797274e2f0cf431ab9ed48f383f39520962f86ba8f5a03535ff9edb8a7b630e8aa1ba78e20934bb9d94511d7b6af9a4a441
 EBUILD cryptography-41.0.4.ebuild 3423 BLAKE2B 26a8e3daeb6978b1e2d2f69bebb2a5917225b7fc0b59d0b66ffdf13941c6734ff8ecb158ecd0eb9532db0a9c5bf30afea2347fd1092b4cf274c44c1faca13237 SHA512 08413aaa0d24053b48b00d34a08292d9ba0b7eff79be6879b6f60ae40bb23ee2472f50e04e27cd1a649284140c8902f442914cdd4f8f4db9f657a04f8f691cb0
-EBUILD cryptography-41.0.5.ebuild 3427 BLAKE2B 9cc30725caddf104db45d1b15f94c4b347b725b519a7f3dd38508440b01e5d1499351ea1148f3b9ccf70cd7d7c9b95cc7160272885ae73567bc56d7f39ebef74 SHA512 49c90cdaafab09858818910f3abb4eadadeac84a3bc7af79505d6057e4f7962d022e1d083a4446579c421eb78b8561009e1e6928cbcd31060e23783002c0ff03
+EBUILD cryptography-41.0.5.ebuild 3425 BLAKE2B 3a4ee0ecc753814b8e47adb8d09990e006f9b72faf8a5344839b42726d416234b873b5cb661cc6b90cc4cf2cc386be46e2168e1fc13639dd845d4bc55a62c246 SHA512 484d28c89943b394bd2a051b2d7d1312d460161316f2e82a6aea8c65b63807b87e43eae13949b4dbd6c287ed4ddbc3a1d45a05ac6240cda7863345ed5cb463e0
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-41.0.5.ebuild b/dev-python/cryptography/cryptography-41.0.5.ebuild
index 081ecfba7149..3b5a44eb83d8 100644
--- a/dev-python/cryptography/cryptography-41.0.5.ebuild
+++ b/dev-python/cryptography/cryptography-41.0.5.ebuild
@@ -87,7 +87,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index ac639c4b5ae5..0b71fa020510 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,7 +1,3 @@
-DIST pip-23.2.1-py3-none-any.whl 2086091 BLAKE2B 0a35bf4ba589f07e3c800d8f835e4bcdcd433976db83f91c86e12a2316b0b1c7de7120b248d70fe8b5587c28bb3c6e7bc633c64cdfb65a1f18f87a9e7a423181 SHA512 016a8cbd09384f1a9a44cb0e8274df75a8bcb2f3966bb5d708c62145289efaa5db98f75256c97e4f8046735ce2e529fbb076f284a46cdb716e89a75660200ad9
-DIST pip-23.3-py3-none-any.whl 2106643 BLAKE2B bc5d93e71dadba670ef19f8331dd8d9e7fd5f0f70f90de39a3437b25521bb61c97690793d67d4306a98c728fd9eb5fb5848f1abec853d7878b4bab792a51f6a7 SHA512 2ac3e66eb86b90e8bafd1825e84288af81d09ddb60f68b631838d14479b953ad0c6bdc933d754b5f02520401908828a0a8c518f04b0060c82b666e0d01e87ea6
 DIST pip-23.3.1-py3-none-any.whl 2107242 BLAKE2B d5ea7ead01468f1f6a5c60811de9410d260e820638c0073f70e480dd3678e7413ae612913c01456779d391a6108ce939eced95392696eb5b1cc26b3a7a04a99d SHA512 1a60d153982c1c5997d3826f4084b39ec4054228376093ee15c1f4be0781e78c4b1e5219b5f05cdc464588dec379f9f2cc21f075aa0a11a148d3545a547b9889
-EBUILD ensurepip-pip-23.2.1.ebuild 645 BLAKE2B e5e007e2866582afab1292d7435e4eedee0f46bdf005d144e0c7c07bcf6c8460a32c60fe9260048b0f37030af1ca960ddf8a7e7bec05c0ffddf6397fc4634b28 SHA512 6cb1172140385cc6d6c65190990221c76246dfd9922a502755c5d8295429d2d3b997fd8d372f7713399090da83c9ec3ab4ec372a86129c809231eeea3597b2ab
 EBUILD ensurepip-pip-23.3.1.ebuild 645 BLAKE2B e5e007e2866582afab1292d7435e4eedee0f46bdf005d144e0c7c07bcf6c8460a32c60fe9260048b0f37030af1ca960ddf8a7e7bec05c0ffddf6397fc4634b28 SHA512 6cb1172140385cc6d6c65190990221c76246dfd9922a502755c5d8295429d2d3b997fd8d372f7713399090da83c9ec3ab4ec372a86129c809231eeea3597b2ab
-EBUILD ensurepip-pip-23.3.ebuild 653 BLAKE2B 7de97648cd4add911be02952862b975df3b7fad7daa24716f34b7f192b4d6a0b4cbbdbb7a924068de58bf2d6d2a6a543af81fcc0488c3238597ef05f60f6191c SHA512 152f91fa0ae5a6833ce07b94c7bccac40006c264ab221db45c25647984d58ef58c914203cd45a6c8527c3903e88976a187b90f3543d52ce4e18043d0fb46b450
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
deleted file mode 100644
index 4e55e335b00a..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
deleted file mode 100644
index 474a502c1273..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 32c1be776aff..a59e1d856e1c 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -4,5 +4,5 @@ DIST executing-2.0.0.gh.tar.gz 837310 BLAKE2B d402a605ce80170e1789e7eec65e89da64
 DIST executing-2.0.1.gh.tar.gz 837355 BLAKE2B 7d38890eb322809c2b705f51731fe7537f81a0775d99bebb4b4ae67453930daedd947b249385babbc2373969344b643f288441fc28f3588264e4ebc23e1c389d SHA512 8a753aab42ea2d3b61764ee77de3bb52ea7fcc2818298281180ffc47c7b22ee84974ee98b2137250f722ad559be92e72e8fc01d7b2d38ab6a01512618b65d4f3
 EBUILD executing-1.2.0.ebuild 1116 BLAKE2B 360a470d2fad1a84d832358d16e88af29df6fed0d6d4e4e707598a03d02c14ffbb90b25bd5bad3f13a9475bb7c3d4ca165390c620fb933f896cdd92e53b38f5a SHA512 02e157ec5365c5c0b25dcdaf1f6fec858fa13b4ac26ccb6b7cd953981dff5e0b69886e2e0a5574d3b721508ac2d6490afe4a1e2281847360b1b303f1e8b03410
 EBUILD executing-2.0.0.ebuild 1334 BLAKE2B a83ac6039c475dc7f09867c5bccdbb3f3a15fdfbeea711e02a7bba24b078ab36e2d84fb748b8ad13cb080aef21f00c579fcc4e0876220828fa65fe1d4b3b949c SHA512 d4deb166a2e935624cfbee276041a4a765bf5052d2dfb95dcd9dd3128800725bf4f9524132ad75fe7866c523ec1f82a9684a7f21bca84b1c177ffd67d1479784
-EBUILD executing-2.0.1.ebuild 1649 BLAKE2B ef10453f3d17b4cc00a596607269e287704c3338f21eb30e845b98bed25c3beb13caf7c1f41c571e4f10561c519695e7b130b0537bff7b7ff0829f2f6e5c540e SHA512 baea5cd4dc8e687aec5f70a60da7960563a28cb810365171f4dbdf58b75dc6626e2f4738de10a270b4e7dddaea0c439a7c57bea33e889eb794c267408008fbc8
+EBUILD executing-2.0.1.ebuild 1646 BLAKE2B 1482689feea3f254fdeb59e7be939bb477cf2b724a0ca78ba987d046497e4e2df5e3deaabbbe4b20a8a99e42235ecfa2538fc1014791f569ec6a2f22790977c7 SHA512 0d9ae28aa0f0cf2a940ee6dd2c9cdcfaf024a4949bf870dace13f9415ac5e54f7072a479c28ace75c63f9e3c7eef4d3f429d8e3913d26c919f94ef38761eceff
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-2.0.1.ebuild b/dev-python/executing/executing-2.0.1.ebuild
index 7003f45f86e8..226d26e32aba 100644
--- a/dev-python/executing/executing-2.0.1.ebuild
+++ b/dev-python/executing/executing-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index d3a008e8db05..a92208e6b8dc 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,5 +1,5 @@
 DIST flask-2.3.3.tar.gz 672756 BLAKE2B 70feb2f1ec8bc4742e8da978b7e1063c5f0bcbfda5321f397cba121283376b5b10a275635eac76383945415dbba3b2c4f917e1495851ee1dfd745db97caddec5 SHA512 801b2521c42de7a4cd16005ea6ea7737aaef6c88edacb38ab03e2d78bb4e080e35e540c23e157e2bcdb43e4818b4b7a856c50c6cf41bb17f0b7b2590c0c6aff2
 DIST flask-3.0.0.tar.gz 674171 BLAKE2B 5ae270b429d6ea344828bead0cab855b42f4c28821c843a7754f4741ef0320c190e386a08adb4c6a5018e6a2cc7be588d955ebd4edf31ae59ea9d511c9cd93cb SHA512 dab4f97909619e380e9d8f14cea346dbda8932f3e9d19ee45e3651faf51b94aa5ccaa658116c69abae680f5357235842c63f0c6ff2a191de70cc103f0e7624a4
 EBUILD flask-2.3.3.ebuild 1339 BLAKE2B 9ff51577b82478a1ded7e46945e84aaceac8269b8dd03fa141fc4f3fb36246c78dc07a06bcdd82f9803df5ecf8f31deaecd680c444e077988688d049e63e7af6 SHA512 21ff4b8daf6225dedd407187bf16d6c7163700d5bb1962fe9b01d02918f5f03b19453ca6e5c2cb0f9edac7b813b4913189f8976e1b36c0ce29ab4046776144a1
-EBUILD flask-3.0.0.ebuild 1371 BLAKE2B 6333453fa83ca3d33c8aa1e5d951521a7ec45bb0e3d640c0bf44ac74898736f0177537b5a735396b6e50a2fa37733b2f3193fa381dd0ca3324eebd4e79a6e20b SHA512 d9624393dea68db0f444356dc66ae1d8d82d47fe89a59346558dd7338e08af2b0d89f591bf203c59e09474b51dd1d3cc94061c8fe8839c16ff3a7be2d9a727a1
+EBUILD flask-3.0.0.ebuild 1370 BLAKE2B 59fe89d3339368a3752ce7007f5af46ae78afd2cc8510c0ffb038cecc489cfa7ddebd8e9b7054144c906df2e6f867fdda7aefa2520ecedddf675f62dde2d13b4 SHA512 ab5699ac922bb1dd25c1e4c639a3a7eeafd0e14824a7af29b145e15515114df79445c3451a711fd5be15d936f9b853c0d033d3965802de126f7957bcab836065
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-3.0.0.ebuild b/dev-python/flask/flask-3.0.0.ebuild
index 3a7c84c29160..13b7f4bfadfc 100644
--- a/dev-python/flask/flask-3.0.0.ebuild
+++ b/dev-python/flask/flask-3.0.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-python/hcloud/Manifest b/dev-python/hcloud/Manifest
index ebce1c7b4970..f054170179a3 100644
--- a/dev-python/hcloud/Manifest
+++ b/dev-python/hcloud/Manifest
@@ -1,7 +1,3 @@
-DIST hcloud-python-1.30.0.gh.tar.gz 108965 BLAKE2B b078310dcab67b37744ab285fe3c3207956f778de9c85fb64cbf4777250b3852a7bb19a6e2498a19bc1027a7b5edebc3aa0011192edf057ce1a1591e610387ef SHA512 459fdeff833a86c9c6869e06eac5b96250d2f0c9d1ebf55053c278ae8417af04611d4bb7bd89a757f75e5bc7303e13e235ba57496efcc59f63c38cf48fb87d82
-DIST hcloud-python-1.31.0.gh.tar.gz 109239 BLAKE2B 26a58fe75386f98403afd6f13c55768fa676d130243c9c8ef70c0c6310e2ec76235eadc50122b2ce203f190244e0d36f4d7b05e07c2e8fbe5707120634e1ef6c SHA512 be3d3e643e970390faae6d3da9e75b754d167398a7a6d04f06a4dea1bc79c160a39184365019ed1f8c7242a85f5deb9d43d8923cc1907861d38089fe8835ed62
 DIST hcloud-python-1.32.0.gh.tar.gz 109858 BLAKE2B 7e242a92c81278facd7f9d2042d2d36787153215a72e97da7616f7d6b6ca6c06fadfd6b33bdab3699a8d8ac6ec1d7327b78a224a3f674a13a7d06791e91d4658 SHA512 013cd3a7e54b12348e4ec87e489b461c41822a85cd9fafc4421a8bb404ecf1fa079d99217db5f770e893ab9bb7223b588e4429968b8339b4d23654610dfa80c3
-EBUILD hcloud-1.30.0.ebuild 1131 BLAKE2B 635b12b80f9609d9c911a2d5bad3b082f1496d9e1cca1b2fd7429913f1d67508b4fa7532653433121aec6e315faca5b6b3e14ed48fe18c2ecd096c5ae4dcd708 SHA512 deb6df221c879f66c16ce9882f01b47bb67dd73bd24d15569580d7c6c16bd7e369692cb13125fcd38cfba403e7dd1de9bcaee5a5794db188d7e427f3bbde03f7
-EBUILD hcloud-1.31.0.ebuild 1132 BLAKE2B 36c8da11a3c3e0a252a19fc9f62ac9baa408e6cfd28948cec5b0a490898702cb2885c5376b47a319c3ed9969ef38d9817449841ebcd50f5440865404627b3af1 SHA512 0181d301d65203d7fd0679a5a4973b5e264402b799f645c1dcafb6354fdea734e60858716c97690eb077ed222aa05532166d06b7f1273fd0a22b647583d9624a
 EBUILD hcloud-1.32.0.ebuild 1131 BLAKE2B 635b12b80f9609d9c911a2d5bad3b082f1496d9e1cca1b2fd7429913f1d67508b4fa7532653433121aec6e315faca5b6b3e14ed48fe18c2ecd096c5ae4dcd708 SHA512 deb6df221c879f66c16ce9882f01b47bb67dd73bd24d15569580d7c6c16bd7e369692cb13125fcd38cfba403e7dd1de9bcaee5a5794db188d7e427f3bbde03f7
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud/hcloud-1.30.0.ebuild b/dev-python/hcloud/hcloud-1.30.0.ebuild
deleted file mode 100644
index 618acc93c166..000000000000
--- a/dev-python/hcloud/hcloud-1.30.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud/hcloud-1.31.0.ebuild b/dev-python/hcloud/hcloud-1.31.0.ebuild
deleted file mode 100644
index 498400383d05..000000000000
--- a/dev-python/hcloud/hcloud-1.31.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index 04439c03371a..0e74c4d92f3d 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1,3 +1,5 @@
 DIST immutabledict-3.0.0.tar.gz 4478 BLAKE2B 7b5344f5153d28914da7124c3ca95e9b5c6422788259170de9f301de0a145324157635ca3543be824e9a0ebf93efe99a30dc1c8882bf926927023f2d06e318ad SHA512 90170703c1226e06d6726285005689cf66804ed2b3fda08c0350d9eeca6ec7427bd4004d42168e2f5ae7302acf1d16274a16d0e132bd81fbc8d470d75ec064a5
+DIST immutabledict-4.0.0.tar.gz 5696 BLAKE2B 409b0d130c70fbc03bb261e9a6352bc155f26f9f2ad77d1bc171fb16e1e8f54671b8421b685804d9e6da1b7bb37ec0bc2c5625e3d5aa2e926e65e69436f3843f SHA512 36378a4b5de7c2dd79ccc478972c66769822044948863444380360c22f45031d5de247050fc4f6dac1b8cdb481827e70fbbb74ea410d1481334ab72387d8afd4
 EBUILD immutabledict-3.0.0.ebuild 432 BLAKE2B fef70b84eea05097222fe55082e0a4fdc08f8ec6d3dd30b9ce1f91a763e66e86a6ba066224cdc6ff90a3537340619ce48147797cd178e82dae44e5912ce2edfb SHA512 3595d7d6b5cce6df926159ae5a6ede6c50b2ed50ef105ead64ef5a4e269607d35f33c4eca09daf0d9a6919e671c8bbdeec8d4db34355d44f0b8fefbab43c5c12
+EBUILD immutabledict-4.0.0.ebuild 433 BLAKE2B 78e95d6febed256cb9612443ef1889444ec027dd9605af8f2702f7876125741994b4b088ba6291c6f14a1e09cec990227183b812c696649b19c84bafc13a9a36 SHA512 121dd9543d398c13349932084f01fa84f4571e8f114b91acc5bad5f9fce104fec6b32ae459ad683cf095e3e359e850cd542fd3bcbdde4c786270a5e3f97cf716
 MISC metadata.xml 554 BLAKE2B 0b375fc6fe772da40d9e33ee6ba495a0c8f514816191621754f836ab45c87dd0430a3139b880e782db1b9ef12919824887ae61858386f438d7421e6e93a418e4 SHA512 064046ff49e9b536aaf0793fdf9c884f745f9c135897d40713961ccb308bbad27c94dad2ddfff42714122656fb398cf3ae849ab3a87f2a71aaf13d900203a55d
diff --git a/dev-python/immutabledict/immutabledict-4.0.0.ebuild b/dev-python/immutabledict/immutabledict-4.0.0.ebuild
new file mode 100644
index 000000000000..3884d17d62bb
--- /dev/null
+++ b/dev-python/immutabledict/immutabledict-4.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="An immutable wrapper around dictionaries"
+HOMEPAGE="
+	https://github.com/corenting/immutabledict/
+	https://pypi.org/project/immutabledict/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index bb342c448700..ebdabc285f61 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,5 +1,3 @@
-DIST ini2toml-0.12.tar.gz 101098 BLAKE2B 8e44600718318ce9c2ebaa5205864c1ca6ce87852a59496801578f32e223b9283d2f724acf004136743f87c8a081e58fd1176abe85288f8c463fc2520f708633 SHA512 c324a65fa20af880f2731b740dbf041ef7673d7ab817a9ee1947bf781d39bc000fcd8a725a546fc6af0dbecd0ec0534b2f9b83f3d8ab4afc0239d94acca06df5
 DIST ini2toml-0.13.tar.gz 102729 BLAKE2B 27094e0f329ce5d0da3ca1793b5b92e97eba5068225c55fcc9e0c61ead607967b8718976bfa13f76638c1b2bd8ee2a532b8eaf2023895f2ffdeacacd072fff9c SHA512 9700affeeb0434699e708fbeffb34e68f54882d7c5ada25cbdcdf47fed70bf8b5e8ff46503c19aa135079bc8770bdc48e991212b07b6409adf57d197a5ed998e
-EBUILD ini2toml-0.12.ebuild 1090 BLAKE2B 9e14ab1cf2059dd8cba9e37aca0636b9f1b2abc84a4ed89b5dbb8fcdd5511930da4132aa29e04d9b7e77622e86afdb7d5c65626e6942661437a7fd8a4d370720 SHA512 f32a15f60d503cb9fea072454f49d932189da46f9f89b13fe34986518712de809df5dd7d1e3457b217c33d790883ccc18a1eaf9b79770f3e63e8d959128df0a4
 EBUILD ini2toml-0.13.ebuild 1138 BLAKE2B e55b4e3f09ab8e1cc32d50e478f2067159302691594654a261f65d07feeec15fd3ff46bc12b2121885c0029b988d9af94bec3778accac6ae0e0d143fe6270c1b SHA512 471f6197c5499e1c8c09e94624ef4c8886a8476e1d65d5641a0c82f0e52a3a1a04d76e127f639b4e6733e06e2a87e46f05d0b1fd9de4239d2c428ef7dbeace7a
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.12.ebuild b/dev-python/ini2toml/ini2toml-0.12.ebuild
deleted file mode 100644
index adb7fccb7b16..000000000000
--- a/dev-python/ini2toml/ini2toml-0.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
-HOMEPAGE="
-	https://pypi.org/project/ini2toml/
-	https://github.com/abravalheri/ini2toml/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/configupdater[${PYTHON_USEDEP}]
-		>=dev-python/pyproject-fmt-0.4.0[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# validate_pyproject is not packaged
-	tests/test_examples.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index f4fff0551b63..67acee71d6ab 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,5 @@
-DIST ipykernel-6.25.2.tar.gz 156247 BLAKE2B 796ed40dd5ef11dbe8a0bb330aafd1e51e40b1fa5a0b55bdb1a1aff4d89187b3c6b3831f3d44b131f5e8158d6035697f788877a8e682c4c0355da74825ee2200 SHA512 a6f5089cff8c297379ae840b49ad705d23db46aa04030c7a2598031d118b5c0dd64e091de4d66adfd876e8ef45abfcb6bc963c3311dd8e50f4e83236bfc4cfa3
 DIST ipykernel-6.26.0.tar.gz 157526 BLAKE2B 8ba5cf820cf03d7735a4dbcb613925b9f9f83d949e065d61f546f3b8ded17accdfdcb4d72718fa644f2233f0397afe8f77437fed1d219710ecac6c9db523e08e SHA512 8199f59ac0147e3b21a07f28d64bf73311ccbf6b48b060979a520ac798a058496e659d08a7b41b1321b4be7092e09fe793d80fb061fc2706b46aa17e93e142f8
 DIST ipykernel-6.27.0.tar.gz 157721 BLAKE2B ea34d02f57f67d720fb744f8bd7fd9a191ec2c104aafca2741eb50b4a28519e609efc465e73dbd2aad5ce1c0e383ea33115f13171deee70825d734a42f38c852 SHA512 13c9c1c2083def67b3fa5e93b03d77a40b14d2505a07386554e03f896e9ca961c54ab6b7d51fbe05bd684f1acf651196a2b0f804ded23461eac5b6500b829c45
-EBUILD ipykernel-6.25.2.ebuild 2429 BLAKE2B c69417956fd01f669573f71c4fa335157a9316511b26ddbb9d4f761f78d816685cc38ddc37bacec76ca6c5bba39dc9e4c692c618bb8e61cd6838ef2f64dace38 SHA512 29907d96a77a592f9127006dce8bb85767b488a904e773898ec4862ce5ace7945e313e47454a3f81d15902b44be51e58dd0c1e7d7c7e5a38dddc8ac02496467b
-EBUILD ipykernel-6.26.0.ebuild 2288 BLAKE2B 62ff89f8b7847cc9ffd12391c421f9e718722e9183a69da90f2faaa1b77de21833a52ca04bf47cec9d054db369e1f5cac9cafdc046cff59ca0242a1a0295d53c SHA512 f6fd390b8bb37763e312e70b5906af95436f82b418717710cf2431e4a05381702b2d230bc34c6dea93941c255d8ae28647377585d84be8310f02f0e6a8b80003
+EBUILD ipykernel-6.26.0.ebuild 2280 BLAKE2B b29feaeef6a70361a1367f78bea2ead027faa479dbf7261cb21ac2bf12d997730a471cb5b7f31cecc3cca4fed77a882f57f8103a1c0e418e4941c51540c2b57e SHA512 3eb4ff78bef76b740b5b0c45ecee84626c3c68103594a8d2b4b6c6bd8cef87deb76edb8c3a8186a62904b878808e9b37d68ce7c281f76379a73c71276aa0b0dd
 EBUILD ipykernel-6.27.0.ebuild 2288 BLAKE2B 62ff89f8b7847cc9ffd12391c421f9e718722e9183a69da90f2faaa1b77de21833a52ca04bf47cec9d054db369e1f5cac9cafdc046cff59ca0242a1a0295d53c SHA512 f6fd390b8bb37763e312e70b5906af95436f82b418717710cf2431e4a05381702b2d230bc34c6dea93941c255d8ae28647377585d84be8310f02f0e6a8b80003
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.25.2.ebuild b/dev-python/ipykernel/ipykernel-6.25.2.ebuild
deleted file mode 100644
index 40f99ccb4684..000000000000
--- a/dev-python/ipykernel/ipykernel-6.25.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	!elibc_Darwin? ( >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] )
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest-asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		ipykernel/tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-		# doesn't like pyside2?
-		ipykernel/tests/test_eventloop.py::test_qt_enable_gui
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.26.0.ebuild b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
index 5c20d40e3a48..491e8a363589 100644
--- a/dev-python/ipykernel/ipykernel-6.26.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 4ea497f09c7c..4ed58b9ad316 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.envs-2.4.0.tar.gz 7101 BLAKE2B 0858732706a71ac359b97c0a841c5370f35011968ee76364a06aa67231992bd04e200362d245c3fe8d035b7018be15bdc4117a76e86ac35bb0fff8958af9a0f6 SHA512 d4da2a3f8ec9add63a0b2f754523da5b6593d869537e38c33ea86e59105c4be0cea15546897d70b869cf81be709d9b3fa2cfa35bbefcb9ab32a373ea620553aa
 DIST jaraco.envs-2.6.0.tar.gz 8028 BLAKE2B af9eb47e4f0856a3c3d7ae028e6cebbfc74a6502a5442aa9518b7ab0f927dbc0dcd5e68240dc43868ccb505b0d75c7e9e0162d54620765559f5643f13019a0ba SHA512 8c1d4717f45b805ae3afa1308a60c0f6f03af2a0976f2fb52329d05114282c2f33085865c93e34065bfd978e52ed8bd65f9903ed8e3c7d8b23bf6a050a32bd08
-EBUILD jaraco-envs-2.4.0.ebuild 846 BLAKE2B 0ba4f91b8ad993b785e9bde21536185e4124d89a1b9e9c85fb216e52e03fce5a1ba292d9ef5d845d15dd548f69025b0de8a42523e097abca9bec9cf741d4c2ef SHA512 596857ee5f8af07e754cba9a8d992b1204ea6512ead6992cb9d5e6bfd74f14e1462f6f4e235f3e435ca5820115db124033f53d30a1dd7c805095a9e48e8452f3
 EBUILD jaraco-envs-2.6.0.ebuild 850 BLAKE2B 8a318fab34959f1a29adcd741d282f8c36647f2e162e9f3c68a8e888dd944c5483a49571b2a492f6cf6b13067fe79b43eff91bf2f7ec0615562c609f4d52efbf SHA512 808261b61a7c8ecac079e92e40f43eaee8ceae14a3e50a9289f5eaea13b1b5995f15d5cd4fb1454a2783f8cd8e7c9ede97bf491d7dea38b876d0576621c8ba69
 MISC metadata.xml 397 BLAKE2B cbc21ddb91498528ec05a5e31285357c633b9646bcbf517229c9ae206f26f50152ea8f709bc19ede09952e2eea715de4586914021d61714108f853fafc5b2742 SHA512 8f1646816b5e3a753963acd82aa950465e2c14f80ce7305b07a67d366882b19b54d80cbd85b988ce84f08fe24a31c8d6aa604a0e4f7da52886ccfada36b226c6
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
deleted file mode 100644
index 7434d8681d0a..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
+++ /dev/null
@@ -1,36 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Classes for orchestrating Python (virtual) environments"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.envs/
-	https://pypi.org/project/jaraco.envs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/path[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# optional runtime dep, not used by anything in ::gentoo
-	sed -i -e '/tox/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsonschema-path/Manifest b/dev-python/jsonschema-path/Manifest
index 158d8f38b47e..fb21ef774a2e 100644
--- a/dev-python/jsonschema-path/Manifest
+++ b/dev-python/jsonschema-path/Manifest
@@ -1,5 +1,5 @@
 DIST jsonschema-path-0.3.1.gh.tar.gz 39698 BLAKE2B b56f3c6c591066781c01ab32674c8fdd6193352208fbe9a3b06cae6e345711532a4abfb3f4433481eeb02a4dc7e884cc280c1b6d247ee1e647d503cea434b4f6 SHA512 00aa61aacb92d3aa11be6b3f5f69f6cb70743559849c425549a6fcc0c8c6eeff9feaef5a07da70308cc03311ca48dda7e35d429fa2a5a1aba9099fe678594038
 DIST jsonschema-path-0.3.2.gh.tar.gz 39521 BLAKE2B 871bb33c7839a3b9bf66e145c239cd6715cfaa2ae782f28b77de83228136af5259e1757856e47f0ac26f46572911553510a153f4f48e3b1d2a813160eb65c143 SHA512 e49b32c4609238d2808938976bd0022f86837e9d7d296a137d42f8e8c80d20d20fdd23a07b898063536290b36bd72df0abef64b65997a66cb3fb9c403cc275d3
-EBUILD jsonschema-path-0.3.1.ebuild 981 BLAKE2B 12b99b2ce758854f731f1b6b19118a1081293ac410c13c6221e0168c8afad401627e10a75a316c4f0c2f5ab7d7deb84bdfb935e6560498bf393ffc67686ca18f SHA512 be637064754aa91901425eba35405a46c660d58da2c7b6ecbdf5ef61882b58b5b7797bfbed19f9654c67912ff106b5e28967182e0b6178b8a2ea595b1beffe82
+EBUILD jsonschema-path-0.3.1.ebuild 980 BLAKE2B 7f7343ee068bd3428981dc7bcb1ea17fb9025f7ee6c9f5eb24b91110c2f992e4abac9fa5936aa654a51edb70f75ec13c4129933730824c4bb8b614a1c6e90be7 SHA512 b3cc4ce15d86bd7008b9e596c7efed0b2ae609887a4b3174183c188fc2a973df75e0e349ac343c327dc43ca2520faa59b347206368efb7b09bea638156b106c4
 EBUILD jsonschema-path-0.3.2.ebuild 985 BLAKE2B a9458a1e6e041338e8152b7fe1bae13c291a8288ed746ab75fa6ece8d9d45a8c4e0306c043f429cdfcb120634521afd9c0fd6de83eccaffd9bfd5b55887b6e90 SHA512 e6fda039a36da1d060e7368d863feaf4f094e199b5724ec500ed1b7b2c03b3ff6a7e86a7845f151cf2c6fbdb18d5cbfc15a6208a69ac13a2fcc6b0b2ef1a8938
 MISC metadata.xml 404 BLAKE2B 1ca43c4b4650286727d5676f4179f99daa52efeeeded543e3453b91033fb68e6639851b1149a93f28b2fec501acc9623bcb2cd2f58d9df59db505a7ce730807c SHA512 0e041011c6459c256ef992aecea2ac5782d608855da7ddf15340e2a66f89c4542078563dd560a03cc5b13df5c85858c4796d74f39f5a9d257d131f758d5a1bd3
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
index 5dcfe61deeca..3cc2225e3980 100644
--- a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index da51720772d9..c92fc1fe1297 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -2,6 +2,6 @@ DIST jupyterlab_server-2.25.0.tar.gz 72251 BLAKE2B aac9191493833aea1dbd2b2b85365
 DIST jupyterlab_server-2.25.1.tar.gz 73845 BLAKE2B a2eb8ac0d6ffe76cf8e2bc2464c9466ed098acb03ad8fd50bfcf87b461366d0a877d3e3311382c1c1f0e4046a42b8adb58ffd21ef5a58611115e5a5986f20316 SHA512 179c3fc0f09c2456b5be8ae2d35e809df63766dd3e5b740eb9e9d5630152aa8bef6f1ad08602e0bda5860cdad0d681d771cd22eac4ea8b6fc07ad8609e83e810
 DIST jupyterlab_server-2.25.2.tar.gz 74028 BLAKE2B 6dffdea7c002fee946a8af728592ea2404f4568bdfaae1727da5c3725edb284a7ad8594efdf71a4671249a4164878288bcb4aa588a59f45fa83fbda0656db89b SHA512 6270505170e7586fae8c4f7fcabaed6e2ef2068ec35bc5eb630e1b5177aab24d8e8be4755ad6dd3f97c5e3a1aa6c770f554efe92a2db5a5bfe99bf420e2b5a34
 EBUILD jupyterlab-server-2.25.0.ebuild 1897 BLAKE2B 558d2a5270e1d66690ec46b4ff9420279d02e0ea8dfd7e0de492a42dee34f1a3a0f2e1efb53df04c0fb1c14963dac1cc01444c163deaa108cb53ee39353abfbf SHA512 21bf92b2c09791f4eda385901efc9fb70b81204c2dd3291820ae35b3e39dec0a6e98fe7c65b82e5a48a1f3c9591177055576749bb9ba6f92868e8a072f188413
-EBUILD jupyterlab-server-2.25.1.ebuild 1913 BLAKE2B 0b769a3c149abadb22334770f2db26fac48d10bc7411b0091d90c59ab1dccfc1e3f23ab7efa24acb1cf6d44bc309ae30c7f282903712aa9725a3981a1bc04767 SHA512 354c28485c4f89b93185a0ce78c9dd568ca900c502293ac74f2e0acbd660d66c00e967c127f22df61b041b11547c309e03e9d9172f82801933e6fcb9e418003a
+EBUILD jupyterlab-server-2.25.1.ebuild 1908 BLAKE2B c5c35dd8987d464eef938692f928ed1389f3edcbf5bfb65fd820a37ad5933d12a86cf77b225360867e868e4eca1117e47e3f672fa53b247a19b337666f7e4134 SHA512 b0a347aaf8d1898444184703703f5e50c1b3fa6a2177d329d7d57ecb04da0fb338615f0be9011d82da29d55d6181d1cc3548e2848ecc6a89fb998618298fb8d6
 EBUILD jupyterlab-server-2.25.2.ebuild 1919 BLAKE2B 8fa8c91fd579a911edd864fb24ea9c231953bc05478bbb9273c2eef5cdd493837d9b2c1bdcfc0204450104de3e78969af26af69372f69b7c36dbf73b5f870b41 SHA512 258c1dbad943ceca4f2541f3c8239346cd44430e4f7db44eb03bd22b05d3f07ff5c4124ec34b890ab12d7fe3026569f3334aa3cccdd26dcb2aa2df4d9a0b4e9e
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
index f78ef98f9e9b..badcc2aee93b 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 91f70ad4dfd1..019f91f0afc1 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,9 +1,3 @@
-DIST jupyterlab-4.0.6.tar.gz 18236816 BLAKE2B e39e7cb6fbdecfee0b5e592091f989fe94907369d057457130f8bc2f391ca4c83cc09542bc9da766413821eb4c4e9eaaca3adfeccf26b0b2f61ab5e65dac9e45 SHA512 fc4acde65f2bb24adbf95e5cde17e0225390a0c8aca10e04b7c9cf5b2bcebe529608b53ce259f081508b86216b94c71fb260c857b9fe3a2bef16cb4e7af3dcda
-DIST jupyterlab-4.0.7.tar.gz 18316994 BLAKE2B 9965a2bcb0b926af17626e9aef7b37e62144685e4e6cb17b029f3b760d4d4ba583c772683078c3f7cf7fbb09d31e5214193757116873e4457596d7522ddbbf04 SHA512 2f65f8aba9db17574d5caa030437c57ca98808561645f0b30b9fd4fe2cc49f6234776a36db474051cdfeebf1d9e7f3b874189110c955edecb89506580d8917e3
-DIST jupyterlab-4.0.8.tar.gz 18345373 BLAKE2B f6d3b1f53e23f5107775c442b4c69b435091035a9369423e7f474d6a6b77c163ba49b766cc4368b1764d08beea89b881389699920e9f076ad02c8266809bfee9 SHA512 991d17b1338cd172364f812698c989b1d9f853a24d97ce3eb0f89f1ebbe78bc740ab2eafb37e929ac623ac8c06188ed0dcc7ec85ab8d3d9103019c33b45fcf6b
 DIST jupyterlab-4.0.9.tar.gz 18347162 BLAKE2B b4a62088dd8b3b646af1ea02a57c915d659f31e716e6db27c076c945340a53c742cff49518e5b13ada32a9b00f83f143e5504ae897a7abf454a7c997f72e00e6 SHA512 c87451821afa28e7016acdcff315cc48578ea1735b74c2732ed2570c326901acc38fa333344e89ba1c15799ac6bf3f9332c67cdd0ce8ac38713e0be6973d1c1a
-EBUILD jupyterlab-4.0.6.ebuild 2604 BLAKE2B ab246a5c4871de44eac2db2078752882d181ea8e8c273c780596bfd0290e6782ca0ad4ab8b7a62a14193d9bca24b83bdb7fa6f278a9fb0c1818343815edea503 SHA512 c1f80304ddaabcc94f3dbdaca565325b7bc3b2b80e76025b5b78ce68b25667f989fae3ef08452bce5c96cc96c62d28f3e111a88e365e52b1f46d943a9fe481bb
-EBUILD jupyterlab-4.0.7.ebuild 2609 BLAKE2B 6c0604ea37428a80237f4a23d7e8aa3e5904f3e19a8e7654d9226c1ace8396a15f6e49166a4292a92450cbc00ae2a4da5643434393f0860bbdae83d3ba2330d7 SHA512 6bb8004b92d1efa460c5a583198e8b491324900767e28cd07ca88d1421a69c8bf009f44914823e30e6d8c296faaa5ee87dfc7e194c4536b7793999795b056569
-EBUILD jupyterlab-4.0.8.ebuild 2609 BLAKE2B 6c0604ea37428a80237f4a23d7e8aa3e5904f3e19a8e7654d9226c1ace8396a15f6e49166a4292a92450cbc00ae2a4da5643434393f0860bbdae83d3ba2330d7 SHA512 6bb8004b92d1efa460c5a583198e8b491324900767e28cd07ca88d1421a69c8bf009f44914823e30e6d8c296faaa5ee87dfc7e194c4536b7793999795b056569
 EBUILD jupyterlab-4.0.9.ebuild 2610 BLAKE2B 0ebcda6de3dc02594877c0def4050d2c351b1ccf0368eaa80998259ef089556ebdcbd9f4568c45987819818699b60983f2a64fa3a1cb46d12f3ee26811b71546 SHA512 57b7c8ec0e6a5fc6e213caabb66713fb9daee41ba4ad67c70bd9d66dfe42831538d452beed78202bf93057ceb505e0dd65d21d8845e751115a125b9ae0e39dd4
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
deleted file mode 100644
index d8b13e0839fc..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.6.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
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
deleted file mode 100644
index a9ae6842f846..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.7.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.8.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.8.ebuild
deleted file mode 100644
index a9ae6842f846..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.8.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 4276d3b7a540..d9cd925e9864 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,5 +1,3 @@
-DIST lark-1.1.7.tar.gz 251290 BLAKE2B c6f19eadf29c75257e0b49231e621bffd27ff6c569a07159e9f4934d0bf74abb6df9425fdd971392b415fc19d12421abc67186d844f2ef1c294205a25f4e263a SHA512 59e5567ebff173a25caa2ea4db3ff3f284bd580ce68a6a3ca27ceff34158a9b56fc404ebf3016e2bbb074fd19286a0d511ffaadf2f157185f45b10305c3c8474
 DIST lark-1.1.8.tar.gz 255316 BLAKE2B 40f0590ee313e5da57e593fe1cd311dfe1222cea1be83c5d1686d9a74983c8abc4f4f913f456993c51df4ce79eced10412ff9bf3dfafbeaa30f11e1301c84f60 SHA512 e51ecb38d9e7c25cca2845c56cd3cce1b1b3940ec8f0e135373726ffb23bda46f750b03f0f0b8edc750794c2b2aab9c327ff9f381faaabd53f09e76760548957
-EBUILD lark-1.1.7.ebuild 976 BLAKE2B 27eadd92cd8da5f9fd086223ab7d3fcc217a456e4bc7bc2004cf60596ec41d4a8fab38a1784e68418e56fc9881f3e51650317704344a391d9148435469bffe9a SHA512 3a7416443f30db7aed7c1f7cba9d83c29179b93b230ae1310acbe61c7c349d65e12739e3d8193ea13911eb7a7a4d28611133df244b0a7085ae4f8f28ac53bf50
 EBUILD lark-1.1.8.ebuild 976 BLAKE2B 27eadd92cd8da5f9fd086223ab7d3fcc217a456e4bc7bc2004cf60596ec41d4a8fab38a1784e68418e56fc9881f3e51650317704344a391d9148435469bffe9a SHA512 3a7416443f30db7aed7c1f7cba9d83c29179b93b230ae1310acbe61c7c349d65e12739e3d8193ea13911eb7a7a4d28611133df244b0a7085ae4f8f28ac53bf50
 MISC metadata.xml 388 BLAKE2B 705a273d593a97c10e06cf04bf146864ff3a5d955f30d0094ab6869fd12e6033612e361e55b9e934f052ab29de7beef928293a377d0f1abb917f9715e111cdd6 SHA512 76a47597d5a6f2a71907701dc53837b1fb175be2b2fb0e70a03dacd17974f4dbaf3caa56f5e4be07c6847245c313bc3911ae949c689056082edda7993405cc32
diff --git a/dev-python/lark/lark-1.1.7.ebuild b/dev-python/lark/lark-1.1.7.ebuild
deleted file mode 100644
index ebc8caa6fd91..000000000000
--- a/dev-python/lark/lark-1.1.7.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
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 4d80f62d5646..9a9066c3760d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 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.4.ebuild 928 BLAKE2B 6863064ab7c06430d5c0267e0216537c86cd8df0e97297741284b7036e1eb41954fcfe3472e070425f67e258ae6fcaa480c2211614305bc65250c99e55ff43a7 SHA512 554c99f3e226b17c996be473c507ac166371d7c40ec55f543c559982589d057c2ddfaf0be366ace2f256571df001e889c57f0ebdc66bf4d96c6bde9ef14ca725
 EBUILD lit-17.0.5.ebuild 1029 BLAKE2B e49140e21422a36e1fe9b1e9e4dd54d1c0f0a79d5218fb12f99307cf74bbe91af5333706903bcefd8c476634f5fc304691fa81ebce5c576d4eed40bfeb0ae037 SHA512 21662019adbd263e30ad756c373a8f3063babf82a767b6e25f8941226ca4ff5c3675a7db49d9a3a8759e66be38b35af75705fbfd72dcfbbb143828726d5a97dd
 EBUILD lit-18.0.0.9999.ebuild 961 BLAKE2B 4cf7d1fed4bc116054ce3c1b12784bd9626cbdc4694e88a9569ceca26981a58d6001783df9c684ffec3ae8a23d697756fe17ff712a3533905bd6394e79fdc21d SHA512 3f3cc1b6947b3375fc383de5dc0ac217f47f4b3f575c4b29cb89ca06f330cbdde1ef2496f0583a8bebeb703ebc60d10ae49337471ba33b11e528f0d4af685925
-EBUILD lit-18.0.0_pre20231104.ebuild 860 BLAKE2B 3a18f88ec42d005dd80b70d43ff143d82c535984334af0cbe884e984e3b0241a68971b8ea61dcdeb0cba334b6e8c08197453640a9bf656ead44600409c9a85d1 SHA512 94898a012bdcff3cf76e471cca4fcd0d7e02df415c7f283bee874b17f26b3dc39d9db693690d84c655943ffcc8f708a0dad174ec3828c0526c319c16401f7061
-EBUILD lit-18.0.0_pre20231111.ebuild 961 BLAKE2B 4cf7d1fed4bc116054ce3c1b12784bd9626cbdc4694e88a9569ceca26981a58d6001783df9c684ffec3ae8a23d697756fe17ff712a3533905bd6394e79fdc21d SHA512 3f3cc1b6947b3375fc383de5dc0ac217f47f4b3f575c4b29cb89ca06f330cbdde1ef2496f0583a8bebeb703ebc60d10ae49337471ba33b11e528f0d4af685925
 EBUILD lit-18.0.0_pre20231119.ebuild 961 BLAKE2B 4cf7d1fed4bc116054ce3c1b12784bd9626cbdc4694e88a9569ceca26981a58d6001783df9c684ffec3ae8a23d697756fe17ff712a3533905bd6394e79fdc21d SHA512 3f3cc1b6947b3375fc383de5dc0ac217f47f4b3f575c4b29cb89ca06f330cbdde1ef2496f0583a8bebeb703ebc60d10ae49337471ba33b11e528f0d4af685925
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-17.0.4.ebuild b/dev-python/lit/lit-17.0.4.ebuild
deleted file mode 100644
index b67497dceb7d..000000000000
--- a/dev-python/lit/lit-17.0.4.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=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() {
-	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-18.0.0_pre20231104.ebuild b/dev-python/lit/lit-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 1689cd7b1ce2..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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() {
-	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-18.0.0_pre20231111.ebuild b/dev-python/lit/lit-18.0.0_pre20231111.ebuild
deleted file mode 100644
index bd8eed55b536..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index bdb9e3fe18cf..75232ddeb916 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,5 +3,5 @@ DIST M2Crypto-0.40.0.tar.gz 1265903 BLAKE2B 3e322b46d23bad1e3e4024006f5053a4a13b
 DIST M2Crypto-0.40.1.tar.gz 1266138 BLAKE2B a44de6b66695e0fbbba671682a7773ddbbd15225d27329d357e0005e395a70c6b006401ec30fb6938c9c4683377519844ea646df7c176181977139f6381c6907 SHA512 ca914de14621af4aa9b7f11664702557e596438cc76869478a2a75eb37ca14243e7064db7e32985834260ffa9136836884e60916d542a685ac3f1481b9320b69
 EBUILD m2crypto-0.39.0-r1.ebuild 1725 BLAKE2B 54088855dc6778e74ef9150d87e44a506e7a66f62137374c659990a10c13cc50cf9177a116741a8322e2c86ebfad5aedc9ae02947406deb567d922682bedcf9d SHA512 a76a9a5bef13cbf2dcdd24e96b952502052aa01e7bcf3e2fb6760dc2cc7ad39feab1af60342fed2f98b1cb5929be8f787f2d585b1ec529ffe57949c20289f4fa
 EBUILD m2crypto-0.40.0.ebuild 1737 BLAKE2B 3b9b0b7f89c889c02e1f32b9ad4351e4c8f475b6544b23997798141d5820f3a4ca66493562fe13078f6835942e5dbdd6ae813a752dd8b85b1d9ce949c88add59 SHA512 11a12f4ceaec39eede76912072d0f792c867dc24d33af2770a7b9c86359afe16d2d82f668fd6fac2fcf4072a8b1f96390ced5091155f725611ed2868b76150cb
-EBUILD m2crypto-0.40.1.ebuild 1735 BLAKE2B 1f578c0809b108ec9b3539ea6699c2b5c64d1c63821a6a4a0bd12a6e6544ccd002a1c1522cf55dee505a75602560c5f99562ce30c016174e7bb4efd0cc695998 SHA512 21352d664ddbe41801e64ea4ae126039cc2c52f216b6af91c55bcb0360fa1a6a67fb15525d29b3fd3928bee14be293391cdf4c430eb7f64835e6b573fdfebbf6
+EBUILD m2crypto-0.40.1.ebuild 1733 BLAKE2B b53482e15951fbb26051de2056de49faba7de073c6181a7530ccd1a7101155b6bb0ba610d5da042b78a3c8de0e1d944accc150218733cdc4efe13195592fd725 SHA512 9c72483256e1480462b5e3e2d1bffecfbdd17746df50fbb6b8d2142a88c2b22ec92ab061075a80ce9a6687ff4cd2217d3fcac48bb6fe86ed5ac8fbb1cff7ce5f
 MISC metadata.xml 381 BLAKE2B 9581f2ef53dd3b8bfff3724e91e36733892f9c4331376861ec25cee892d63f69f4f1846e46c40bc5a5045963d91aadcc2cdf70b574bf519557afe72cffab256b SHA512 95cfd7f65c912a520f371f236a49f41b711101f5997b14fa81f027cbcabe4bf6361d1a6f647d0de6e6b7756a2c662f2336c6dea5779d00372aa5b05f0566663d
diff --git a/dev-python/m2crypto/m2crypto-0.40.1.ebuild b/dev-python/m2crypto/m2crypto-0.40.1.ebuild
index af672e3aee34..40b5b7007539 100644
--- a/dev-python/m2crypto/m2crypto-0.40.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.40.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="MIT openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test abi_mips_n32 abi_mips_n64 abi_mips_o32"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 7356528fce92..871a5ab86c46 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -2,6 +2,6 @@ DIST networkx-3.1.tar.gz 2021691 BLAKE2B 002bb00034e06a45298716c86fec4462efe8db8
 DIST networkx-3.2.1.tar.gz 2073928 BLAKE2B fc4a4c0357f25cb3e4bfdfb38ffa528eddba22abc852bc80e0a70047aea2e401b0003c01108435ced1eacdba33d181395e73fcfa20773faa566c8b5cb45f6cdb SHA512 579c54a4a016617f5260df01b821c3906c4f289e80ae7bd618c0ebb9e05ebe806e71f1f660e3012531d04572ac4e6670aa73117ed26da8248fbb8ef7228b5803
 DIST networkx-3.2.tar.gz 2072917 BLAKE2B a611973897deb77f39ffca3c5e144abb1016be32f2623939150d0ea7bf2aee04e40430a00fb2ece8d8d16e8360d1da44adb14aa68798fddd1d4d3b5377360ff1 SHA512 f9fdfbe0c716c5cc6cf3f47b44e02bbd8a166724c2ef7044497b01baf468f354123aeac3c032e31293c7eedd762a29f89628cbe2ecfea280cf6012d7b0d9bdfe
 EBUILD networkx-3.1.ebuild 1842 BLAKE2B 9825202ec243faf84761cff7a1cae40c6f57bd3713f1354c0a352d79a71c759eb14d4d7ef706d202237613878d29d701caadd273c61261ab4853028f9d0f13aa SHA512 cf66b237654bbe0c2cf467b7639e67746b71c7acd4082e7820235136992dc5c14b5c1a533175493170e09b00740c1c047cc4d3a5d66a3a4b41444c367b90ee1e
-EBUILD networkx-3.2.1.ebuild 1771 BLAKE2B fbafec510a7385610dd007246f2cacec98ec0d2b075b89b59749a270d2a430aed497787eb2d6d6d480b4b35c649f68a99b8595ab8623db04b5b5b510d92945c2 SHA512 74d758e0f88cdb8e131a4e95b30da8ee3ee860e1a1914b9bc9d3fcbceb1b4a0551de6acfe4df354adbc6898cac5d629cd724173bbfcc86f1d7ae674e9c582a36
+EBUILD networkx-3.2.1.ebuild 1769 BLAKE2B 67bc6314453abfd10eb71a14dacacc7939cffd90e7c29944f99ab8cb6ad1e8c7165d65d8ce56938566e894cd2093733fce8f40a5424f52a4c04b0c91a6ed37aa SHA512 67d7002d9199186ceb0432ba9ad0ccea8baa1538da756507c3f94e4849e37b895553f981caa7c7b46d264e9b4eb16cf2f5a2f32798ecdc8cb3842d5fc2e7304c
 EBUILD networkx-3.2.ebuild 1777 BLAKE2B 41ec3898936b8a9f9b50b57c9468f2db8825ad0d50cd07865fe5138ac9f2957db011fe4cf64be90b301a4bc8682ac6e191aba441330f5ace6fb37986190ccbb3 SHA512 ce806f2ae9231da79f040b215e5b674cb33a2d2c15c75230389aab0afa67ce60b80c0d7b134cb60ba35e1b5ba8e4b1e2cccf5304b1ee62ebf788576cf2f65a4a
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-3.2.1.ebuild b/dev-python/networkx/networkx-3.2.1.ebuild
index 6e40d171e511..4c616fce3ade 100644
--- a/dev-python/networkx/networkx-3.2.1.ebuild
+++ b/dev-python/networkx/networkx-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 6906aea238b6..e5d3743702f6 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,5 +1,5 @@
 DIST openapi_core-0.18.1.tar.gz 84070 BLAKE2B 523b620106493aac11135025791440cbc4e7dc415a10344a74e2de3500834bda6158aa286f167e629ae90e1eefd568527832fb86557c16eace162d2bac98e30b SHA512 ae59c0ca948ebfcf01b63db8a463869bbb748336f32c917b2ed22bd94934c91b6fe280bf94bf82a24df9fb29979e6a1b5ce665d12b6bb6480405e9586a9fc8d5
 DIST openapi_core-0.18.2.tar.gz 84444 BLAKE2B bb05ba86eff3c70c780f1919a29b93f2137983318834c51204d7ad1094fc645d2dbcef93d92d03096826688fdfe1811c551eee68995fd46739314c2e4bc77cfc SHA512 552109c095c840a46759a54e247a3ac2d8cc36707ba89815740eef4b7fb421bd489929543892341fd89a578bff4043c8c81302fddaa1efe125238e050f152c27
 EBUILD openapi-core-0.18.1.ebuild 2030 BLAKE2B bc02ad4df3fa97fe0a8f5d5da363d4d5a1d142b607e3b71494b8f779f1663feb5fc7cf3965a6db6a7c345e694275c7c3a97c1b59f83d37d2ecbe5e8d91a41110 SHA512 f230dc40536da33441a76d88fafae7bd95cc5bde397d44daac5075c696e750cafa0ac8397dca7efcba6208ccbb845ad6412e9a2293f4cfd2cf1ba2571a012b63
-EBUILD openapi-core-0.18.2.ebuild 2041 BLAKE2B 9014de04a22ee0596c35d3273c5092347aefcf2232493881bb772ad0263e409c975d173c4fd51e1b910cb41d79f925bba45b3eea9d4159ded980159c004c2be7 SHA512 fe70de430592d03938367f49719c4d2d97da2074ab96a35f6c6a9a12c9241d07a9c0ae1854fff9cfe57c05a7966f9198dee57f1132daabe6d06ae7c48022e3ad
+EBUILD openapi-core-0.18.2.ebuild 2036 BLAKE2B 627470243f19362c2ea72a8c8b7c9ba8a74a7bc57f0e850342717ed4ca922b36f445ee6c7e8ae5d5304059cb48a0eaf294b8f3b0e196771e35304b3d52446ea3 SHA512 ca93952e8867a4531df97a14da727ff4d1285361f418a32c0710c23718a39778343dd5f14ab0a4746cac06c12afa5df0dfd03de7ba503980c7b2a94adfc7b90c
 MISC metadata.xml 385 BLAKE2B a19f5b70529b6f0575e1196f3ffe0a7f38595fe7b01b43119f0f89c41a9ab5d6992f424a10f345a7407d279736a6091918b9ba1ead0daa92c9d244e4b27e4a18 SHA512 a8a39c8958ad11de5eb6896a74b3bfcb27e95c74a984a362032e4703d86f2831b6559a96a8eef80a7ef89f4687da325b3748f36b1df649cd29c2acb1ea0c9969
diff --git a/dev-python/openapi-core/openapi-core-0.18.2.ebuild b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
index c8eedcbb82f5..df1e54ca4053 100644
--- a/dev-python/openapi-core/openapi-core-0.18.2.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/asgiref-4[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index f4d76ea2da2b..5efcb982b502 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,5 +1,5 @@
 DIST openapi_spec_validator-0.6.0.tar.gz 33646 BLAKE2B cf8d397602b147872e86c0f236731ec477e20775aa63a61162e66deb7d4b81ef91bd86b67d2dfddf5d6b160c37b7eab4ddb1d10975ada8dc13aebdc088e4483a SHA512 71434f131f34902210237940d75f07f250b296c3e1814e03f0eaae436321ca11ac63d0014c85ad571852e66b2e11545c9d0cf21d771c0c67210a60c1f9094cc2
 DIST openapi_spec_validator-0.7.1.tar.gz 37985 BLAKE2B e4e6995bba18ea9fb65be28b2156c73afd3c5074a3fbd5b83e03534a1bb5fdde2e5a586aa161e0f9fc64985d83ae995f46ff2704a4010a708f9e0cf18f97a8a8 SHA512 c2a4be4a945058a4e77857bf0d6dabf2bef27c25fbe72947db3ac011c5a60d2d0159ef0d1d44571152c5ffdc650f7d3d6c54f82834e499e9506fb474b7c9b270
 EBUILD openapi-spec-validator-0.6.0.ebuild 1638 BLAKE2B d1df9e4134eeec0e60aa472ffc39863b1517859036c93acdb3c1326c2d79c1e032b660a57d30b67d3e36ed423cadb85d587278d927b7b1ec2ceb6448b4c30934 SHA512 ba9115acb4927a8a024b4dfcc20f2c506547368d5a172560e96d2763975acfc9425ab497c3551f55ec40df0652dd41e923003a35f6afe21fbc880e1fc76d57a9
-EBUILD openapi-spec-validator-0.7.1.ebuild 1639 BLAKE2B eee725a26b10804fc3c63ee2047ebfd4f0e5b96ff8b788ebba267028ebfb154b9876502a24d53b3a47b108f869f1da41c654d384bc8a858c409ae41fb87776b0 SHA512 63af2838ea959071a86744b009a0880c0d73d8798658169a16774f6a612046a8679f54fc0684597c54430c77181afb2280b4bab8069e3c1f48367f270e6314c4
+EBUILD openapi-spec-validator-0.7.1.ebuild 1638 BLAKE2B 96a5b6bd23cf4f2ec1df249582cd1bf61c2be4ddccdf2bf45b09f4a15567ff5231084c668f53e942be49b3023de5f8d47d501079167c7775d254c42bf61e84a6 SHA512 cfb5358e81a90e1aeba86b74af00eb1bc2db2dc3cbc4f4bb5a2e876fdf58190ee594f939736aef6201bfd3451bba977f875815ed145584c7c2208dc9b4ca631a
 MISC metadata.xml 405 BLAKE2B 82dfdb0a9a068a90ad245a33da95883f863571b12e3d354cee5b7e10b9c098f3635b25fc1871db3b384c5218c2305c90e9f185c97619ba142735b03de90bde01 SHA512 a3f926750e11ce7b8960fa7adef139a329b7dac777c78acfc2cf24225862d8f04a2bb8edba36f99aabd1ea44f93220afefafe060dce6418fa03f360c129a344c
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
index f248db69d0eb..77e12ab9fb16 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 67c8bb28fc76..823eab6a5b7e 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -7,5 +7,5 @@ EBUILD pandas-1.5.3.ebuild 7208 BLAKE2B fff882d8fa0b073fc458773aff5c2b722dd71da4
 EBUILD pandas-2.1.1-r1.ebuild 8997 BLAKE2B 83b58674a2d1438f6f519768591307ba02a5fa36ad217cefec514cd83e0a8691cd52ffab68cb31dd359129edac75f3e3a0d1c8727ede6b655e145e9448343780 SHA512 06d20f7de75e0d71c83fab958a56f1f41eb9e22d6356b1807f04ae394608f502452949e61ea78bc924d0f24fb8160c5b9ee46969e2b0f0d182997c6e38699549
 EBUILD pandas-2.1.1.ebuild 8640 BLAKE2B bbe6beafa3ad8f31bd18c9bc81974b881bf73c5c998d7c971cf4f8e97966c82d090b393eddc27ffc2d994fdab17eb7406a0752e5ff5ffb7601a6d92841ed8960 SHA512 2b900d7af96cd1842be557df89f44bf99e9e82e141a5b269e54027a1a588c53d91e2c13c6cb0fbaf4c36204078114ce497cd66e97445385eae5bd86daef10034
 EBUILD pandas-2.1.2.ebuild 9010 BLAKE2B 97e206b691fd170cc2bff25fdc752da4b55ec3f881f54a2dff7db60484b2968bcbe4a9277bf000b6d30716e6afe8a544a067fb3ff099e47788f964b1e9232568 SHA512 a6718cefaec96d59e4d0d6b7ed23d2645074237a7a43c5bcd42058467dfb48ef4521ef00a6e5724b31f3ad31cf9b5851b099ed4961d27277f88a52be85ffe6fc
-EBUILD pandas-2.1.3.ebuild 8962 BLAKE2B cc7a1356a0e10d75d0244829ff1582c10d5b743631bfd392b64fefeefe5d3d013a071067d018ab0a4b471a42b33f1aece66fc256f5eb489bc1e4da6628b53b18 SHA512 d04e039dab2450aa5fede65a7c8597094e398470873e436472c5ee7ba1bf1922ee2fb83d7ab6a9774ae3e757683214c1d6f6f8f1d7eac5add08f8e76f9923dc9
+EBUILD pandas-2.1.3.ebuild 8964 BLAKE2B 2d1d9c6731ccfac1f71d86755017f3b3c3217edf5a9c35d878214456eb006c6775f51d2421dd24842e7f014e4d0def194ca986e28c3a285ec9219a5b8199b17c SHA512 2840b619129f8db58497de82c4686f9e4e4c4e3c2b0d7ca0f1f49b689f94b3e4c85a3ef34a82d2fba16e944a44e8fb629d3e664e0c23ccf00859a0ce318fe3b6
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-2.1.3.ebuild b/dev-python/pandas/pandas-2.1.3.ebuild
index fd14c8d6c39b..d237e887f6dd 100644
--- a/dev-python/pandas/pandas-2.1.3.ebuild
+++ b/dev-python/pandas/pandas-2.1.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 22e33afac41d..a5fccbefac1a 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -9,7 +9,7 @@ EBUILD pikepdf-8.4.1.ebuild 1680 BLAKE2B 2d988c8345fe6642e1bf990dd385259ac9b8709
 EBUILD pikepdf-8.5.1.ebuild 1691 BLAKE2B 86a1e90748909974401c539c64ccb9b496a1842f333c9d656b097dfa94bb742bfc1c2ac33771ab455b0b69d4945a42b05c37a91491e8b2835e70ac332874484c SHA512 27eacb24b11383380a14fea7ffeb74db0a03b75f00b41009f3e3d37c7ae25c42131a0f5194a0e39d6c05a854fbc49c14ae376c71ef92ac107aafc7ee810eee60
 EBUILD pikepdf-8.5.2.ebuild 1686 BLAKE2B dd1d53993c61c1850926d0ac4536a8f772a76cb1ef15974dc84999f0b70a17da5481f87f719942a0d715eb867f152bd14ecbef978e70ce73f69648241d9397e8 SHA512 64c389646883b124d8cbb13fb57d923ffa65b21b81b287600c61ba38871dc94d79350e90ae6dc6305c6cd4149a5c1fdc85417591d908576350f557c6976f092b
 EBUILD pikepdf-8.5.3.ebuild 1686 BLAKE2B dd1d53993c61c1850926d0ac4536a8f772a76cb1ef15974dc84999f0b70a17da5481f87f719942a0d715eb867f152bd14ecbef978e70ce73f69648241d9397e8 SHA512 64c389646883b124d8cbb13fb57d923ffa65b21b81b287600c61ba38871dc94d79350e90ae6dc6305c6cd4149a5c1fdc85417591d908576350f557c6976f092b
-EBUILD pikepdf-8.6.0.ebuild 1682 BLAKE2B 24bc7c9696f63791dd44e066ade4e9dc538c435767efe60ef6e70b925ed02151b989a16a17cc2a9b7bc963853bcfe37dae317d5fe35d6c6e25d4e27e65fbd9ab SHA512 303724c12a1bcc8d936e578b5348086dd7d17c0d68b212a92d0406848e0f29fb54df4980ac292a2030a1e54cd9072e9cafb1ca881f01b414a946aad3bd9c3acf
+EBUILD pikepdf-8.6.0.ebuild 1681 BLAKE2B 2494ff6c8ef9ff6ad64d834bef19e637509f067fa615d86761b13ddc391c66e89f5e210eaaf1fb9cd06893f3ce33d9a6f5ed79e8b30b0012b6a0721ccfbda204 SHA512 f2c01d01786524671c849c84b613e59759ef26ab9b0ca50b3c83a14cafc981d45e945b3bda683df79b29dba661e46f6928d4316690d2565c4f94a2f0a9d13bdc
 EBUILD pikepdf-8.7.0.ebuild 1666 BLAKE2B 2d98f40777ca088f4c4381786e7faed6e8bb3b2517b736e0b29e0818e18fcd8d96247e797e918e03c0cba0cfa7e0938bdd6cd668b739166808ed29f43e2479f4 SHA512 05a99b38af09b9a088ffde89e4c4962e081cf5e4b901e09acdf483c0d1bb772e4a78a8f09eda1feab7559eb9f50469024a0873d14945015f901c27173ed4e8e0
 EBUILD pikepdf-8.7.1.ebuild 1666 BLAKE2B 2d98f40777ca088f4c4381786e7faed6e8bb3b2517b736e0b29e0818e18fcd8d96247e797e918e03c0cba0cfa7e0938bdd6cd668b739166808ed29f43e2479f4 SHA512 05a99b38af09b9a088ffde89e4c4962e081cf5e4b901e09acdf483c0d1bb772e4a78a8f09eda1feab7559eb9f50469024a0873d14945015f901c27173ed4e8e0
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-8.6.0.ebuild b/dev-python/pikepdf/pikepdf-8.6.0.ebuild
index 19eb2ee45a4f..92c89d741a4e 100644
--- a/dev-python/pikepdf/pikepdf-8.6.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 997cb1e9acdd..8eb285f599fb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,9 +1,5 @@
 AUX pip-23.1-no-coverage.patch 1836 BLAKE2B f8c95ed26d5a7cba2a516b8d134ddd9901fd7d39dc8bf174397ab2afab33e93c4af342195b5b4d7b0aedc642493f1ed2ee474c74e16e285f335dcdcf531b1777 SHA512 c63929cc5324b2a741a4c1ebb4990c376eb6a4c0f39370e456b674ce3cfbdf10471ec48cf9368fccba9264fd9d4a5667988116163e73772496f28d52986ff111
 AUX pip-23.3.1-no-color.patch 1767 BLAKE2B b81a4b814e2e84e7c0424870d1a86ba7fde91400bfad127c696112544b294623ba9d580f503f01a8399a569a9a5880d38d1d09c98b9364c9b59915adb3a9b453 SHA512 c89be77fbd8049a1e6fd12ef4227926ff641c1797f91bbe91b6152016a1e7dff5e323d8ff0961948225ef854d52de972f74c8e37f48e8aee78e529f9ec8b3b3f
-DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8
 DIST pip-23.3.1.gh.tar.gz 9397023 BLAKE2B f5085bf1faaca93954abb2dfb99f5a365b7bff385ad9f0f692fb41bbf0586617f0a3d7f36df5e3475f150819fdbf7f79fc6bf8b2425fe06dc570cd0ec98fed6e SHA512 eddca29e8c3727d1d8d793ab0b05f069781cac06df805fcf7a363da738d39498135ccbbb6d2d442604a7bf78ba6c3d101ec2043431ac1832a3f2710db7cc5e56
-DIST pip-23.3.gh.tar.gz 9394878 BLAKE2B 6ef608b204a4cb796585c5ff130ee642bce0e7a464099b7eaf9c9199203fc28ff0a1b260a731f9ba462a9b82e6f68be12fc622ed809ad41a1ab92adaa4993cbd SHA512 1afef5374410387bd1056a9ada21893f1fbb81e7a2d0ab2c9f4b500c99d25b98b55254e0dc36c4e4e408ad84b7be0e24709d25447168b076ce7723d35462d055
-EBUILD pip-23.2.1.ebuild 4215 BLAKE2B d72e3ca23f6c4405f63333554873470f4d550981b3b6e582d9ff5ffdd442a81d02f49b2041aa69d18f9d203cce356da15837012383cb9e7eb67e6aed1bc35435 SHA512 98324ea9475914ed958af64d651fd1bec0f4c5166015438a30505713e003d7fb053f1edbcafce1c3594d94e3c41331ae58e8c49b2afd9191b123f2b6a9f0646c
 EBUILD pip-23.3.1.ebuild 4251 BLAKE2B faf1f97fd9bdf7bfe6732cd641814bef6971d5564a8a321d064d8ead72e8f2f65b89aea9e25c3b75c69904a197c21b63662b512e04d48ddb6cf5c8dd7c894640 SHA512 171c8cb325e22c023ae0fdc5554834c4ec925adc9b52d0786cbf83ee8935e32bc85e186ebf6267d9929316e59442bd64c0f0ac6e87e550853b81dbb4f698a304
-EBUILD pip-23.3.ebuild 4223 BLAKE2B 04f51fa0a7c263a14453afd76fca041106b6c186d4471008604dbc196fdb2fc01fa9e832a700b2223c6e3330c39b9f621c33c348a88d10eed8ee6c84516082b5 SHA512 be7c42798d0bb8ca53f1c222c4992e0ef7b244c0a87004490296bda85a8610fb954f76eae48b9b26eeecdf9060406c9fc2f1395fc2441d3b51a88f75153abc39
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-23.2.1.ebuild b/dev-python/pip/pip-23.2.1.ebuild
deleted file mode 100644
index 5f4a2d920c67..000000000000
--- a/dev-python/pip/pip-23.2.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# probably a too strict assert
-		# https://github.com/pypa/pip/issues/12152
-		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-23.3.ebuild b/dev-python/pip/pip-23.3.ebuild
deleted file mode 100644
index 58c5279dbfaa..000000000000
--- a/dev-python/pip/pip-23.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# probably a too strict assert
-		# https://github.com/pypa/pip/issues/12152
-		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 0dc2c4eb054b..e466c049ed0b 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,3 @@
-DIST pyclipper-1.3.0.post4.gh.tar.gz 51136 BLAKE2B 983f6003aaafefc4efeecd621094532b44414d8a2c4fc3d11272e3823ce5a78575576e4e3ced018d32bbca5e86afbe6305e3d43d09f66520cc1d95e3c5a988bf SHA512 cfcf195c2d7aca018adf1f59f6bd53ac08f8fca50738767c0d0f3fadf22da61a1cca4bd20b1147b4ffdd06bdd4624f0b63c05e650105660bb0a476ff2b1746d8
 DIST pyclipper-1.3.0.post5.gh.tar.gz 51150 BLAKE2B 2751dbc2ca6c8ad664a1185f00c644b084e13bbb4bb54895003799988b8d56542dd4d4b793bfa33391aece59097e1ca9ee159631b844f41ade862ed187ed5dae SHA512 24dd783449fdefb035627289680959ca4a74f737573518d14fe899ec015a7f8781b391df861e1f8986d6e71c8295743ef5fa048f5da22dd493f5940e25a7f185
-EBUILD pyclipper-1.3.0_p4.ebuild 853 BLAKE2B 6994a65ae6768569a1b60cdbe0a940953037e8ac292f68abcfa710ab49d2cae1a0f5efb8db52f6defeb2e953c3e105e861377e307c20ae6bccb5e45588d3a6d8 SHA512 ead39bf2f7a46cf3a3c49318f0af1cd42074323a265dac5f209b9901179f69f1b5c4e7a16fc81745f3f76f2a1957ff40fb65bf3baec26637064dd9badfdd3c0d
-EBUILD pyclipper-1.3.0_p5.ebuild 807 BLAKE2B 267924e81db78a129e9722a56aafd5c77ddddc7c1c3e311a605c9c8ba028c2f4e7fb5064d050544c436345e92ffebcc7510cc803e16282e4e965ca26e5d1159d SHA512 c4dd512bbcf4288c43536fd300512af001a2a342d2329f15995e0d63c6bc42edd985d079f0bae550e9bd4648231f806be8cc3e7f2a2e3fec670c1a0f4a458d25
+EBUILD pyclipper-1.3.0_p5.ebuild 806 BLAKE2B 6922e51f7ff6a9971d6eaedb8596d5df8fc5857132454bdc42692dadd8475f63d89f4004d57c8b981de25416eac468d91cced0db2cc80f62218ef96cfcef4d04 SHA512 c14db8c429ef0d3d8954236ce30e8b2040ca5c62a820d0328e7287f18b6ada9f673e517d81b4cef4d03b8122a359678c34cfc015fc63de088b8f680e40e990c2
 MISC metadata.xml 476 BLAKE2B 5ba183ffbb60ab1b910540452d4bb2ef7fe5d3b44987ebff8d666905342c0b41aadd7e656f38863615bed67e25da3fdfe3599f5af68e63bb477060fa999efaa0 SHA512 d69e6575a28b94dbe301c29e7f76a799aa8237c6f30fb073a2348c880db4c532095531ae27f5822a54d5cf68bd654a298914c83e8bf097f985e28628786c8de3
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
deleted file mode 100644
index 2f3dcc75cad9..000000000000
--- a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 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..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="
-	https://github.com/fonttools/pyclipper/
-	https://pypi.org/project/pyclipper/
-"
-SRC_URI="
-	https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-# <cython-3: https://bugs.gentoo.org/898698
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
index fd968d05345c..b7246c30725a 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 89da7b63e20b..f794a558be06 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,10 +1,4 @@
-DIST pydata-sphinx-theme-0.14.1.gh.tar.gz 2413022 BLAKE2B b4e707e1407839ba796a19f5aea73056a6520f1f39d7e17adb3442e03942a457082ce74fd3f4ab64af15b30254c6f7c80f522f0b4bcc9aa77db01bee287c4fdd SHA512 515fa2e0e301a092cd414472302b1ad2571983bc69a7cc4e617122a64f7b7f53c8b80a4328da13529840cbb1ab7cf3fb2c2ee99688a8deb87f19529c6c64067d
-DIST pydata-sphinx-theme-0.14.2.gh.tar.gz 2417334 BLAKE2B 2b4af7aa307ef46f268c11e7131218b4d7994e33d676cfa346c053f13da44fe770ed77526c4e4606fbbe7c1e6eb77decec4e57179831de00738b92a200658a83 SHA512 fd8a95c3a40c41343a90ddb6fdfaf1e247034ad629fa687824b55fd580b5bfcfc913701cf35223704bda5b3385a122d6e8653ec80d71c68bffedb194cc67ff5a
 DIST pydata-sphinx-theme-0.14.3.gh.tar.gz 2403167 BLAKE2B 272023dd877c2d61dfdd77564f1ea4c59d2db0fe81156440ff90b5b50352823db3836c4ac0b560c03950b69c1e8bdb868d1f42d96dc1eddbb35c060691201a64 SHA512 c4fbdf8efe327fb22812da0bb601c205ef0988f18e122db8fd1acba8fcde4c01519a7423a09df51f0a9d136f8b4ddde30427f04084724484a416658ee5c54878
-DIST pydata_sphinx_theme-0.14.1-py3-none-any.whl 3780482 BLAKE2B 58ebe2d3d176295bc335a176eeccd95859862e085f570c8ef6e80ade320d624fd6b2a94b6a2fab08211e520939bc651cd454bfe5037bc16104de2ecf295871e6 SHA512 7e9f76e2dfd7bd9049ae007b5af1ad65d61aa44f0c7370794856b664aa1a735dce65a1f0368fae0bb6049ee767e3ca0c4ca4f1ea6615858626c03e3a4ce81856
-DIST pydata_sphinx_theme-0.14.2-py3-none-any.whl 4680576 BLAKE2B a4bd57c90468ed2f073e581cce48e89011c21e328f4fab066f6ba4fe8fb31d3f8d161b9ecf372c3c4b9a2a9caf41dc38d35f36a02e0da072377c2f14cf7084d1 SHA512 f97e4cd650a2f42216900a22bb0fb699f6a2809b4277863979dc29906c707cfcc49b89add82211407bd5d3b1740526a27d3ca9f7141c02715dc2fcb03b692a04
 DIST pydata_sphinx_theme-0.14.3-py3-none-any.whl 4681432 BLAKE2B 21cfcebefaffedd1189fcc966e31bb6860dfb1d80e0eb4dc37dd47f55545c52c856545a439061524bbb3bbff638531b1b196bd11a9ecb2ac41202f086c82a0d8 SHA512 5844a39944442771b4744df075ab0155e8ef2d9f0a9f621be6ae4025c0f12b6462f9664674f05499a5f342dce1bacc530c5c916656ba3e6a9517770d3383be62
-EBUILD pydata-sphinx-theme-0.14.1.ebuild 1204 BLAKE2B 4bb2621c2da77a9ad9d8d20bf16ace039332e270128186db14a529d4c1b7568a5588bf9c71420509a6653bb53c44e839b51364f392e3aaa08fad3eb8def0ce56 SHA512 8748692790aab9722fb992f8bd9b182c4036ca21c09eb62d251e1912babe01e142a5aad13bd488daa13d0cf440addce77b228ad8cbca28516cf029a288b6ce28
-EBUILD pydata-sphinx-theme-0.14.2.ebuild 1212 BLAKE2B a4fdf3462f34f94e1875ee6806182c25394914ab98cb1c0ab89d4a80fb7efcff0c20507c2c4d316ad211538e85bbe371714a2a8092ae75b3214368b16b58161d SHA512 769561024ecd7c8a673b0426cef1c734e3a589d5fa01bdf8bee36c1bae000e562ed9ef142e596c5f434a76b1f9c8602b6eaeba2c6b9642fb2ad5a425e43d02ec
 EBUILD pydata-sphinx-theme-0.14.3.ebuild 1211 BLAKE2B ca594c53047dec9c4988843e77858c8d2d271eb8855f90e813649a235919414141e573d27d5606e859890f8e5d6f516863e7b994b9bb3510a7cf772bf583be6f SHA512 ea02d72c93b3b24854700f0c0eb57f79a7b871dcc4d271a27729971030b5d8fe7beb1c5f4d7997213ead9b50046db79e34fd310084bbbaf1140b50e0d0c7778b
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild
deleted file mode 100644
index 616521f11819..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild
deleted file mode 100644
index a9692a406120..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index d80b8e97d9d0..e0ef211686a0 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,3 @@
-DIST pyftpdlib-1.5.8.tar.gz 201963 BLAKE2B 5a957c207dcdc7c8d66d6ed4176cd12db019cf3d5247233db057b5c266a4fbda5e6e1c0b8ccdf33b4c154400d5d7a5e9a62ab9244f7c74c03c2f912a2ac0eb2f SHA512 2d4c4beb40d604d41eeed51f690b805377e84e594bdbb5d67135f50e5696824ba24aa9ae53aecced9f6c1b7eb3ec7727d31b883f9bbb0d2c43802277b2ef2aa6
 DIST pyftpdlib-1.5.9.tar.gz 204755 BLAKE2B f96e670a37023489a3f70f28d7e489633031f4c8dd34e6ece04a13a36a5de60f216dc267a80650c3f315a6a83081b1afc1b470c75ca18af5a80729a7ac363b98 SHA512 3efa07f5522cee89d2bf60c93b1315dfb149da622f34e043aca0ac1c4336c0a0885d7238123068401afa6988da9cbde6adfac78f08918d3a14e84c17ebb8b32f
-EBUILD pyftpdlib-1.5.8.ebuild 1461 BLAKE2B 5959b6d5674617857d8f7f66e5010cc9fba123e3bb3c4d01d3b81ee1101dee1c534b56138cc58a44799ae12d903a5f81b2ae8506301ad241be484ef2371c2ea0 SHA512 80f23999152160d759eb71d52d6c646d0e3b69acc0272ad76c1e52eb96201a0256ef9c25e09bea1fce786870647f56cdf3e743515e0e1036f6da12cab1052777
 EBUILD pyftpdlib-1.5.9.ebuild 1461 BLAKE2B 5959b6d5674617857d8f7f66e5010cc9fba123e3bb3c4d01d3b81ee1101dee1c534b56138cc58a44799ae12d903a5f81b2ae8506301ad241be484ef2371c2ea0 SHA512 80f23999152160d759eb71d52d6c646d0e3b69acc0272ad76c1e52eb96201a0256ef9c25e09bea1fce786870647f56cdf3e743515e0e1036f6da12cab1052777
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
deleted file mode 100644
index 275a6c59bbf5..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="
-	https://github.com/giampaolo/pyftpdlib/
-	https://pypi.org/project/pyftpdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs pyftpdlib
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 463591fe6707..964a0f9d195c 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,6 +1,3 @@
-AUX pyopencl-2023.1.2_numpy-include-dir.patch 409 BLAKE2B 54b6f0618d1988d7bb83f42b289d4eea30bce992a757a20d2d6e401261497ed4a2e1a302f5b59d840d64b9f5649c0b3f137eb98634ee2122d695177c161d9a46 SHA512 672f4fbe11fa91bbce354898f5beda783e9fe907614b336b5dfee5dfbf5ef4e82cb9b70d7e9866c221f2044a06e5ea9c630adfdd0db3c1c46233debb1f0203c3
-DIST pyopencl-2023.1.2.tar.gz 473684 BLAKE2B 3912885395df515f3e935149c0bac618c371b75791ac670d1a2cd25ffe5e3ff1c4d0e82d8a475e26d3280aaa659d900ed7df66b3f6952f54266d3cd2ad3b44c2 SHA512 3414b011f0bd0420df4725904b715d54bad0ae77cb4b8619d8d769cd25b56d44a8d34788c23de80b5da5ae757f38231db980f3abcb2544117b7be7627592bf0e
 DIST pyopencl-2023.1.4.tar.gz 473899 BLAKE2B 7d836d77b14f89b6dbf0dd2a189f3cb9442f224ff5c9c9db902aa93dc582278450b3d47576885bbe3738ee25f979a260d5c6f906366279adc30be7d3cc3545e1 SHA512 2508d21856d9b846bce14bcd11d007eedddc1cc5c1ce9f8d2ac18743ab9aa5d673c85792b535779b2f414caf47e39ed53c07d7ee8a061bcfa020a15f59463861
-EBUILD pyopencl-2023.1.2.ebuild 2090 BLAKE2B 923ac4ba365b02e0f8e8d89597265471be8203764ea6efb1a60358e98a51103ad7c2b20d1bc313e9d079f24da694047836a2c587b08a773d4dbab845a262e71a SHA512 cfe1756f3b55b2e3daf6b1f86d8f5ba00e531db63880cfcfb4405e39e9c5db0365b8243a94c68afa5391b639c2caad5cbfcdd2bbd85a6058344508c5add698ac
 EBUILD pyopencl-2023.1.4.ebuild 2023 BLAKE2B 6c4b917ea87686fb82954e8a0e86827fde43b106982b91bc4cbb35e0825b6896cc4c2bfc50248e20bbab909a6f6e75e1ebfe68341e3d32253749cd56b619c787 SHA512 c8b68a2c9761f64e49786df1613c6547596ed5624249a5413565d3a64487dee97fb911b2411fd30b58af8b81e49709a6c1d5e9d30b251b3f6a60fc17201c4b20
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch b/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch
deleted file mode 100644
index 7a5ce5f52bdc..000000000000
--- a/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/aksetup_helper.py
-+++ b/aksetup_helper.py
-@@ -43,11 +43,8 @@
- 
- 
- def get_numpy_incpath():
--    from imp import find_module
--    # avoid actually importing numpy, it screws up distutils
--    file, pathname, descr = find_module("numpy")
--    from os.path import join
--    return join(pathname, "core", "include")
-+    import numpy as np
-+    return np.get_include()
- 
- 
- class NumpyExtension(Extension):
diff --git a/dev-python/pyopencl/pyopencl-2023.1.2.ebuild b/dev-python/pyopencl/pyopencl-2023.1.2.ebuild
deleted file mode 100644
index ea1de1178ad4..000000000000
--- a/dev-python/pyopencl/pyopencl-2023.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="
-	https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2023.1.2_numpy-include-dir.patch
-)
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index 279f1c327f3e..d15925d7a580 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-2.1.0.tar.gz 10272 BLAKE2B aa0ff1cdcdeeea7f5dee444502eb304415c91d4a54d7caa1b0daa3f6e9546947a51d6d801ca6befaf5f8633f0d4c770c9b7218e2ea1f0412d11a8b21abd3c284 SHA512 ca15a6d2c3bc42cf9bc7dd4359c4e6d1e793862ab256e1b43940f8d1605cb065d260128c6931a79226b5288caa67f0c3934650ce95aa413d65200c53fdc1f817
-EBUILD pytest-describe-2.1.0.ebuild 716 BLAKE2B 62b5432c44403ded89893ea7b377087f8d7ea54f2678b214b1415ff7bfb12081f8a018525ad8dd85ca550b256db7a03ef9731fe386388959d24c0dda17485d68 SHA512 af2a2502b89113c580f537c5ccc92cb758a7e402c1d119ce75167eac30cef0f22885998ad46851d6bc4002ccec87ddd050554c95ac225e20e2037177f329f90f
+EBUILD pytest-describe-2.1.0.ebuild 715 BLAKE2B 6debbab620779ba3e273a0829c19f474b043f1f834643b4dedb92f3c05e4b56aa72c5c04c1374e0a7dbe9ee9744907d836c9c5aabdb40a0880c8bbaf2460aa67 SHA512 30f45696b0544e8e366bcc5b993b725de9f79aa765902a8f98346731a03dc7f567447fc4f5e1014fc18dbd28078f577415a2489bd4b710bbae2e5b669e3ba00e
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
index 55ad3ff255f3..a99e3ba6aed3 100644
--- a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	<dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 5fe0c9b82b2b..9736e5573651 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,7 +1,3 @@
-DIST pytest_env-1.0.1.tar.gz 7565 BLAKE2B 26aa1c6a5d44bbe40266bbb62ca62c687dd1d85aed821c271f301ff27a97fdc753d2cdf5feba8b223b33b5b05bf39c55c3df0f1f8f7aae77335f2052a65df6c0 SHA512 422aaa78e25fad7b447f06358b772cacf22d5441ae0aaac22863877424f44703c1329813b068d901d4f2fb9df21bb08a5e4082504b76102d02dd15087d527a01
-DIST pytest_env-1.1.0.tar.gz 8640 BLAKE2B 384b438c6a5da2ddeac0be1a601b74eca77abbe5b5100322f9f161f5e68119980370aa1c8f8160ca9db53628209742afabd981678784e2c42a1f527344c39558 SHA512 12fb8d1093f9d9e89a2bb543428086cba04a322a4d443960d3ab33f270a3aa8f98585c334091d90febe3a5f4d4d66111dd5a8a5a7322185af10cae3eae14bfde
 DIST pytest_env-1.1.1.tar.gz 8625 BLAKE2B e455f4183a7c423895f69e8a598c2fd312594501855b650008960cd94757aed4e2cf96302974bd68777a4a75e4363e3facc77ac9ac8a79f11f709f172852d105 SHA512 dffe17d1e7a2f0a8d26fd13ebc5f87ee834f03cbcf9870899952c306bdefafd9b3bc8f6120142c22d82cace28ee6b681e40b8eb71cd3c77781bf56c269c28feb
-EBUILD pytest-env-1.0.1.ebuild 717 BLAKE2B 918aa7d00c2332fe3b5dd13106f65a489f49b65d3049c133f941b068f990edc9cd627ba5bdb4be1f8b278862a993d0e7718664deb0914bf7b5d773e777cee234 SHA512 d1993e2e09535dc1999e231650c3951ac97d7b854781974de5109f131712143976c7283e594f4999926a635dbb3f397a5426dbf1d24c3c2ee1a7d9df96ec13fd
-EBUILD pytest-env-1.1.0.ebuild 807 BLAKE2B ce4fe9142be5f37784c9f907de9debbad7e914f31021755eb99fdca01ff3f4642ba817cbf12df77a0459467ce417b40006a653c6c4f32d8179f9346450ed6afa SHA512 433766fd936179fdfca7f8d42e7363a78795d48d8388f6bf4668c4ce755c33320b1bcff16e5d366afe1e470d8319ade025ab51ea1743cbada7c22f4ea29406f0
 EBUILD pytest-env-1.1.1.ebuild 804 BLAKE2B bde1d09eab300d4099c290a125bf193cf7d7d8184ccabf8edbfb5189efc5b9c824593806cc12edc2b02190a97f8dfc33668bcc6690f97c7e7652205e1c005d1e SHA512 7724cb943a546e3b333f33e35b40df872beadef16076848b6e5042d1466779ccb9c2841cb99620f98350d8d3b4a121131aa42a420bc96c412b716bc2c2a915f2
 MISC metadata.xml 505 BLAKE2B 00369d63ea894a5d1b493461b41f5a211219dba4aee1e53a5bfcd4e37fb181ebb7f4934e721c186a5d631f3f03a8bbea2b1d732a1206b2347beb71b03f0c84a0 SHA512 78e7bf0e52d709686f0302ee3ffb2d11ff85860586a42aa23e974f60bf675de919d9d78fa0aa80d66b779b1575936686bf2846830ef4bea25e4ed87d2ce05835
diff --git a/dev-python/pytest-env/pytest-env-1.0.1.ebuild b/dev-python/pytest-env/pytest-env-1.0.1.ebuild
deleted file mode 100644
index 781ca769c118..000000000000
--- a/dev-python/pytest-env/pytest-env-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows you to add environment variables"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-env/
-	https://pypi.org/project/pytest-env/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pytest-env/pytest-env-1.1.0.ebuild b/dev-python/pytest-env/pytest-env-1.1.0.ebuild
deleted file mode 100644
index 407864cef54b..000000000000
--- a/dev-python/pytest-env/pytest-env-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows you to add environment variables"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-env/
-	https://pypi.org/project/pytest-env/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f47ce15ae2fd..3ee69f26e44a 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,6 @@
+AUX pytest-7.4.3-no-color.patch 1293 BLAKE2B 85ae23dc612eb7825f4c3ba2d727a6115540118269ae2748fcb4b39b958180078f0c171562a84879f7b18da16149fb40d06be36e782abf41133ae6d510414490 SHA512 7550397bb42f08c886dd72674a4bfd53dbe449e30c1fe51358b77eb055d3626c053167a27cc2b0883151a4651b6133be222dcf78cab8675b980c79836f72ae57
 DIST pytest-7.4.2.tar.gz 1354640 BLAKE2B 3929631bae67c5bfa86c12850c48549b6e545512b3d37d821b48f69adaa8ef057d8cfac4426c047746d9c80e7e3515cc45018744f2155805b5381e7e43cd1b12 SHA512 6f68b7e2bf6a14fbe89a452706b25c4afda69de2c0f78da9c03cf8795d1795d9bdaaff26ba5bc93931c1a04c1472a4eba58bb9774f81116419526413eb1fed4f
 DIST pytest-7.4.3.tar.gz 1356179 BLAKE2B 2f4fd893aaf9867f20548eababc7aac6f4978253bcc4a35c50f7e2327a48458bc184f2340764ee7fed3dd02bc779ed03f084a0d8839a18f614d32245888c4f56 SHA512 1b80e9b7e0ba8fe966d6658aa72d49d101190f255acd9eb81d66142327535b7108c921055d8fe3e330e3ff4163aa03d7c67b2807d433dd9e1799be6a59b208c9
 EBUILD pytest-7.4.2.ebuild 3606 BLAKE2B 818fa4a8e80ab5440125fd6beb462477977b9ab1301401b75528b1f8f38c9f3d675ae92467c54458ef9fd678192ab240933e20c775de8e7cc36a4fd91c4484c0 SHA512 5492ea6822c304d5fc747a61e52904603d489535490c9f904474500272298c3d09505799ec183678be99f4fb80e5e9f3ecf427296c881ec9533dd4c969d03f6f
-EBUILD pytest-7.4.3.ebuild 3614 BLAKE2B 804527ae3127527c101a5ef2092124acc61b267af0b808b1faa6b0b0cd966eb4c26ee97357f9f5bf43cd9692242c80920d96d50d6c1a8fc10c27ab4418ba6115 SHA512 13312d80b41c8dbe4420aa0221f7ec45e23e243d59b841fee7874b346778d38023b786cbf3be27210dab976fb6868899c379f4050c86fc4c4ed518e2fd92c546
+EBUILD pytest-7.4.3.ebuild 3713 BLAKE2B 524872d54c11f3db6127ea6cb5750a41b253bfeb05a05037b562f30bd0dcb560adfd5b82283a41a7bb01f4113ed56ded5ba25350e6c3cc568f5e13b91bb4f384 SHA512 40e7cafb57eb7b58ea9c06a46e2cb8a1e462a25f0e3648aefe8dc0757fa09c6ad376691b1d9de2f51d0d1859891b2e3f54d7c5354ba92b70065da1c128f30b99
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-7.4.3-no-color.patch b/dev-python/pytest/files/pytest-7.4.3-no-color.patch
new file mode 100644
index 000000000000..a6fa02472252
--- /dev/null
+++ b/dev-python/pytest/files/pytest-7.4.3-no-color.patch
@@ -0,0 +1,37 @@
+From ce93a8ad7a11d1e9be76ce6af0d510f935622c1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 25 Nov 2023 12:09:32 +0100
+Subject: [PATCH] Reset color-related envvars for testing
+
+Reset color-related environment variables in a fixture to prevent them
+from affecting test results.  Otherwise, some of the tests fail
+e.g. if NO_COLOR is set in the calling environment.
+---
+ testing/conftest.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/testing/conftest.py b/testing/conftest.py
+index 2a3ce5203..612777304 100644
+--- a/testing/conftest.py
++++ b/testing/conftest.py
+@@ -30,6 +30,17 @@ def set_column_width(monkeypatch: pytest.MonkeyPatch) -> None:
+     monkeypatch.setenv("COLUMNS", "80")
+ 
+ 
++@pytest.fixture(autouse=True)
++def reset_colors(monkeypatch: pytest.MonkeyPatch) -> None:
++    """
++    Reset all color-related variables to prevent them from affecting internal pytest output
++    in tests that depend on it.
++    """
++    monkeypatch.delenv("PY_COLORS", raising=False)
++    monkeypatch.delenv("NO_COLOR", raising=False)
++    monkeypatch.delenv("FORCE_COLOR", raising=False)
++
++
+ @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+ def pytest_collection_modifyitems(items):
+     """Prefer faster tests.
+-- 
+2.43.0
+
diff --git a/dev-python/pytest/pytest-7.4.3.ebuild b/dev-python/pytest/pytest-7.4.3.ebuild
index 34cc63f9e938..55eb8e448514 100644
--- a/dev-python/pytest/pytest-7.4.3.ebuild
+++ b/dev-python/pytest/pytest-7.4.3.ebuild
@@ -49,6 +49,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# https://github.com/pytest-dev/pytest/pull/11638
+	"${FILESDIR}/${P}-no-color.patch"
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 077be73451ff..8ec7f13fce76 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,5 +1,5 @@
 DIST pythran-0.13.1.gh.tar.gz 3639196 BLAKE2B 8aba73c68542d69dd2287d7081226161ecade9e49fe6ea69d034f9116becbc148614212cbcff0056291809d2994caf43ee374393939e44635c6bed69220b29b8 SHA512 2497fa49d78ff64e577816f4b48bd424c03f04b7605c92d359f0f8514aaa67b30b7e68248db475c215deafaf7e55f7b4b74ab37c9dbef2a27e813878bf350e77
 DIST pythran-0.14.0.gh.tar.gz 3642431 BLAKE2B cd5eeca0c52b0c3d17862b38c176b435a63a1f399e66979b8ac2682625cd0b0e074265e79bfdb6e57db989633954266132752e9b50c601ff43ae5c17c3e34bf5 SHA512 2a485c00b015abafc9ded28bfea8d8a7ae3ce87b5b654c318d5514fe12fd9374b599c05e3c4a2ff911fbae84df2efaa3cec2019c91e82ac1f36e0cc5ddeb2d8e
 EBUILD pythran-0.13.1.ebuild 1715 BLAKE2B f598528124f74b15f338227974377062786e8f8884a1b0cf3cbdcbd6739607aaf05527b758c6bbaf32e758567fff4e8e9644a7c00e27bfb8927b0a0eeb1a2ebc SHA512 105f92ba63b854ff9b56462d046818930c9244d3257ad5c2f9d7cb54f5f02b51c89ddfd4bd0e91c38b6ce9b556ddd7aa8bcfc20bea612351327eb6d9576b22b2
-EBUILD pythran-0.14.0.ebuild 2078 BLAKE2B 74ad5e38a7dd55bd57e06fd9aecbc282ce38c71f45b63022a237cf8dd34f15ae079996f59b8c93ece0ea2ea73ca4f6b9abce21706674ffe541c40116e9a86227 SHA512 23e12c725ce37c5dad6c59f855b3eb049d19a9b85ab56d1b4c0d581f51e5c8422734f0b286e252934b6d465dafb926f308f2d5b2f8ba48bd2bbb194b1fcffef3
+EBUILD pythran-0.14.0.ebuild 2081 BLAKE2B 0d6845aeb5d10f92efb481e841629fba6ac163247c9e3fac36c0fbb830b711b5c36813520ceb55f9f629ec501c99caeff4cd777a6ac222ec18d44d4c1e8fd264 SHA512 54b6bd76da0762c19a4bcf8cc86a8cb3ed9961b7f26a39e0ec42496d6f29dbcb78ccad505ea5e4ef05367caa37885e4fb6d8a79749a86d0bc579bb87c45397fc
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.14.0.ebuild b/dev-python/pythran/pythran-0.14.0.ebuild
index 55e937a216bd..48f1c2f4387c 100644
--- a/dev-python/pythran/pythran-0.14.0.ebuild
+++ b/dev-python/pythran/pythran-0.14.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 415cfec4b372..0115e50e952c 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -13,7 +13,7 @@ EBUILD scipy-1.10.1.ebuild 2662 BLAKE2B dec183f49fdfc327173ad0a5ae329cf9621662f0
 EBUILD scipy-1.11.0-r1.ebuild 2850 BLAKE2B eb201e9c497d0262cd1416b9f9f90fc9c84195595e348ffc1341457922add3482b16577d7bbb48017d3bce1883c69ee4545fc30e6fabe8410d3e5113e56286ff SHA512 d703ab7e30a83a720cb4a3568a841e5348e021b5542b708483731894b4f7bb16e0b9cce1a93fad84f558b2b3fb812528fb72a6812b9dc888f89d853898aefb06
 EBUILD scipy-1.11.1.ebuild 2938 BLAKE2B 591c432fb4060eb9a5eff0c7f5b0cfaec1340b6938074eb44aac124b2314b5aeebc8e83c28ad85a3df3a2142829d43729a6fd34b079405a544332cbd00a1c06d SHA512 1b21eb7a9307dc650d7ae86221c8b9ca81b212c9a31a19ece5c2170fe9a6518c1df4fe57b25acfe97f3a59a27a18ec3bfe2b5d9b9fb922237b6d71cfe9193e8a
 EBUILD scipy-1.11.2.ebuild 2844 BLAKE2B 2f895f59475840c3e1e9a6d01e11688147f43ecd010ffdf67788db9b4baf0cdb8174b353e8e39b729251e13ec698aff6a893bd4119e0b4dcf7648947960f1556 SHA512 ee69a5c20a0e056db32e4ee3060f1d058068e4261401931d871c9799d64c04c7a5893bbef7aa13cb7c007f4d4f29bc03c71eccd9eddd5b9268b41a96d12483a4
-EBUILD scipy-1.11.3-r1.ebuild 3557 BLAKE2B 56d2a1958d9fbb84e2555740d8f859825f6a532a859d0ef5bf2f54460ba56e76b475161a839827883f8f30040c691c5a9b460d4894f3b2c0556f5618863f9136 SHA512 67a1044b8ae2e815981a42338d913ef711597ec8e949f76279a24a4be3a180c638083ce81a34c330d276d4be847dc0232c6a0919980d4c57839ce9d540e4a849
+EBUILD scipy-1.11.3-r1.ebuild 3556 BLAKE2B ad91dcad680d32491c8bfc9c2e4adc0f3ba436cc8ad88825b81549938acf7b44e8c9d5bfcea8fdfc5c8bf4c11a81bee650f03f4404b31b6b00e812b925ef7dca SHA512 fdee0cca91cf67a4b8f67de25f0fb90ec4293f64f86bac90a8119aa6741e2e17214823f13e6fffd945f5525fd43f74972b1fb9c024290b10ab8638d0036a2ee5
 EBUILD scipy-1.11.3.ebuild 3025 BLAKE2B 1c8afbbd88b427ee822f03bd87345c53ceedf264bcf34d9d16ef100f50b82b8a945f798606da0736d2d9b291f250f237e88ec63395403c91d139229bdc1e7296 SHA512 68b832b7cf683dcb4096c37529da1ca4e1a5b7efe89b4e205619b53a94af6a9baaa0e0e78882707d9745bf2f7ed71191aa8eb26bb2d11abd2394bfd234e1e85f
-EBUILD scipy-1.11.4.ebuild 3561 BLAKE2B 26d64f25c162d55ea7e04a8e1793e32a6e49de0509aa0195616f02d49d9ab32d42cce16ba77bb12ecabe21a2ab0715193774269812a4600584c964ae97afa3f9 SHA512 dcd15b2677ac8f629b64319792ef08ce456067a196fca0b28b4ab02dcb16fe92210973202a4b9ecb0893d90ff13987458027b44a0573d579c703ec5d1dffecc9
+EBUILD scipy-1.11.4.ebuild 3566 BLAKE2B a945fc7a5ad4bca5581d6bea184f97d22a1afc5fcc8a169d679406fa8f7f979476a51b739ef08b60637442661f6fb9ad0ad7772d983b5429c7a11990a8498ace SHA512 9429c02fcc913535ac8f738a25f76677bf90339b40ad968744ce4016b772445030ce90671db26dd904c180639e8d97d80cb581f9d8ca3b8b5427ab5aba36c6d4
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild
index bc4f3c54c4e1..1d3764815407 100644
--- a/dev-python/scipy/scipy-1.11.3-r1.ebuild
+++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/scipy/scipy-1.11.4.ebuild b/dev-python/scipy/scipy-1.11.4.ebuild
index b00912a9b8a9..6556c4b262d5 100644
--- a/dev-python/scipy/scipy-1.11.4.ebuild
+++ b/dev-python/scipy/scipy-1.11.4.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index f4dde8052ff0..d781626e4d71 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -9,7 +9,7 @@ DIST selenium-selenium-4.15.0.gh.tar.gz 78935989 BLAKE2B 5ff5f620d206ece245a3166
 DIST selenium-selenium-4.15.1-python.gh.tar.gz 78936820 BLAKE2B d7a92c69d6fbbeb6d4ba806130e73d49e976de5a37481726d68dc8925eef7a5f9b022ddbe9c1a11cb27ce0fc6790c61fe1146ff56f0e774554fea384124cbf87 SHA512 a4336cac1053648ad1617c814ba7e4e7cdfd2c9480c718cca0e2ef986fef6ffcad1cb56c6b08fcc7943fc3491b00a75961d14bb710c20f4d73bd75a644a4cef6
 DIST selenium-selenium-4.15.2-python.gh.tar.gz 78937488 BLAKE2B 9d064e5f753bdecc7ebab65b5c37cd433c05bf3c7ab09007247290bc782b9e64ec58bd499c838eb51c880c6ace258fef487fa6fb46c334230c5e6f64748014dd SHA512 9f1259b6f1362be5089766d4f51c20defc8f3e8c4a1be25690f9ed8acdccb0c09f64a0cdf0fe871956fb76cb2038663b7f99e620e302f89420fb582a6171fa92
 EBUILD selenium-4.13.0.ebuild 1643 BLAKE2B 3ad427608e632d89fd5b46aa85d9470edf1b457f080b7e888f1bb54de8d8454e72df66a897395deed535e35fea8cb190ed573b728d620f39728b4375429eb47e SHA512 d04a28784b44d9a647651ed7b225dddbefb77e9d6e82cd922ce9973c7a421f8925d796a493a26571faf8aaf7e9204d619889bf72f48e906482c199e7fd215661
-EBUILD selenium-4.14.0.ebuild 1645 BLAKE2B 3ce6fa1640b286f0daf5dc09aeb5605dceff5d6618e2fb34bf2e605958344cc210c48a46a27f56feef3833b1ed031077886ae59fca206956ffc5d9352fc3da3e SHA512 67163fef07188793d9419c4c7a2938b087577e727bb8c752a8e6fcb7d14a1cefaaa13d3fa109f515394798eae8ad4cfcb337ac6262aaa9db0bd98f1a67c92dd0
+EBUILD selenium-4.14.0.ebuild 1644 BLAKE2B be120c2b34485ec3ba07ae494534e99cd299b5b1a0a093fdbf48e3bcba74f854ae6354517767e438845e48f9c0ac06a1955daa3b4d3b0a890136a1700552ba10 SHA512 a465e8df772ac51f100ddc9c81c0c5f39610b15fd2edc635df33e8db8c13901ef2a4dd6cfc14e5e4d29fd3c7eadbf2c3c1b59101ccccc15f0c42c75db17a374f
 EBUILD selenium-4.15.0.ebuild 1650 BLAKE2B abe341fd993b3c20a7fd33dd6c531458080e2790f039aa73442e18bfaba1727df4560593df3c004a07ac13ae48a0c5a7d015fb5719f112a45cc2e5708048602c SHA512 feaeee5ffdbcc465b6330295aee69bc9d401483bfc6103eb6d0912c583501559785bb9ceb0f608c8d951a0cc121205e62c73e33e3b10dbf527aca2e721d26321
 EBUILD selenium-4.15.1.ebuild 1657 BLAKE2B 28932a568f8cdd4db620eaf3b463f01f48a9e4d065950011000f310983297a90952a5c0724fb208a2484a731d4e84e4c313b89c6cb0f8276ec9d036646ae103c SHA512 8c1408e0bb9d7e2247e26ef87e39901bf08b5b61d159e6390800ac70e789732d203812898eaff5143db499f6fb3019196dcd501eaef769bdee827177434c4aaa
 EBUILD selenium-4.15.2.ebuild 1663 BLAKE2B 15496ccf8cb6c07b480e86d07b9f990c7dc532c7eb1b1dc2161f78cc760c1e4c6655e80f8b33fd2f12e63730694f92767f128e6be9b87110f42356135ebe73dd SHA512 accd7ad2b34eae010e99ec96970e939113e7ce04a5139834cf843177b5fec44833a02f1b178bc8bdeedad5f0ba8bcea40503112d410f9f51f914064b3c8f5b32
diff --git a/dev-python/selenium/selenium-4.14.0.ebuild b/dev-python/selenium/selenium-4.14.0.ebuild
index d9db7672474b..f201c3f1d164 100644
--- a/dev-python/selenium/selenium-4.14.0.ebuild
+++ b/dev-python/selenium/selenium-4.14.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index a50438fd450d..0e96c6d40bf1 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
 DIST sphinxcontrib-doxylink-1.12.3.gh.tar.gz 23632 BLAKE2B 4a80366f4beeb9715c69c221a8e5247c28179613b59fb7bdadb1f145b69e4afdc0c2c30affd9647ec9e56e892503a95d018fd97eda014980177282299b81d61f SHA512 d25003dab35c6877bc846552db3e663c660bd5cb6ac6d9077bf04eca32afe0f9559118390c5c884901ce8c5297e97d84f6089428e3173123da6e7869a606a05e
-EBUILD sphinxcontrib-doxylink-1.12.2.ebuild 1091 BLAKE2B 294d5f9bb3ea87b2236c92b23bd0b76ff56e895d6656530bf60697741fb4c531c8ee42cb9ac94385ea38ce79b02fa71de4df6796f9f4e965dbcffe3ef3cdeb28 SHA512 ef5049c680d6ed1d7c024bcb8a888edcdccffc36a8abd7184fd821491bb0f037a90dd5a84a8adaef9f5a9ad314f98068e9f83fee399b3bb107e776a537a080f7
 EBUILD sphinxcontrib-doxylink-1.12.3.ebuild 1091 BLAKE2B 294d5f9bb3ea87b2236c92b23bd0b76ff56e895d6656530bf60697741fb4c531c8ee42cb9ac94385ea38ce79b02fa71de4df6796f9f4e965dbcffe3ef3cdeb28 SHA512 ef5049c680d6ed1d7c024bcb8a888edcdccffc36a8abd7184fd821491bb0f037a90dd5a84a8adaef9f5a9ad314f98068e9f83fee399b3bb107e776a537a080f7
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
deleted file mode 100644
index 578c35135df8..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 6034cc2232e8..8b33cee66684 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,3 @@
 DIST svg-path-6.3.gh.tar.gz 51479 BLAKE2B 895069baa0c9577fe222c16a5763cccc6bb18ebcb62471faba0b2e9cd06793b2f8e07790ca8153feaa3ee5ca35b2b11ab7ec821dc3ad98e510f6ec76e00f058e SHA512 fd9dd9e1e603be5e212e3eb247c9f3778203f5285397a4cdde4c038c3f31f7bc2b8904491c208256996e2fbd39b4e5f7ea58d964bd5d22bc09c57e4bc2c70317
-EBUILD svg-path-6.3.ebuild 885 BLAKE2B 7e79c0bc312458885ca45440cc1a53a4ab8be6c28333834eb5244852a149494425b92e449b7b5ba002c5013f8ae2d02021a03e2fb1b3ed0b5e4cc87d9c249306 SHA512 e99a8b79330b5c33c8fbd5ec84d21a0c6dbd664e042de9eefa71937b356fca8a587f0f8323c6e7ef46a94f068ef437912c62e1177ffc54f9d36482d14854db54
+EBUILD svg-path-6.3.ebuild 884 BLAKE2B 02e8c2b3547757d0e080dd3c72234e4a8c98bd55ceefdc24a77c7c45462044a75ede159e011c93ce118d3512cf99b14ee351a73d506a4a4d38dfe45c9f783b2c SHA512 8f32affa3569eba836da0d8e3809ff0b2cbf8fd4c433891619a7bc28e864313b63bdf25aa7ef507d1a2d8d890999b31556b1828ed6c358bae865a89c8ad13d4e
 MISC metadata.xml 605 BLAKE2B 7e4f5fadbcb069ee85389cbf3a93dfc75db9f2c791656f3820fc38e0eb1722959eb8a448395697fd1b87cb6e442b075629fc3df881f0df8dba5715e36cbe217e SHA512 cbd774db6a6e9d1a95b5dbd4884df0de34d24734cd538479f89379be0dae92517171a05bcb014284f93772d48db4f02b0a1aadbb7f9bb4f6a6866e4a8bb910ec
diff --git a/dev-python/svg-path/svg-path-6.3.ebuild b/dev-python/svg-path/svg-path-6.3.ebuild
index 03a37437b2b3..692ad833b23d 100644
--- a/dev-python/svg-path/svg-path-6.3.ebuild
+++ b/dev-python/svg-path/svg-path-6.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index c61ab64d9a97..e40415d04633 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -2,5 +2,5 @@ AUX time-machine-2.13.0-backport-pr400.patch 10411 BLAKE2B 85b9937d44e8d669672af
 DIST time-machine-2.12.0.gh.tar.gz 27743 BLAKE2B 4ed0c9901edb9c698b8bbba6df80d12b06f344ad6ee8f9e89577264da1f0211774c2d227d02dc1ab0ceb5b905094168d19cdebc00a91a955d216729082ecbc28 SHA512 4708cdc3aa0ec06907d0ee1219ceb074947fc962ab6f0d3606e5273f3d64ca278bb43254d924c04364b967301cf69229ced70d7b1db92b0b6dff1523cccb2f82
 DIST time-machine-2.13.0.gh.tar.gz 28747 BLAKE2B 88836d2b9ad34c8d256b576ab6b2bfe263232fb50d2e95f13049f84dbc838283811ebc54c5bb68493ef966e64777983ab6bcb7fafccda6dc74e00d3bb6a2108f SHA512 26a852d93633e037585ec8fcd563c86af8d977a87633dbeb66cf23c9ca49ca0ae536bdcdcdf809ee2ab423c197610c630d506bc3bf4f13c373d806cee2d8c598
 EBUILD time-machine-2.12.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
-EBUILD time-machine-2.13.0.ebuild 736 BLAKE2B ea04eb83b7dab8fd3d4be96ffd226218fee6d37aac91c2af7a097ecf38b0c5af2861a53c25ceca1845cf3aaaf43a094f828eafb75859e9738f2f065c243f857a SHA512 b619f0957dc64f5ce4c431d28d35b9b710654f9fff8f24e9f8362a165d38bdb97a2bd0456f2523df9a12b88d6ee326735955f905aaad2cd22e88093019a3c61b
+EBUILD time-machine-2.13.0.ebuild 735 BLAKE2B d4ebc0df22f04537c633d281359ec9a8f628e8818b7f434e61fd3c6c5027bf0254b5f7b0f2f6e2f5b7a2abc9a953146f81700b66d482b2eafbab0e287cf0b815 SHA512 5aee8fb648060eddbadf961b90a4eda373152425fee69ad14e012088422a69c24e647b68b6c59ca20fa3a28661f2958587096b5c755bc9f377556c6d179e0f45
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.13.0.ebuild b/dev-python/time-machine/time-machine-2.13.0.ebuild
index ff193599f65d..e1e0463a2eab 100644
--- a/dev-python/time-machine/time-machine-2.13.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 05f78f8ac520..0f838d059608 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,7 +1,3 @@
-DIST traitlets-5.11.2.tar.gz 157726 BLAKE2B 80354e3375ca50242222e3074a2e8ea9f836f4a828224b234bc6ecdd648bd3c8d3a526c2a4d1c003991e30bb229cd0e01ac0c0889f789788705cc78fb76a7303 SHA512 2194599110bef3f63f24a31331c4f823c5a31664f670198398519fbed0801904b8353aa1ff9458b2cc097fd0725bcba41135b72a001df2419dc5ab6c39b9685a
-DIST traitlets-5.12.0.tar.gz 158618 BLAKE2B f32a75222cdd0d69944f582c9d64833146905a2e8757651cdd17732463b39733f3639e23685f6d98120fef9d0c0b9f83d478da225772cb20565df5c00a82e05c SHA512 944b509d39246123e76d87b50c43421bed7d293ce3da15d46eb9c9bdd93fecc8b57ec457c11397f346839a79d6434dc381183926975e105a1f657f9e414d3ef0
 DIST traitlets-5.13.0.tar.gz 159818 BLAKE2B d681d293783044a8523512fc82994402ab7892f0adbc9d483ab4548e9b7f3491ace911a74529533a1ae7bcb3639fb50370b48647c96085da6a31a34e46777dbf SHA512 5fc084862e2d99593fadd69711f1bb9403ef92bc1d0e0f944eb1546f107e30763e7164d7be5f83c22e846bae51129376b5d14cb52251d782c50be571f29451b5
-EBUILD traitlets-5.11.2.ebuild 819 BLAKE2B 4337a62a1068158ed48dd4f79f336426b0a6a0b8f533807d9e33a050e4432a6fef510abb29875b59282de5b418259a856b71c44aa8abe0af7719e5200f4d048d SHA512 5f18cf01521db25c0dbdc130777b2e5b14290b0bbaff09b976e798d3e0e355a52511747975c566dfa5c4fc7720f9d4110dba9e93505a6c3f001038632efadc65
-EBUILD traitlets-5.12.0.ebuild 878 BLAKE2B 4fa7ee17092ec6cffe69d60ec8e6d99bc46ec3fcd8bcc61944ed108839931634d57af06af629d212a11d19ae766e0c106fd82cbc4636e302fbd2dc203abfab4b SHA512 6ec03dda163bcc2a715257b08a672ee8dcfe6099e27e021f5e495478c892f8e50df94fe3b711343dac8e0334c8d33d2aebcad7f731d3b3c35349e004c9eeca5a
 EBUILD traitlets-5.13.0.ebuild 883 BLAKE2B 08f74af57bdf3f82950e48c4ef7d81d49f90187c51ff2d642dc305f407622bb5ed1bfb4ec0c21094db1e1ed93c4459624b9c81231733ebf3c38fb20657c3759a SHA512 1749742f1e5b03a35fd13acbf0f71cc182536ce7e50e72a130f0faa1bb18244a78b7c133b9a4ad695bdf1bf63738971650890af966a51d83f627a7a72431a381
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-5.11.2.ebuild b/dev-python/traitlets/traitlets-5.11.2.ebuild
deleted file mode 100644
index 90d5b0e2bb99..000000000000
--- a/dev-python/traitlets/traitlets-5.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/traitlets/traitlets-5.12.0.ebuild b/dev-python/traitlets/traitlets-5.12.0.ebuild
deleted file mode 100644
index a8fb08eb8a28..000000000000
--- a/dev-python/traitlets/traitlets-5.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_typing.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index c32048327aa7..3fdc7896aa92 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -5,7 +5,7 @@ DIST twisted-23.10.0.tar.gz 3495627 BLAKE2B 3b5c2dc56686203cfe7c863211f0be34f49b
 DIST twisted-23.10.0rc1.tar.gz 3496017 BLAKE2B 5e681b81f51d26cf48d7e5d16af4f5c0ea18aa7c45934efe3f8801a60a8ccf7a7a7a13e49d1c065540cda6571e872ed9fc90ac42c6610fbd2a6d0f0c9288baab SHA512 9122d87f1019a2bfdc1530f176e4c607b9a26bfce937d0436a3c260662599f1058ce04c037ecf71e88d17764df7d03399b5e0e353663e848cb8a8a79992d6260
 DIST twisted-23.8.0.tar.gz 3478691 BLAKE2B 44fa9da691456a2b1d97f54b95787abe3e162b5639ee7ab8779c6d9525eb2a878865f450aa6fd6c461c3eba84f95361d2423e241991f52f91a27b792b6d71123 SHA512 ef0a243a4c22dd31e57087f5b2c21a657b98e23cc486f08b9926a9ebe8c4b6fec137993aea71e6c60abc3d653d995da0f65ff10dfc6c3d2cb7fdae5db08e2532
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-23.10.0.ebuild 4089 BLAKE2B 374a104466f4e76d6bb55081f7bcb27dbe1fea372c9c95dc8be81e81b92c3a638b6f33510fcfe9fe4bed10af6d3673fcc093e0d47cf95d1d8a64462a94c9ef0b SHA512 41d7f06a27ce6f3bfd98d5b1274b6568de3dfd013dbd20239d3a9c3916480b9a85fe16efcacfd8a7733a752b8bc9d59e5cc70a64192aafa170f669669b0ad8c4
+EBUILD twisted-23.10.0.ebuild 4088 BLAKE2B d918b98decef78f7e3fa29d589b4ef206977818370762f7a8301f0c6b5fcf91711a591c5d62c01508f750597654247909a3cabd7aa6ede1e08e4e7e8db69ba40 SHA512 d9564a6799b0a227448da547d936d68fbcba19be4c14c225805ed4c8d90bd75a92432c046d1e2a80ccdf3a7d9e42d28a6f6dcfb7fb226136f97b6002ffc18e9e
 EBUILD twisted-23.10.0_rc1.ebuild 4089 BLAKE2B 374a104466f4e76d6bb55081f7bcb27dbe1fea372c9c95dc8be81e81b92c3a638b6f33510fcfe9fe4bed10af6d3673fcc093e0d47cf95d1d8a64462a94c9ef0b SHA512 41d7f06a27ce6f3bfd98d5b1274b6568de3dfd013dbd20239d3a9c3916480b9a85fe16efcacfd8a7733a752b8bc9d59e5cc70a64192aafa170f669669b0ad8c4
 EBUILD twisted-23.8.0.ebuild 4184 BLAKE2B ca39e9e3ba7489dd781c1673eede3a51a5fd3047d19448f018770030872cad95d7607d2dedc1f72b40d9882fb7a232fa42af6ceee306b4609cfa9ae6a44edf7a SHA512 ed0db98a2d1db6fb24459fab25cb7439ac987e7acc1ca507cb2e15b1da4c6367ffd2b96eb3b970d9970922756fdb5166e6ed1351c64a553d3cd41d072ab9e817
 MISC metadata.xml 1281 BLAKE2B 06f3bba5716e641cfb848eaf212fcd5a18d89caeefe1b0ec2fc6e0799ded9ded5c54dc04d239b6e7c427a23c0300caecc67cbb2a292a745dba5cddbf02fe4330 SHA512 e78734d016205a2bd850ddf68bfefce024a95efc4d4a42af52314aa363d6c654dada671b98a1b02642e7abe2f9a48c0454949b4bf07e88776924c63175b24227
diff --git a/dev-python/twisted/twisted-23.10.0.ebuild b/dev-python/twisted/twisted-23.10.0.ebuild
index 345f2095aeac..79e84cd6d4ee 100644
--- a/dev-python/twisted/twisted-23.10.0.ebuild
+++ b/dev-python/twisted/twisted-23.10.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 5ed787e231f7..c80726c9446f 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,3 @@
-DIST virtualenv-20.24.5.tar.gz 7119883 BLAKE2B bc4a0e81feeac8975f259b329f223a286be41af11c9a8f27b68b6a42611668942ba18b691a848195609e47695e3104602d6563cabb930d7fed9f07cc57d2468e SHA512 f77961ed26c3e7314f26c0c18d41ab843572b0a1d157eb7b5e51f955a289da8ecf633d2ad9c936b9292e5b06e4ce9f5b11a100681fbb63dd1fb9fc9bef37f4c4
-DIST virtualenv-20.24.6.tar.gz 7140367 BLAKE2B 7a98219cc7933431720e3105b9e94efe7622ecf769ae7a8a9be45253e6cbd0978a653e341586936428bbe271c25a90aa93aebdc423b0eeafad67dd0394fbea5a SHA512 cd09d05490b22c26220b48566e6df860cc135d142e9a390f85ed920a26f4ca2c0ca129b0b190fb9cb46ed0e2711231aa5966ae73ceabc1e3fa7812b63fc5c53b
 DIST virtualenv-20.24.7.tar.gz 7141024 BLAKE2B 1125960c3a0b84f1350a9b427e6387dacbf2b2c5ef827bd21d61b5b0fd2e0c81c01b452390b1ec96ed139ed42d3f061394c82227c06a873bca9c21bd5a8fcfbc SHA512 fdfa763f026665cf8bd624192f71853c00b22f0b34f4bf4cd629c928a3c666f60d3dd7ee10c3c46b9a8b383cce51015c5fdeb891e9c6033b02563686d5e7790e
-EBUILD virtualenv-20.24.5.ebuild 4795 BLAKE2B 01c24799994de8a19456626b84dd4af5029168f25726bf74701eac4545c422e6810f1732280810b3ac0cb16f0574426e02afddfabf9efca2f19edb958572e2de SHA512 c8cf31d71de28a3db7515dc1572d22cfb0094ef468b4527935b62f3f9845e4870038df15f67d87cf4903b195d24ad5f78579c0a63f73237918164275e5f5e3a0
-EBUILD virtualenv-20.24.6.ebuild 5089 BLAKE2B a6fd2f9fd0c7f6d5ddfcba2b0610772da4ae60f40118881b3a1c146bdae0aa84afe8bb64d1031fc60559ecdf625d7ef7d6f446ce1fa7b7b7aec7cd10a7a23221 SHA512 2eaa6c09439d517a1fb484c5fdd9c50d3d4de0faab8b97e6b278ee3af476074f47dc9501fdbbcbd44b0634f2d7aa7667f7a01a0ae2f60740d4ffa612bbd2258b
 EBUILD virtualenv-20.24.7.ebuild 5074 BLAKE2B 5d4963c15a4d23d333556814451a1fd43d20854f851f4efb29484b3adfd5637ca7fbd67cca3b736bd774ae605309a431e59213ee0932f2cb0354e1e16604efa0 SHA512 ded615c2a25754aa97ae87e4cc3bf1dd594326ff7f7f832ae2256dceec41a31f009b0e0948071e86ce54152ea55a3c2d265e5c52751dc6d36aac0f5094d089b5
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.24.5.ebuild b/dev-python/virtualenv/virtualenv-20.24.5.ebuild
deleted file mode 100644
index dfdcadbe7e94..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.24.6.ebuild b/dev-python/virtualenv/virtualenv-20.24.6.ebuild
deleted file mode 100644
index 0f7512ee9e82..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 29bb82298768..0500f830b74d 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -3,6 +3,6 @@ DIST xarray-2023.11.0.tar.gz 3800529 BLAKE2B 45b54588e3178c5104f40741cf2a3cb6403
 DIST xarray-2023.9.0.tar.gz 3776743 BLAKE2B 38433f7898db2b53f31db134b110fea743ea5886c33f8f8390b85cda18c1a1d7d178681e4e442ecc39f2f19ae4b761f94b38ccab27e8e20c3463f4364f1222dd SHA512 d6c1e6ff438415766dedada5841413b9c7514dc2b1bf71a4adb17df4d78b68f5f22cded09c20511e4e2e85ac3284c447fc13191397b7ae77d1294d7867e3ac3f
 EBUILD xarray-2023.10.1-r1.ebuild 3396 BLAKE2B dde22ebb0e1d2b2ec9b0d4cc0423e36e201660d5d854f133df05feaa8842162e3373c4e5710719bef7b0ad1d3be55712504a41869665cf189f547505d57981e6 SHA512 6862761b7c01904fadba146c585059791809ea0951cf9d462a7d512c1670763b74c617486e2e14d713696909cfd41756c91574ab476fa6778b29d3735b4194ed
 EBUILD xarray-2023.10.1.ebuild 2157 BLAKE2B 26b38d24b7d40211ab2601fc30fe35706f247aa0267b03b310d971e2f0fd9dabe50b911d90b44186bd08b534fbc6253fe44fc2afd47b9e9bfb1ed2da10025bbf SHA512 b888fb6e47ef9a5df988338a48d3f4a6148e00a989d59f8092b7b4bda4486dfffd3e9bc9fc39dd7091e7d163af99983ac462a6bf03e0a071a4c1a2f34da21a97
-EBUILD xarray-2023.11.0.ebuild 3304 BLAKE2B 414113f1d09862c428cd733322902c478d0629e61b9f2e1dc3cab4fb10b21fa9f95e17ad9312ed6c1128a01f66ae2ad45ddfe32d6b9dfa17214cd9088656db80 SHA512 d67daeb9720942b647f79bf131bc558f4764451c5a26ad78430c3c61c0d8a656a39f722fabb00adecbb0971dba16a994b0bc9abae4bf8b98e9d7531dc1a835ae
+EBUILD xarray-2023.11.0.ebuild 3309 BLAKE2B a70f84830597d596333a1f30a5f2131b5e57eb96cfea32904fba05f2149fc746950aefe739e60b63fa4c2c90127951adeaace176445ff08678e2e2fd6846bc86 SHA512 6373aea92be090b49cdf40b1224f5ab152589cd22f678b92017c2f77a0a49672c1db4df61d44d27b8335d28ad2cfe7d77e39745a82ad0f926513f71941406eca
 EBUILD xarray-2023.9.0.ebuild 2156 BLAKE2B a383efc4e5cb2c95f9b29afd0da35c2542f60d0445b974a707215cecfdfa1032536cf62f5b52d40cfe6ed3cc35de2ccdce3357c2c86c682902eb56043f2009b5 SHA512 75bf7fde06b2ac525ddc5b4ac61a2a1314fb7ae4ea240632635d3d519a39695738df5bb3123dd3b8c06150bbfc9327191d6c9a02a215d15c244adce458c0a3a1
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2023.11.0.ebuild b/dev-python/xarray/xarray-2023.11.0.ebuild
index eab6ed7eec8a..fd7acadeda01 100644
--- a/dev-python/xarray/xarray-2023.11.0.ebuild
+++ b/dev-python/xarray/xarray-2023.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="big-endian"
 
 RDEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d0c2010b1af1..3e8603821d13 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 21de9c6cfacf..5e65e896e73f 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,21 +4,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.6-r1.ebuild 2535 BLAKE2B 96b212bd55d3417a34975343e3a69a9673702c9bbe33c76499631a0b82f80edda2ada1de120c65641ed66bbf439d044a023795430d3f1b6c6d9cf134d0d3c8bf SHA512 988ea025731e7ae0f92a9090e3d0a3701b4f3671894492cdd9555a0ff3c0425f08e1b25a542a652c0ba549a79b175285ec5b29d2c06b34e3bc54aa0ace81beb2
 EBUILD lldb-16.0.6.ebuild 2665 BLAKE2B 75e985037a61bfd49b00214e9d31377f6862fd4e5bd1038d316c4b42ed99df48db2464da7a16358a05bd144abf6c2313cadd860cb0d4a815a179ee37f2ff0899 SHA512 6d4ca2fe6f8c76170c6d70304a711113658176ea29616e0cd9e050458f3883ab90eca7ec09908cd56437c13c71e8440b013cd724a74319bf7c0adb7b3af0536f
-EBUILD lldb-17.0.4.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
 EBUILD lldb-17.0.5.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
 EBUILD lldb-18.0.0.9999.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
-EBUILD lldb-18.0.0_pre20231104.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
-EBUILD lldb-18.0.0_pre20231111.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
 EBUILD lldb-18.0.0_pre20231119.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.4.ebuild b/dev-util/lldb/lldb-17.0.4.ebuild
deleted file mode 100644
index 2fb5872a822f..000000000000
--- a/dev-util/lldb/lldb-17.0.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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 +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	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}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	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
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# 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-util/lldb/lldb-18.0.0_pre20231104.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 1459848607aa..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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 +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	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}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	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
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# 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-util/lldb/lldb-18.0.0_pre20231111.ebuild b/dev-util/lldb/lldb-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 1459848607aa..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org 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 +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	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}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	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
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# 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/eclass/Manifest.gz b/eclass/Manifest.gz
index 3f4b90255ece..f817e454f4dd 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index ad6c35848bc4..9f702697a846 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -75,12 +75,6 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 				18.0.0_pre20231119)
 					EGIT_COMMIT=5237193b87721134541f228e28edfd544a9c8ac8
 					;;
-				18.0.0_pre20231111)
-					EGIT_COMMIT=167b598648dfcee2f23426bfa972e53f8ac16722
-					;;
-				18.0.0_pre20231104)
-					EGIT_COMMIT=83888a5404d46667647fe36d6fa510d075ed57ea
-					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
diff --git a/licenses/LA_OPT_BASE_LICENSE b/licenses/LA_OPT_BASE_LICENSE
index 5ead1a1a13a7..0e666c028e87 100644
--- a/licenses/LA_OPT_BASE_LICENSE
+++ b/licenses/LA_OPT_BASE_LICENSE
@@ -1,609 +1,684 @@
-LA_OPT_BASE_LICENSE v12 March 2016
-
-IMPORTANT.  Read the following NXP Semiconductor Software License Agreement
-("Agreement") completely.    By selecting the "I Accept" button at the end of
-this page, you indicate that you accept the terms of the Agreement and you
-acknowledge that you have the authority, for yourself or on behalf of your
-company, to bind your company to these terms.  You may then download or install
-the file.
-
-NXP SEMICONDUCTOR SOFTWARE LICENSE AGREEMENT
-
-This is a legal agreement between you, as an authorized representative of your
-employer, or if you have no employer, as an individual (together "you"), and
-Freescale Semiconductor, Inc., a wholly-owned subsidiary of NXP Semiconductors
-N.V. ("NXP").  It concerns your rights to use the software identified in the
-Software Content Register and provided to you in binary or source code form
-and any accompanying written materials (the "Licensed Software"). The Licensed
-Software may include any updates or error corrections or documentation relating
-to the Licensed Software provided to you by NXP under this License. In
-consideration for NXP allowing you to access the Licensed Software, you are
-agreeing to be bound by the terms of this Agreement. If you do not agree to all
-of the terms of this Agreement, do not download or install the Licensed
-Software. If you change your mind later, stop using the Licensed Software and
-delete all copies of the Licensed Software in your possession or control. Any
-copies of the Licensed Software that you have already distributed, where
-permitted, and do not destroy will continue to be governed by this Agreement.
-Your prior use will also continue to be governed by this Agreement.
-
+LA_OPT_NXP_Software_License v39 August 2022
+IMPORTANT.  Read the following NXP Software License Agreement ("Agreement")
+completely. By selecting the "I Accept" button at the end of this page, or by
+downloading, installing, or using the Licensed Software, you indicate that you
+accept the terms of the Agreement, and you acknowledge that you have the
+authority, for yourself or on behalf of your company, to bind your company to
+these terms. You may then download or install the file. In the event of a
+conflict between the terms of this Agreement and any license terms and
+conditions for NXP's proprietary software embedded anywhere in the Licensed
+Software file, the terms of this Agreement shall control.  If a separate
+license agreement for the Licensed Software has been signed by you and NXP,
+then that agreement shall govern your use of the Licensed Software and shall
+supersede this Agreement.
+
+NXP SOFTWARE LICENSE AGREEMENT
+This is a legal agreement between your employer, of which you are an authorized
+representative, or, if you have no employer, you as an individual ("you" or
+"Licensee"), and NXP B.V. ("NXP").  It concerns your rights to use the software
+provided to you in binary or source code form and any accompanying written
+materials (the "Licensed Software"). The Licensed Software may include any
+updates or error corrections or documentation relating to the Licensed Software
+provided to you by NXP under this Agreement. In consideration for NXP allowing
+you to access the Licensed Software, you are agreeing to be bound by the terms
+of this Agreement. If you do not agree to all of the terms of this Agreement,
+do not download or install the Licensed Software. If you change your mind
+later, stop using the Licensed Software and delete all copies of the Licensed
+Software in your possession or control. Any copies of the Licensed Software
+that you have already distributed, where permitted, and do not destroy will
+continue to be governed by this Agreement. Your prior use will also continue to
+be governed by this Agreement.
 1.       DEFINITIONS
-
-1.1.             "Affiliates" means, any corporation, or entity directly or
-indirectly controlled by, controlling, or under common control with NXP
-Semiconductors N.V.
-
-1.2.             "Essential Patent" means a patent to the limited extent that
-infringement of such patent cannot be avoided in remaining compliant with the
-technology standards implicated by the usage of any of the Licensed Software,
-including optional implementation of the standards, on technical but not
-commercial grounds, taking into account normal technical practice and the state
-of the art generally available at the time of standardization.
-
-1.3.             "Intellectual Property Rights" means any and all rights under
-statute, common law or equity in and under copyrights, trade secrets, and
-patents (including utility models), and analogous rights throughout the world,
-including any applications for and the right to apply for, any of the
-foregoing.
-
-1.4.             "Software Content Register" means the documentation
-accompanying the Licensed Software which identifies the contents of the
-Licensed Software, including but not limited to identification of any Third
-Party Software.
-
-1.5.             "Third Party Software" means, any software included in the
-Licensed Software that is not NXP Proprietary software, and is not open source
-software, and to which different license terms may apply.
-
+1.1.         "Affiliate" means, with respect to a party, any corporation or
+other legal entity that now or hereafter Controls, is Controlled by or is under
+common Control with such party; where "Control" means the direct or indirect
+ownership of greater than fifty percent (50%) of the shares or similar
+interests entitled to vote for the election of directors or other persons
+performing similar functions. An entity is considered an Affiliate only so long
+as such Control exists.
+1.2	"Authorized System" means either (i) Licensee's hardware product which
+incorporates an NXP Product or (ii) Licensee's software program which is used
+exclusively in connection with an NXP Product and with which the Licensed
+Software will be integrated.
+1.3.	"Derivative Work" means a work based upon one or more pre-existing
+works.  A work consisting of editorial revisions, annotations, elaborations, or
+other modifications which, as a whole, represent an original work of
+authorship, is a Derivative Work.
+1.4	"Intellectual Property Rights" means any and all rights under statute,
+common law or equity in and under copyrights, trade secrets, and patents
+(including utility models), and analogous rights throughout the world,
+including any applications for and the right to apply for, any of the foregoing.
+1.5	"NXP Product" means a hardware product (e.g. a microprocessor,
+microcontroller, sensor or digital signal processor) and/or services (e.g.
+cloud platform services) supplied directly or indirectly from NXP or an NXP
+Affiliate, unless there is a product specified in the Software Content
+Register, in which case this definition is limited to such product.
+1.6      "Software Content Register" means the documentation which may
+accompany the Licensed Software which identifies the contents of the Licensed
+Software, including but not limited to identification of any Third Party
+Software, if any, and may also contain other related information as whether the
+license in 2.3 is applicable.
+1.7     "Third Party Software" means, any software included in the Licensed
+Software that is not NXP proprietary software, and is not open source software,
+and to which different license terms may apply.
 2.       LICENSE GRANT.
-
-2.1.             Separate license grants to Third Party Software, or other
-terms applicable to the Licensed Software if different from those granted in
-this Section 2, are contained in Appendix A.  The Licensed Software is
+2.1.         If you are not expressly granted the distribution license in
+Section 2.3 in the Software Content Register, then you are only granted the
+rights in Section 2.2 and not in 2.3.  If you are expressly granted the
+distribution license in Section 2.3 in the Software Content Register, then you
+are granted the rights in both Section 2.2 and 2.3.
+2.2.	Standard License.  Subject to the terms and conditions of this
+Agreement, NXP grants you a worldwide, personal, non-transferable,
+non-exclusive, non-sublicensable license, solely for the development of an
+Authorized System:
+(a)	to use and reproduce the Licensed Software (and its Derivative Works
+prepared under the license in Section 2.2(b)) solely in combination with a NXP
+Product; and
+(b)	for Licensed Software provided to you in source code form (human
+readable), to prepare Derivative Works of the Licensed Software solely for use
+in combination with a NXP Product.
+You may not distribute or sublicense the Licensed Software to others under the
+license granted in this Section 2.2.
+You may demonstrate the Licensed Software to your direct customers as part of
+an Authorized System so long as such demonstration is directly controlled by
+you and without prior approval by NXP; however, to all other third parties only
+if NXP has provided its advance, written approval (e.g. email approval) of your
+demonstrating the Licensed Software to specified third parties or at specified
+event(s).  You may not leave the Licensed Software with a direct customer or
+any other third party at any time.
+2.3.        Additional Distribution License.  If expressly authorized in the
+Software Content Register, subject to the terms and conditions of this
+Agreement, NXP grants you a worldwide, personal, non-transferable,
+non-exclusive, non-sublicensable license solely in connection with your
+manufacturing and distribution of an Authorized System:
+(a)	to manufacture (or have manufactured), distribute, and market the
+Licensed Software (and its Derivative Works prepared under the license in
+2.2(b)) in object code (machine readable format) only as part of, or embedded
+within, Authorized Systems and not on a standalone basis solely for use in
+combination with a NXP Product.  Notwithstanding the foregoing, those files
+marked as .h files ("Header files") may be distributed in source or object code
+form, but only as part of, or embedded within Authorized Systems; and
+(b)	to copy and distribute as needed, solely in connection with an
+Authorized System and for use in combination with a NXP Product,
+non-confidential NXP information provided as part of the Licensed Software for
+the purpose of maintaining and supporting Authorized Systems with which the
+Licensed Software is integrated.
+2.4	Separate license grants to Third Party Software, or other terms
+applicable to the Licensed Software if different from those granted in this
+Section 2, are contained in Appendix A. The Licensed Software may be
 accompanied by a Software Content Register which will identify that portion of
 the Licensed Software, if any, that is subject to the different terms in
 Appendix A.
-
-2.2.             Exclusively in connection with your development and
-distribution of product containing a programmable processing unit (e.g. a
-microprocessor, microcontroller, sensor or digital signal processor) supplied
-directly or indirectly from NXP ("Authorized System") NXP grants you a
-world-wide, personal, non-transferable, non-exclusive, non-sublicensable,
-license, under NXP's Intellectual Property Rights:
-
-(a)    to use and reproduce the Licensed Software only as part of, or
-integrated within, Authorized Systems and not on a standalone basis;
-
-(b)   to directly or indirectly manufacture, demonstrate, copy, distribute,
-market and sell the Licensed Software in object code (machine readable) only as
-part of, or embedded within, Authorized Systems in object code form and not on
-a standalone basis.  Notwithstanding the foregoing, those files marked as .h
-files ("Header files") may be distributed in source or object code form, but
-only as part of, or embedded within Authorized Systems.
-
-(c)     to copy, use and distribute as needed, solely in connection with an
-Authorized System, proprietary NXP information associated with the Licensed
-Software for the purpose of developing, maintaining and supporting Authorized
-Systems with which the Licensed Software is integrated or associated.
-
-2.3.             For NXP Licensed Software provided to you in source code form
-(human readable), NXP further grants to you a worldwide, personal,
-non-transferable, non-exclusive, non-sublicensable, license, under NXP's
-Intellectual Property Rights:
-
-(a)    to prepare derivative works of the Licensed Software, only as part of,
-or integrated within, Authorized Systems and not on a standalone basis;
-
-(b)     to use, demonstrate, copy, distribute, market and sell the derivative
-works of the Licensed Software in object code (machine readable) only as part
-of, or integrated within, Authorized Systems and not on a standalone basis.
-Notwithstanding the foregoing, those files marked as .h files ("Header files")
-may be distributed in source or object code form, but only as part of, or
-embedded within Authorized Systems.
-
-2.4.             You may use subcontractors on your premises to exercise your
-rights under Section 2.2 and 2.3 so long as you have an agreement in place with
-the subcontractor containing confidentiality restrictions no less stringent
-than those contained in this Agreement.  You will remain liable for your
+2.5.         You may use subcontractors to exercise your rights under Section
+2.2 and Section 2.3, if any, so long as you have an agreement in place with the
+subcontractor containing confidentiality restrictions no less stringent than
+those contained in this Agreement. You will remain liable for your
 subcontractors' adherence to the terms of this Agreement and for any and all
 acts and omissions of such subcontractors with respect to this Agreement and
 the Licensed Software.
-
 3.       LICENSE LIMITATIONS AND RESTRICTIONS.
-
-3.1.             The licenses granted above in Section 2.3 only extend to NXP
-intellectual property rights that would be infringed by the Licensed Software
-prior to your preparation of any derivative work.
-
-3.2.             The Licensed Software is licensed to you, not sold.  Title to
+3.1.         The licenses granted above in Section 2 only extend to NXP
+Intellectual Property Rights that would be infringed by the unmodified Licensed
+Software prior to your preparation of any Derivative Work.
+3.2.         The Licensed Software is licensed to you, not sold. Title to
 Licensed Software delivered hereunder remains vested in NXP or NXP's licensor
-and cannot be assigned or transferred.  You are expressly forbidden from
-selling or otherwise distributing the Licensed Software, or any portion
-thereof, except as expressly permitted herein.  This Agreement does not grant
-to you any implied rights under any NXP or third party intellectual property.
-
-3.3.             You may not translate, reverse engineer, decompile, or
-disassemble the Licensed Software except to the extent applicable law
-specifically prohibits such restriction.  You must prohibit your sub-licensees
-from translating, reverse engineering, decompiling, or disassembling the
-Licensed Software except to the extent applicable law specifically prohibits
-such restriction.
-
-3.4.             You must reproduce any and all of NXP's (or its third party
+and cannot be assigned or transferred. You are expressly forbidden from selling
+or otherwise distributing the Licensed Software, or any portion thereof, except
+as expressly permitted herein. This Agreement does not grant to you any implied
+rights under any NXP or third party Intellectual Property Rights.
+3.3.         You may not translate, reverse engineer, decompile, or disassemble
+the Licensed Software except to the extent applicable law specifically
+prohibits such restriction. You must prohibit your subcontractors or customers
+(if distribution is permitted) from translating, reverse engineering,
+decompiling, or disassembling the Licensed Software except to the extent
+applicable law specifically prohibits such restriction.
+3.4.         You must reproduce any and all of NXP's (or its third-party
 licensor's) copyright notices and other proprietary legends on copies of
 Licensed Software.
-
-3.5.             If you distribute the Licensed Software to the United States
-Government, then the Licensed Software is "restricted computer software" and
-is subject to FAR 52.227-19 (c)(1) and (c)(2).
-
-3.6.             You grant to NXP a non-exclusive, non-transferable,
-irrevocable, perpetual, worldwide, royalty-free, sub-licensable license under
-your Intellectual Property Rights to use without restriction and for any
-purpose any suggestion, comment or other feedback related to the Licensed
-Software (including, but not limited to, error corrections and bug fixes).
-
-3.7.             You will not take or fail to take any action that could
-subject the Licensed Software to an Excluded License. An Excluded License means
-any license that requires, as a condition of use, modification or distribution
-of software subject to the Excluded License, that such software or other
-software combined and/or distributed with the software be (i) disclosed or
-distributed in source code form; (ii) licensed for the purpose of making
-derivative works; or (iii) redistributable at no charge.
-
-3.8.             You may not publish or distribute information, results or data
-associated with the use of the Licensed Software to anyone other than NXP;
-however, you must advise NXP of any results obtained including any problems or
-suggested improvements thereof.  NXP retains the right to use such results and
-related information in any manner it deems appropriate.
-
+3.5.         If you distribute the Licensed Software to the United States
+Government, then the Licensed Software is "restricted computer software" and is
+subject to FAR 52.227-19.
+3.6.         You grant to NXP a non-exclusive, non-transferable, irrevocable,
+perpetual, worldwide, royalty-free, sub-licensable license under your
+Intellectual Property Rights to use without restriction and for any purpose any
+suggestion, comment or other feedback related to the Licensed Software
+(including, but not limited to, error corrections and bug fixes).
+3.7.         You will not take or fail to take any action that could subject
+the Licensed Software to an Excluded License. An Excluded License means any
+license that requires, as a condition of use, modification or distribution of
+software subject to the Excluded License, that such software or other software
+combined and/or distributed with the software be (i) disclosed or distributed
+in source code form; (ii) licensed for the purpose of making Derivative Works;
+or (iii) redistributable at no charge.
+3.8.         You may not publish or distribute reports associated with the use
+of the Licensed Software to anyone other than NXP.  You may advise NXP of any
+results obtained from your use of the Licensed Software, including any problems
+or suggested improvements thereof, and NXP retains the right to use such
+results and related information in any manner it deems appropriate.
 4.       OPEN SOURCE.         Open source software included in the Licensed
-Software is not licensed under the terms of this Agreement, but is instead
+Software is not licensed under the terms of this Agreement but is instead
 licensed under the terms of the applicable open source license(s), such as the
-BSD License, Apache License or the GNU Lesser General Public License.  Your use
+BSD License, Apache License or the GNU Lesser General Public License. Your use
 of the open source software is subject to the terms of each applicable license.
 You must agree to the terms of each applicable license, or you cannot use the
 open source software.
-
-5.       INTELLECTUAL PROPERTY RIGHTS.    Subject to NXP's ownership interest
-in the underlying Licensed Software, all intellectual property rights
-associated with, and title to, your Authorized System will be retained by or
-will vest in you. Your modifications to the Licensed Software, and all
-intellectual property rights associated with, and title thereto, will be the
-property of NXP.  Upon request, you must provide NXP the source code of any
-derivative of the Licensed Software.  You agree to assign all, and hereby do
-assign all rights, title, and interest to any such modifications to the
-Licensed Software to NXP and agree to provide all assistance reasonably
-requested by NXP to establish, preserve or enforce such right.  Further, you
-agree to waive all moral rights relating to your modifications to the Licensed
-Software, including, without limitation, all rights of identification of
-authorship and all rights of approval, restriction, or limitation on use or
-subsequent modification.  Notwithstanding the foregoing, you will have the
-license rights granted in Section 2 hereto to any such modifications made by
-you or your licensees.
-
-6.       PATENT COVENANT NOT TO SUE. As partial, material consideration for the
-rights granted to you under this Agreement, you covenant not to sue or
-otherwise assert your patents against NXP, a NXP Affiliate or subsidiary, or
-a NXP licensee of the Licensed Software for infringement of your Intellectual
-Property Rights by the manufacture, use, sale, offer for sale, importation or
-other disposition or promotion of the Licensed Software and/or any
-redistributed portions of the Licensed Software.
-
-7.       ESSENTIAL PATENTS.  You are solely responsible for obtaining licenses
-for any relevant Essential Patents for your use in connection with technology
-that you incorporate into your product (whether as part of the Licensed
-Software or not).
-
-8.       TERM AND TERMINATION.   This Agreement will remain in effect unless
-terminated as provided in this Section 8.
-
-8.1.             You may terminate this Agreement immediately upon written
-notice to NXP at the address provided below.
-
-8.2.             Either party may terminate this Agreement if the other party
-is in default of any of the terms and conditions of this Agreement, and
-termination is effective if the defaulting party fails to correct such default
-within 30 days after written notice thereof by the non-defaulting party to the
-defaulting party at the address below.
-
-8.3.             Notwithstanding the foregoing, NXP may terminate this
-Agreement immediately upon written notice if you: breach any of your
-confidentiality obligations or the license restrictions under this Agreement;
-become bankrupt, insolvent, or file a petition for bankruptcy or insolvency,
-make an assignment for the benefit of its creditors; enter proceedings for
-winding up or dissolution ;are dissolved; or are nationalized or become subject
-to the expropriation of all or substantially all of its business or assets.
-
-8.4.             Upon termination of this Agreement, all licenses granted under
-Section 2 will expire, except that any licenses extended to end-users pursuant
-to Sections 2.2(b), 2.2(c), and 2.3(b), which have been granted prior to such
-termination will survive.
-
-8.5.             After termination of this Agreement by either party and upon
-NXP's written request, you will, at your discretion, return to the NXP any
-confidential information including all copies thereof or furnish to NXP at
-the address below, a statement certifying, with respect to the Licensed
-Software delivered hereunder that the original and all copies, except for
-archival copies to be used solely for dispute resolution purposes, in whole or
-in part, in any form, of the Licensed Software have been destroyed.
-
-8.6.             Notwithstanding the termination of this Agreement for any
-reason, the terms of Sections 1, 3, 5 through 25 will survive.
-
-9.                   SUPPORT.  NXP is not obligated to provide any support,
-upgrades or new releases of the Licensed Software under this Agreement. If you
-wish, you may contact NXP and report problems and provide suggestions regarding
-the Licensed Software. NXP has no obligation to respond to such a problem
-report or suggestion. NXP may make changes to the Licensed Software at any
-time, without any obligation to notify or provide updated versions of the
-Licensed Software to you.
-
-10.               NO WARRANTY.  To the maximum extent permitted by law,
-NXP expressly disclaims any warranty for the Licensed Software.  The Licensed
-Software is provided "AS IS", without warranty of any kind, either express or
-implied, including without limitation the implied warranties of
-merchantability, fitness for a particular purpose, or non-infringement.  You
-assume the entire risk arising out of the use or performance of the licensed
-software, or any systems you design using the licensed software (if any).
-
-11.               INDEMNITY. You agree to fully defend and indemnify NXP from
-all claims, liabilities, and costs (including reasonable attorney's fees)
-related to (1) your use (including your contractors or distributee's use, if
+5.       INTELLECTUAL PROPERTY RIGHTS.
+Upon request, you must provide NXP the source code of any derivative of the
+Licensed Software.
+Unless prohibited by law, the following paragraph shall apply.  Your
+modifications to the Licensed Software, and all intellectual property rights
+associated with, and title thereto, will be the property of NXP.  You agree to
+assign all, and hereby do assign all rights, title, and interest to any such
+modifications to the Licensed Software to NXP and agree to provide all
+assistance reasonably requested by NXP to establish, preserve or enforce such
+right.  Further, you agree to waive all moral rights relating to your
+modifications to the Licensed Software, including, without limitation, all
+rights of identification of authorship and all rights of approval, restriction,
+or limitation on use or subsequent modification.  Notwithstanding the
+foregoing, you will have the license rights granted in Section 2 hereto to any
+such modifications made by you or your licensees.
+Otherwise, you agree to grant an irrevocable, worldwide, and perpetual license
+to NXP to make, have made, use, sell, offer to sell, import, commercialize,
+sublicense and reproduce your modifications or derivative works to the Licensed
+Software without any payment to Licensee. You agree to provide all assistance
+reasonably requested by NXP to establish, preserve or enforce such right.
+6.       ESSENTIAL PATENTS.    NXP has no obligation to identify or obtain any
+license to any Intellectual Property Right of a third-party that may be
+necessary for use in connection with technology that is incorporated into the
+Authorized System (whether or not as part of the Licensed Software).
+7.       TERM AND TERMINATION.   This Agreement will remain in effect unless
+terminated as provided in this Section.
+7.1.         You may terminate this Agreement immediately upon written notice
+to NXP at the address provided below.
+7.2.         Either party may terminate this Agreement if the other party is in
+default of any of the terms and conditions of this Agreement, and termination
+is effective if the defaulting party fails to correct such default within 30
+days after written notice thereof by the non-defaulting party to the defaulting
+party at the address below.
+7.3.         Notwithstanding the foregoing, NXP may terminate this Agreement
+immediately upon written notice if you: breach any of your confidentiality
+obligations or the license restrictions under this Agreement;  become bankrupt,
+insolvent, or file a petition for bankruptcy or insolvency; make an assignment
+for the benefit of its creditors; enter proceedings for winding up or
+dissolution; are dissolved; or are nationalized or become subject to the
+expropriation of all or substantially all of your business or assets.
+7.4.         Upon termination of this Agreement, all licenses granted under
+Section 2 will expire.
+7.5.         After termination of this Agreement by either party   you will
+destroy all parts of Licensed Software and its Derivative Works (if any) and
+will provide to NXP a statement certifying the same.
+7.6.         Notwithstanding the termination of this Agreement for any reason,
+the terms of Sections 1 and 3 through 24 will survive.
+8.        SUPPORT.  NXP is not obligated to provide any support, upgrades or
+new releases of the Licensed Software under this Agreement. If you wish, you
+may contact NXP and report problems and provide suggestions regarding the
+Licensed Software. NXP has no obligation to respond to such a problem report or
+suggestion. NXP may make changes to the Licensed Software at any time, without
+any obligation to notify or provide updated versions of the Licensed Software
+to you.
+9.        NO WARRANTY.  To the maximum extent permitted by law, NXP expressly
+disclaims any warranty for the Licensed Software. The Licensed Software is
+provided "AS IS", without warranty of any kind, either express or implied,
+including without limitation the implied warranties of merchantability, fitness
+for a particular purpose, or non-infringement. You assume the entire risk
+arising out of the use or performance of the licensed software, or any systems
+you design using the licensed software (if any).
+10.        INDEMNITY. You agree to fully defend and indemnify NXP from all
+claims, liabilities, and costs (including reasonable attorney's fees) related
+to (1) your use (including your subcontractor's or distributee's use, if
 permitted) of the Licensed Software or (2) your violation of the terms and
 conditions of this Agreement.
-
-12.               LIMITATION OF LIABILITY.  EXCLUDING LIABILITY FOR A BREACH
-OF SECTION 2 (LICENSE GRANTS), SECTION 3 (LICENSE LIMITATIONS AND
-RESTRICTIONS), SECTION 17 (CONFIDENTIAL INFORMATION), OR CLAIMS UNDER SECTION
-11(INDEMNITY), IN NO EVENT WILL EITHER PARTY BE LIABLE, WHETHER IN CONTRACT,
-TORT, OR OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR
-PUNITIVE DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE,
-LOSS OF TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR
-REVENUES, TO THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW.  NXP'S TOTAL
-LIABILITY FOR ALL COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF
-OR IN CONNECTION WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS
-AGREEMENT IS LIMITED TO THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION
-WITH THE LICENSED SOFTWARE TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
-
-
-13.               EXPORT COMPLIANCE. Each party shall comply with all
-applicable export and import control laws and regulations including but not
-limited to the US Export Administration Regulations (including prohibited
-party lists issued by other federal governments), Catch-all regulations and
-all national and international embargoes. Each party further agrees that it
-will not knowingly transfer, divert, export or re-export, directly or
-indirectly, any product, software, including software source code, or
-technology restricted by such regulations or by other applicable national
+11.        LIMITATION OF LIABILITY.  EXCLUDING LIABILITY FOR A BREACH OF
+SECTION 2 (LICENSE GRANTS), SECTION 3 (LICENSE LIMITATIONS AND RESTRICTIONS),
+SECTION 16 (CONFIDENTIAL INFORMATION), OR CLAIMS UNDER SECTION 10 (INDEMNITY),
+IN NO EVENT WILL EITHER PARTY BE LIABLE, WHETHER IN CONTRACT, TORT, OR
+OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE
+DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF
+TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, TO
+THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW. NXP'S TOTAL LIABILITY FOR ALL
+COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF OR IN CONNECTION
+WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS AGREEMENT IS LIMITED TO
+THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION WITH THE LICENSED
+SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
+12.        EXPORT COMPLIANCE. Each party shall comply with all applicable
+export and import control laws and regulations including but not limited to the
+US Export Administration Regulation (including restrictions on certain military
+end uses and military end users as specified in Section 15 C.F.R. § 744.21 and
+prohibited party lists issued by other federal governments), Catch-all
+regulations and all national and international embargoes. Each party further
+agrees that it will not knowingly transfer, divert, export or re-export,
+directly or indirectly, any product, software, including software source code,
+or technology restricted by such regulations or by other applicable national
 regulations, received from the other party under this Agreement, or any direct
-product of such software or technical data to any person, firm, entity,
-country or destination to which such transfer, diversion, export or re-export
-is restricted or prohibited, without obtaining prior written authorization
-from the applicable competent government authorities to the extent required
-by those laws.
-
-14.   GOVERNMENT CONTRACT COMPLIANCE.
-
-14.1.          If you sell Authorized Systems directly to any government or
-public entity, including U.S., state, local, foreign or international
-governments or public entities, or indirectly via a prime contractor or
-subcontractor of such governments or entities, NXP makes no representations,
-certifications, or warranties whatsoever about compliance with government or
-public entity acquisition statutes or regulations, including, without
-limitation, statutes or regulations that may relate to pricing, quality,
-origin or content.
-
-14.2.          The Licensed Software has been developed at private expense and
-is a "Commercial Item" as defined in 48 C.F.R. §2.101, consisting of
+product of such software or technical data to any person, firm, entity, country
+or destination to which such transfer, diversion, export or re-export is
+restricted or prohibited, without obtaining prior written authorization from
+the applicable competent government authorities to the extent required by those
+laws.
+13.   GOVERNMENT CONTRACT COMPLIANCE
+13.1.      If you sell Authorized Systems directly to any government or public
+entity, including U.S., state, local, foreign or international governments or
+public entities, or indirectly via a prime contractor or subcontractor of such
+governments or entities, NXP makes no representations, certifications, or
+warranties whatsoever about compliance with government or public entity
+acquisition statutes or regulations, including, without limitation, statutes or
+regulations that may relate to pricing, quality, origin or content.
+13.2.      The Licensed Software has been developed at private expense and is a
+"Commercial Item" as defined in 48 C.F.R. Section 2.101, consisting of
 "Commercial Computer Software", and/or "Commercial Computer Software
-Documentation," as such terms are used in 48 C.F.R. §12.212 (or 48 C.F.R.
-§227.7202, as applicable) and may only be licensed to or shared with U.S.
-Government end users in object code form as part of, or embedded within,
-Authorized Systems.  Any agreement pursuant to which you share the Licensed
-Software will include a provision that reiterates the limitations of this
-document and requires all sub-agreements to similarly contain such limitations.
-
-15.               SAFETY CRITICAL APPLICATIONS
-
-15.1.          In some cases, NXP may promote certain Licensed Software for use
-in safety-related applications. NXP's goal is to educate licensees so that they
-can design their own end-product solutions to meet applicable functional safety
-standards and requirements.  You make the ultimate design decisions regarding
-your products and are solely responsible for compliance with all legal,
-regulatory, safety, and security related requirements concerning your products,
-regardless of any information or support that may be provided by NXP.
-Accordingly, you will indemnify and hold NXP harmless from any claims,
-liabilities, damages and associated costs and expenses (including attorneys'
-fees) that NXP may incur related to your incorporation of any product in a
-safety-critical application or system.
-
-15.2.          Only Licensed Software that NXP has specifically designated as
-"Automotive Qualified" is intended for use in automotive, military, or
-aerospace applications or environments.  If you use Licensed Software that has
-not been designated as "Automotive Qualified" in an automotive, military, or
-aerospace application or environment, you do so at your own risk.
-
-15.3.          Licensed Software is not intended or authorized for any use in
-anti-personnel landmines.
-
-16.              CHOICE OF LAW; VENUE.  This Agreement will be governed by,
-construed, and enforced in accordance with the laws of the State of Texas, USA,
-without regard to conflicts of laws principles, will apply to all matters
-relating to this Agreement or the Licensed Software, and you agree that any
-litigation will be subject to the exclusive jurisdiction of the state or
-federal courts Texas, USA.  The United Nations Convention on Contracts for
-the International Sale of Goods will not apply to this document.
-
-17.               CONFIDENTIAL INFORMATION.  Subject to the license grants and
+Documentation," as such terms are used in 48 C.F.R. Section 12.212 (or 48
+C.F.R. Section 227.7202, as applicable) and may only be licensed to or shared
+with U.S. Government end users in object code form as part of, or embedded
+within, Authorized Systems. Any agreement pursuant to which you share the
+Licensed Software will include a provision that reiterates the limitations of
+this document and requires all sub-agreements to similarly contain such
+limitations.
+14.        CRITICAL APPLICATIONS.  In some cases, NXP may promote certain
+software for use in the development of, or for incorporation into, products or
+services (a) used in applications requiring fail-safe performance or (b) in
+which failure could lead to death, personal injury, or severe physical or
+environmental damage (these products and services are referred to as "Critical
+Applications"). NXP's goal is to educate customers so that they can design
+their own end-product solutions to meet applicable functional safety standards
+and requirements. Licensee makes the ultimate design decisions regarding its
+products and is solely responsible for compliance with all legal, regulatory,
+safety, and security related requirements concerning its products, regardless
+of any information or support that may be provided by NXP. As such, Licensee
+assumes all risk related to use of the Licensed Software in Critical
+Applications and NXP SHALL NOT BE LIABLE FOR ANY SUCH USE IN CRITICAL
+APPLICATIONS BY LICENSEE. Accordingly, Licensee will indemnify and hold NXP
+harmless from any claims, liabilities, damages and associated costs and
+expenses (including attorneys' fees) that NXP may incur related to Licensee’s
+incorporation of the Licensed Software in a Critical Application.
+15.        CHOICE OF LAW; VENUE.  This Agreement will be governed by,
+construed, and enforced in accordance with the laws of The Netherlands, without
+regard to conflicts of laws principles, will apply to all matters relating to
+this Agreement or the Licensed Software, and you agree that any litigation will
+be subject to the exclusive jurisdiction of the courts of Amsterdam, The
+Netherlands. The United Nations Convention on Contracts for the International
+Sale of Goods will not apply to this document.
+16.        CONFIDENTIAL INFORMATION.  Subject to the license grants and
 restrictions contained herein, you must treat the Licensed Software as
 confidential information and you agree to retain the Licensed Software in
-confidence perpetually, with respect to Licensed Software in source code form
-(human readable), or for a period of five (5) years from the date of
-termination of this Agreement, with respect to all other parts of the Licensed
-Software.  During this period, you may not disclose any part of the Licensed
-Software to anyone other than employees who have a need to know of the Licensed
-Software and who have executed written agreements obligating them to protect
-such Licensed Software to at least the same degree of care as in this
-Agreement.  You agree to use the same degree of care, but no less than a
-reasonable degree of care, with the Licensed Software as you do with your own
-confidential information. You may disclose Licensed Software to the extent
-required by a court or under operation of law or order provided that you notify
-NXP of such requirement prior to disclosure, which you only disclose
-information required, and that you allow NXP the opportunity to object to such
-court or other legal body requiring such disclosure.
-
-18.               TRADEMARKS.  You are not authorized to use any NXP
-trademarks, brand names, or logos.
-
-19.               ENTIRE AGREEMENT.  This Agreement constitutes the entire
-agreement between you and NXP regarding the subject matter of this Agreement,
-and supersedes all prior communications, negotiations, understandings,
-agreements or representations, either written or oral, if any.  This Agreement
-may only be amended in written form, signed by you and NXP.
-
-20.               SEVERABILITY.  If any provision of this Agreement is held for
-any reason to be invalid or unenforceable, then the remaining provisions of
-this Agreement will be unimpaired and, unless a modification or replacement of
-the invalid or unenforceable provision is further held to deprive you or NXP of
-a material benefit, in which case the Agreement will immediately terminate, the
+confidence perpetually. You may not disclose any part of the Licensed Software
+to anyone other than distributees in accordance with Section 2.3 and employees,
+or subcontractors in accordance with Section 2.5, who have a need to know of
+the Licensed Software and who have executed written agreements obligating them
+to protect such Licensed Software to at least the same degree of
+confidentiality as in this Agreement. You agree to use the same degree of care,
+but no less than a reasonable degree of care, with the Licensed Software as you
+do with your own confidential information. You may disclose Licensed Software
+to the extent required by a court or under operation of law or order provided
+that you notify NXP of such requirement prior to disclosure, which you only
+disclose the minimum of the required information, and that you allow NXP the
+opportunity to object to such court or other legal body requiring such
+disclosure.
+17.       TRADEMARKS.  You are not authorized to use any NXP trademarks, brand
+names, or logos.
+18.        ENTIRE AGREEMENT.  This Agreement constitutes the entire agreement
+between you and NXP regarding the subject matter of this Agreement, and
+supersedes all prior communications, negotiations, understandings, agreements
+or representations, either written or oral, if any. This Agreement may only be
+amended in written form, signed by you and NXP.
+19.        SEVERABILITY.  If any provision of this Agreement is held for any
+reason to be invalid or unenforceable, then the remaining provisions of this
+Agreement will be unimpaired and, unless a modification or replacement of the
+invalid or unenforceable provision is further held to deprive you or NXP of a
+material benefit, in which case the Agreement will immediately terminate, the
 invalid or unenforceable provision will be replaced with a provision that is
 valid and enforceable and that comes closest to the intention underlying the
 invalid or unenforceable provision.
-
-21.               NO WAIVER.  The waiver by NXP of any breach of any provision
-of this Agreement will not operate or be construed as a waiver of any other or
-a subsequent breach of the same or a different provision.
-
-22.               AUDIT.  You will keep full, clear and accurate records with
-respect to your compliance with the limited license rights granted under this
-Agreement for three years following expiration or termination of this
-Agreement. NXP will have the right, either itself or through an independent
-certified public accountant to examine and audit, at NXP's expense, not more
-than once a year, and during normal business hours, all such records that may
-bear upon your compliance with the limited license rights granted above. You
-must make prompt adjustment to compensate for any errors and/or omissions
-disclosed by such examination or audit.
-
-23.               NOTICES.             All notices and communications under
-this Agreement will be made in writing, and will be effective when received
-at the following addresses:
-
-NXP:                   Freescale Semiconductor, Inc.
-
-                                    6501 William Cannon West    OE62
-
-                                    Austin, Texas 78735
-
-                                    ATTN: Legal Department
-                You:   The address provided at registration will be used.
-
-24.               RELATIONSHIP OF THE PARTIES.     The parties are independent
-contractors.  Nothing in this Agreement will be construed to create any
-partnership, joint venture, or similar relationship.  Neither party is
+20.        NO WAIVER.  The waiver by NXP of any breach of any provision of this
+Agreement will not operate or be construed as a waiver of any other or a
+subsequent breach of the same or a different provision.
+21.        AUDIT.  You will keep full, clear and accurate records with respect
+to your compliance with the limited license rights granted under this Agreement
+for three years following expiration or termination of this Agreement. NXP will
+have the right, either itself or through an independent certified public
+accountant to examine and audit, at NXP's expense, not more than once a year,
+and during normal business hours, all such records that may bear upon your
+compliance with the limited license rights granted above. You must make prompt
+adjustment to compensate for any errors and/or omissions disclosed by such
+examination or audit.
+22.        NOTICES.             All notices and communications under this
+Agreement will be made in writing, and will be effective when received at the
+following addresses:
+          NXP:          NXP B.V.
+                        High Tech Campus 60
+                        5656 AG Eindhoven
+                        The Netherlands
+                        ATTN: Legal Department
+
+          You:          The address provided at registration will be used.
+
+23.        RELATIONSHIP OF THE PARTIES.     The parties are independent
+contractors. Nothing in this Agreement will be construed to create any
+partnership, joint venture, or similar relationship. Neither party is
 authorized to bind the other to any obligations with third parties.
-
-25.               SUCCESSION AND ASSIGNMENT.   This Agreement will be binding
-upon and inure to the benefit of the parties and their permitted successors
-and assigns.  You may not assign this Agreement, or any part of this Agreement,
-without the prior written approval of NXP, which approval will not be
-unreasonably withheld or delayed.
-
-
-
-
-
+24.        SUCCESSION AND ASSIGNMENT.   This Agreement will be binding upon and
+inure to the benefit of the parties and their permitted successors and assigns.
+ You may not assign this Agreement, or any part of this Agreement, without the
+prior written approval of NXP, which approval will not be unreasonably withheld
+or delayed. NXP may assign this Agreement, or any part of this Agreement, in
+its sole discretion.
+25.	PRIVACY. By agreeing to this Agreement and/or utilizing the Licensed
+Software, Licensee consents to use of certain personal information, including
+but not limited to name, email address, and location, for the purpose of
+NXP’s internal analysis regarding future software offerings.  NXP’s
+complete Privacy Statement can be found at:
+https://www.nxp.com/company/our-company/about-nxp/privacy-statement:PRIVACYPRACT
+ICES.
 
 APPENDIX A
-
 Other License Grants and Restrictions:
 
 The Licensed Software may include some or all of the following software, which
-is either 1) not NXP proprietary software or 2) NXP proprietary software
-subject to different terms than those in the Agreement.  If the Software Content
-Register that accompanies the Licensed Software identifies any of the following
-Third Party Software or specific components of the NXP Proprietary Software,
-the following terms apply to the extent they deviate from the terms in the
+is either 1) Third Party Software or 2) NXP proprietary software subject to
+different terms than those in the Agreement. If the Software Content Register
+that accompanies the Licensed Software identifies any of the following Third
+Party Software or specific components of the NXP proprietary software, the
+following terms apply to the extent they deviate from the terms in the
 Agreement:
 
-Third Party Software
-
-Use Restrictions
-
-Atheros
-
-Use of Atheros software is limited to evaluation and demonstration only.
-Permitted distributions must be similarly limited. Further rights must be
-obtained directly from Atheros.
-
-ATI (AMD)
-
-Distribution of ATI software must be a part of, or embedded within, Authorized
-Systems that include a ATI graphics processor core.
-
-Broadcom Corporation
-
-Your use of Broadcom Corporation software is restricted to Authorized Systems
-that incorporate a compatible integrated circuit device manufactured or sold by
-Broadcom.
-
-Cirque Corporation
-
-Use of Cirque Corporation technology is limited to evaluation, demonstration,
-or certification testing only. Permitted distributions must be similarly
-limited. Further rights, including but not limited to ANY commercial
-distribution rights, must be obtained directly from Cirque Corporation.
-
-Coding Technologies (Dolby Labs)
-
-Use of CTS software is limited to evaluation and demonstration only.  Permitted
-distributions must be similarly limited. Further rights must be obtained from
-Dolby Laboratories.
-
-CSR
-
-Use of Cambridge Silicon Radio, Inc. ("CSR") software is limited to evaluation
+Airbiquity Inc.: The Airbiquity software may only be used in object code and
+Licensee may not sublicense the Airbiquity software to any third party.
+Licensee’s license to use the Airbiquity software expires on June 30, 2023.
+
+Amazon: Use of the Amazon software constitutes your acceptance of the terms of
+the Amazon Program Materials License Agreement (including the AVS Component
+Schedule, if applicable), located at
+https://developer.amazon.com/support/legal/pml.  All Amazon software is hereby
+designated "Amazon confidential".  With the exception of the binary library of
+the Amazon Wake Word Engine for “Alexa”, all Amazon software is also hereby
+designated as “Restricted Program Materials”. Amazon is a third-party
+beneficiary to this Agreement with respect to the Amazon software.
+
+Amazon Web Services, Inc.: AWS is an intended third-party beneficiary to this
+Agreement with respect to the Greengrass software. If you have an account with
+AWS that is not in good standing, you may not download, install, use or
+distribute the Greengrass software. You will comply with all instructions and
+requirements in any integration documents, guidelines, or other documentation
+AWS provides. The license to the Greengrass software will immediately terminate
+without notice if you (a) fail to comply with this Agreement or any other
+agreement with AWS, (b) fail to make timely payment for any AWS service, (c)
+fail to implement AWS updates, or (d) bring any action for intellectual
+property infringement against AWS or any AWS customer utilizing AWS services.
+Any dispute or claim relating to your use of the Greengrass software will be
+resolved by binding arbitration, rather than in court, except that you may
+assert claims in small claims court if your claims qualify.
+
+Amazon: AWS Fleetwise software must be used consistent with the terms found
+here: https://github.com/aws/aws-iot-fleetwise-edge/blob/main/LICENSE.
+
+Amphion Semiconductor Ltd.: Distribution of Amphion software must be a part of,
+or embedded within, Authorized Systems that include an Amphion Video Decoder.
+
+Apple MFi Software Development Kit: Use of Apple MFi Software and associated
+documentation is restricted to current Apple MFi licensees in accordance with
+the terms of their own valid and in-effect license from Apple.
+
+Aquantia Corp.: You may use Aquantia's API binaries solely to flash the API
+software to an NXP Product which mates with an Aquantia device.
+
+Argus Cyber Security: The Argus software may only be used in object code and
+only for evaluation and demonstration purposes.
+
+Atheros: Use of Atheros software is limited to evaluation and demonstration
+only.  Permitted distributions must be similarly limited. Further rights must
+be obtained directly from Atheros.
+
+ATI (AMD): Distribution of ATI software must be a part of, or embedded within,
+Authorized Systems that include a ATI graphics processor core.
+
+Au-Zone Technologies: eIQ Portal, Model Tool, DeepViewRT and ModelRunner are
+distributed by NXP under license from Au-Zone Technologies.  Your use of the
+Licensed Software, examples and related documentation is subject to the
+following:
+(1)          Use of Software is limited to Authorized System only
+(2)          In no event may Licensee Sublicense the Software
+(3)          AU-ZONE TECHNOLOGIES SHALL NOT BE LIABLE FOR USE OF LICENSED
+SOFTWARE IN CRITICAL APPLICATIONS BY LICENSEE
+
+Broadcom Corporation: Your use of Broadcom Corporation software is restricted
+to Authorized Systems that incorporate a compatible integrated circuit device
+manufactured or sold by Broadcom.
+
+Cadence Design Systems: Use of Cadence audio codec software is limited to
+distribution only of one copy per single NXP Product. The license granted
+herein to the Cadence Design Systems HiFi aacPlus Audio Decoder software does
+not include a license to the AAC family of technologies which you or your
+customer may need to obtain. Configuration tool outputs may only be distributed
+by licensees of the relevant Cadence SDK and distribution is limited to
+distribution of one copy embedded in a single NXP Product. Your use of Cadence
+NatureDSP Libraries whether in source code or in binary is restricted to NXP
+SoC based systems or emulation enablement based on NXP SoC.
+
+Cirque Corporation: Use of Cirque Corporation technology is limited to
+evaluation, demonstration, or certification testing only. Permitted
+distributions must be similarly limited. Further rights, including but not
+limited to ANY commercial distribution rights, must be obtained directly from
+Cirque Corporation.
+
+Coding Technologies (Dolby Labs): Use of CTS software is limited to evaluation
 and demonstration only.  Permitted distributions must be similarly limited.
-Further rights must be obtained directly from CSR.
-
-NXP Wireless Charging Library
-
-License to the Software is limited to use in inductive coupling or wireless
-charging applications
-
-Global Locate (Broadcom Corporation)
-
-Use of Global Locate, Inc. software is limited to evaluation and demonstration
-only.  Permitted distributions must be similarly limited.  Further rights must
-be obtained from Global Locate.
-
-Imagination Technologies Limited (IMG)
-
-If the Licensed Software includes proprietary software developed by IMG, your
-rights are limited to a non-exclusive, world-wide right and non-transferrable
-and non-sub-licensable license (i) to use and modify the Licensed Software and
-documentation and (ii) to copy and distribute the Licensed Software only in
-object code form solely for use on NXP Rayleigh products.  If you are provided
-with the Licensed Software in source code format, you are restricted to
-accessing only those deliverables in source code format which are necessary for
-you to carry out either specific customization or porting work in association
-with NXP's Rayleigh products or your Authorized System.
-
-The confidentiality restrictions shall continue in force without limit in time
-notwithstanding the termination or expiration of this Agreement.
-
-Micrium
-
-uC/OS-II and uC/OS-III is provided in source form for FREE short-term
-evaluation, for educational use or for peaceful research.  If you plan or
-intend to use uC/OS-II or uC/OS-III in a commercial application/product then,
-you need to contact Micrium to properly license uC/OS-II or uC/OS-III for its
-use in your application/product.   We provide ALL the source code for your
-convenience and to help you experience uC/OS-II or uC/OS-III.  The fact that
-the source is provided does NOT mean that you can use it commercially without
-paying a licensing fee.
-
-Microsoft
-
-If the Licensed Software includes software owned by Microsoft Corporation
-("Microsoft"), it is subject to the terms of your license with Microsoft
-(the "Microsoft Underlying Licensed Software") and as such, NXP grants no
-license to you, beyond evaluation and demonstration in connection with NXP
-processors, in the Microsoft Underlying Licensed Software.  You must separately
-obtain rights beyond evaluation and demonstration in connection with the
-Microsoft Underlying Licensed Software from Microsoft.
-
-Microsoft does not provide support services for the components provided
-to you through this Agreement.  If you have any questions or require
+Further rights must be obtained from Dolby Laboratories.
+
+CSR: Use of Cambridge Silicon Radio, Inc. ("CSR") software is limited to
+evaluation and demonstration only.  Permitted distributions must be similarly
+limited.  Further rights must be obtained directly from CSR.
+
+Crank: Use of Crank Software Inc. software is limited to evaluation and
+demonstration only. Permitted distributions must be similarly limited. Further
+rights must be obtained directly from Crank Software Inc.
+
+Cypress Semiconductor Corporation: WWD RTOS source code may only be used in
+accordance with the Cypress IOT Community License Agreement obtained directly
+from Cypress Semiconductor Corporation.
+
+Elektrobit Automotive GmbH (“EB”): EB software must be used consistent with
+the EB License Terms and Conditions, Version 1.4 (Dec 2019) found here:
+https://www.elektrobit.com/legal-notice/ .  Licensee is only granted an
+evaluation license for the EB software, defined as license to use the EB
+software internally for own evaluation purposes, limited to three (3) months.
+Production deployment of the EB software using this license is prohibited. See
+additionally Section 2.1.1 EB EULA.
+
+Embedded Systems Academy GmbH (EmSA):  Any use of Micro CANopen Plus is subject
+to the acceptance of the license conditions described in the LICENSE.INFO file
+distributed with all example projects and in the documentation and the
+additional clause described below.
+Clause 1: Micro CANopen Plus may not be used for any competitive or comparative
+purpose, including the publication of any form of run time or compile time
+metric, without the express permission of EmSA.
+
+Fenopix Technologies Private Limited: Under no circumstances may the CanvasJS
+software product be used in any way that would compete with any product from
+Fenopix.  License to the CanvasJS software will terminate immediately without
+notice if Licensee fail to comply with any provision of this Agreement.
+
+Fraunhofer IIS: Fraunhofer MPEG Audio Decoder (Fraunhofer copyright) - If you
+are provided MPEG-H decoding functionality, you understand that NXP will
+provide Fraunhofer your name and contact information.
+
+Future Technology Devices International Ltd.: Future Technology Devices
+International software must be used consistent with the terms found here:
+http://www.ftdichip.com/Drivers/FTDriverLicenceTerms.htm
+
+Global Locate (Broadcom Corporation): Use of Global Locate, Inc. software is
+limited to evaluation and demonstration only.  Permitted distributions must be
+similarly limited.  Further rights must be obtained from Global Locate.
+
+LC3plus: the LC3plus Low Complexity Communication Codec Plus (LC3plus) per ETSI
+TS 103 634 V1.3.1, is subject to ETSI Intellectual Property Rights Policy, See
+https://portal.etsi.org/directives/45_directives_jun_2022.pdf. For application
+in an End Product, Fraunhofer communication applies, see
+https://www.iis.fraunhofer.de/en/ff/amm/communication/lc3.html
+
+Microsoft: Except for Microsoft PlayReady software, if the Licensed Software
+includes software owned by Microsoft Corporation ("Microsoft"), it is subject
+to the terms of your license with Microsoft (the "Microsoft Underlying Licensed
+Software") and as such, NXP grants no license to you, beyond evaluation and
+demonstration in connection with NXP processors, in the Microsoft Underlying
+Licensed Software.  You must separately obtain rights beyond evaluation and
+demonstration in connection with the Microsoft Underlying Licensed Software
+from Microsoft. Microsoft does not provide support services for the components
+provided to you through this Agreement.  If you have any questions or require
 technical assistance, please contact NXP.  Microsoft Corporation is a third
-party beneficiary to this Agreement with the right to enforce the terms of
-this Agreement.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, MICROSOFT AND ITS
+party beneficiary to this Agreement with the right to enforce the terms of this
+Agreement.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, MICROSOFT AND ITS
 AFFILIATES DISCLAIM ANY WARRANTIES FOR THE MICROSOFT UNDERLYING LICENSED
 SOFTWARE.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, NEITHER MICROSOFT NOR ITS
 AFFILIATES WILL BE LIABLE, WHETHER IN CONTRACT, TORT, OR OTHERWISE, FOR ANY
 DIRECT, INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE DAMAGES,
 INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF TIME,
-INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES,
-ARISING FROM THE FROM THE USE OF THE MICROSOFT UNDERLYING LICENSED SOFTWARE.
-
-MindTree
-
-Notwithstanding the terms contained in Section 2.3 (a), if the Licensed
-Software includes proprietary software of MindTree in source code format,
-Licensee may make modifications and create derivative works only to the
+INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES, ARISING
+FROM THE FROM THE USE OF THE MICROSOFT UNDERLYING LICENSED SOFTWARE.  With
+respect to the Microsoft PlayReady software, you will have the license rights
+granted in Section 2, provided that you may not use the Microsoft PlayReady
+software unless you have entered into a Microsoft PlayReady Master Agreement
+and license directly with Microsoft.
+
+MindTree: Notwithstanding the terms contained in Section 2.3 (a), if the
+Licensed Software includes proprietary software of MindTree in source code
+format, Licensee may make modifications and create derivative works only to the
 extent necessary for debugging of the Licensed Software.
 
-MPEG LA
-
-Use of MPEG LA audio or video codec technology is limited to evaluation
-and demonstration only. Permitted distributions must be similarly limited.
-Further rights must be obtained directly from MPEG LA.
-
-MQX RTOS Code
-
-MQX RTOS source code may not be re-distributed by any FSL Licensee under any
-circumstance, even by a signed written amendment to this Agreement.
-
-Opus
-
-Use of Opus software must be consistent with the terms of the Opus license
-which can be found at: {http://www.opus-codec.org/license/}
-
-Real Networks - its GStreamer Optimized Real Format Client Code implementation
-or OpenMax Optimized Real Format Client Code
-
-Use of the GStreamer Optimized Real Format Client Code, or OpenMax Optimized
-Real Format Client code is restricted to applications in the automotive market.
-Licensee must be a final manufacturer in good standing with a current license
-with Real Networks for the commercial use and distribution of products
-containing the GStreamer Optimized Real Format Client Code implementation or
-OpenMax Optimized Real Format Client Code
-
-SanDisk Corporation
-
-If the Licensed Software includes software developed by SanDisk Corporation
-("SanDisk"), you must separately obtain the rights to reproduce and distribute
-this software in source code form from SanDisk.  Please follow these easy steps
-to obtain the license and software:
-
-1.       Contact your local SanDisk sales representative to obtain the SanDisk
+MM SOLUTIONS AD:  Use of MM SOLUTIONS AEC (Auto Exposure Control) and AWB (Auto
+White Balance) software is limited to demonstration, testing, and evaluation
+only.  In no event may Licensee distribute or sublicense the MM SOLUTIONS
+software. Further rights must be obtained directly from MM SOLUTIONS.
+
+MPEG LA: Use of MPEG LA audio or video codec technology is limited to
+evaluation and demonstration only. Permitted distributions must be similarly
+limited. Further rights must be obtained directly from MPEG LA.
+
+MQX RTOS Code: MQX RTOS source code may not be re-distributed by any NXP
+Licensee under any circumstance, even by a signed written amendment to this
+Agreement.
+
+NXP Voice Software: VoiceSpot, VoiceSeeker (including AEC), and Conversa may be
+used for evaluation or demonstration purposes only. Any commercial distribution
+rights are subject to a separate royalty agreement obtained from NXP.
+
+NXP Wireless Charging Library: License to the Software is limited to use in
+inductive coupling or wireless charging applications
+
+Opus: Use of Opus software must be consistent with the terms of the Opus
+license which can be found at: http://www.opus-codec.org/license/
+
+Oracle JRE (Java): The Oracle JRE must be used consistent with terms found
+here: http://java.com/license
+
+P&E Micro: P&E Software must be used consistent with the terms found here:
+http://www.pemicro.com/licenses/gdbserver/license_gdb.pdf
+
+Pro Design Electronic: Licensee may not modify, create derivative works based
+on, or copy the Pro Design software, documentation, hardware execution key or
+the accompanying materials.  Licensee shall not use Pro Design's or any of its
+licensors names, logos or trademarks to market the Authorized System.  Only NXP
+customers and distributors are permitted to further redistribute the Pro Design
+software and only as part of an Authorized System which contains the Pro Design
+software.
+
+Qualcomm Atheros, Inc.: Notwithstanding anything in this Agreement, Qualcomm
+Atheros, Inc. Wi-Fi software must be used strictly in accordance with the
+Qualcomm Atheros, Inc. Technology License Agreement that accompanies such
+software.  Any other use is expressly prohibited.
+
+Real Networks - GStreamer Optimized Real Format Client Code implementation or
+OpenMax Optimized Real Format Client Code: Use of the GStreamer Optimized Real
+Format Client Code, or OpenMax Optimized Real Format Client code is restricted
+to applications in the automotive market.  Licensee must be a final
+manufacturer in good standing with a current license with Real Networks for the
+commercial use and distribution of products containing the GStreamer Optimized
+Real Format Client Code implementation or OpenMax Optimized Real Format Client
+Code
+
+RivieraWaves SAS (a member of the CEVA, Inc. family of companies): You may not
+use the RivieraWaves intellectual property licensed under this Agreement if you
+develop, market, and/or license products similar to such RivieraWaves
+intellectual property.  Such use constitutes a breach of this Agreement.  Any
+such use rights must be obtained directly from RivieraWaves.
+
+SanDisk Corporation: If the Licensed Software includes software developed by
+SanDisk Corporation ("SanDisk"), you must separately obtain the rights to
+reproduce and distribute this software in source code form from SanDisk.
+Please follow these easy steps to obtain the license and software:
+(1) Contact your local SanDisk sales representative to obtain the SanDisk
 License Agreement.
-
-2.       Sign the license agreement.  Fax the signed agreement to SanDisk USA
+(2) Sign the license agreement.  Fax the signed agreement to SanDisk USA
 marketing department at 408-542-0403.  The license will be valid when fully
 executed by SanDisk.
-
-3.       If you have specific questions, please send an email to
-sales@sandisk.com
-
+(3) If you have specific questions, please send an email to sales@sandisk.com
 You may only use the SanDisk Corporation Licensed Software on products
 compatible with a SanDisk Secure Digital Card.  You may not use the SanDisk
 Corporation Licensed Software on any memory device product.  SanDisk retains
 all rights to any modifications or derivative works to the SanDisk Corporation
 Licensed Software that you may create.
 
-Texas Instruments
-
-Your use of Texas Instruments Inc. WiLink8 Licensed Software is restricted to
-NXP SoC based systems that include a compatible connectivity device
-manufactured by TI.
-
-Vivante
-
-Distribution of Vivante software must be a part of, or embedded within,
-Authorized Systems that include a Vivante Graphics Processing Unit.
-
-
-Synopsys/Target Compiler Technologies
-
-
-Your use of the Synopsys/Target Compiler Technologies Licensed Software
-and related documentation is subject to the following:
-
--             Duration of the license for the Licensed Software is limited to
-12 months, unless otherwise specified in the license file.
-
--             The Licensed Software is usable by one user at a time on a single
- designated computer, unless otherwise agreed by Synopsys.
-
--             Licensed Software and documentation are to be used only on a
-designated computer at the designated physical address provided by you on the
-APEX license form.
+SEGGER Microcontroller - emWin Software: Your use of SEGGER emWin software and
+components is restricted for development of NXP ARM7, ARM9, Cortex-M0,
+Cortex-M3, Cortex-M4, Cortex-M33, Cortex-M7, and Cortex-A7 based products only.
+
+SEGGER Microcontroller - J-Link/J-Trace Software: Segger software must be used
+consistent with the terms found here: http://www.segger.com/jlink-software.html
+
+Synopsys/BLE Software: Your use of the Synopsys/BLE Software and related
+documentation is subject to the following:
+(1) Synopsys is third-party beneficiaries of, and thus may enforce against you,
+the license restrictions and confidentiality obligations in this agreement with
+respect to their intellectual property and proprietary information.
+(2) Your distribution of the Licensed Software shall subject any recipient to a
+written agreement at least as protective of the Licensed Software as provided
+in this Agreement.
+
+Synopsys/Target Compiler Technologies: Your use of the Synopsys/Target Compiler
+Technologies Licensed Software and related documentation is subject to the
+following:
+(1) Duration of the license for the Licensed Software is limited to 12 months,
+unless otherwise specified in the license file.
+(2) The Licensed Software is usable by one user at a time on a single
+designated computer, unless otherwise agreed by Synopsys.
+(3) Licensed Software and documentation are to be used only on a designated
+computer at the designated physical address provided by you on the APEX license
+form.
+(4) The Licensed Software is not sub-licensable.
+
+T2 Labs / T2 Software:  As a condition to the grant of any license under this
+Agreement, you represent and warrant that you will comply with all licenses,
+agreements, rules and bylaws of the Bluetooth SIG (Special Interest Group )
+applicable to the licensed software and documentation and its use which may
+affect when and if you may take certain actions under licenses granted
+hereunder.
+
+The license grant under this Agreement is conditional to you being (i) a
+Bluetooth SIG Associate member until such time as the specifications for the
+software are made public to Bluetooth SIG members of any level and (ii)
+thereafter a Bluetooth SIG member of any level.
+
+Notwithstanding the terms contained in Section 2.3 (a), if the licensed
+software includes proprietary software in source code format, you may make
+modifications and create derivative works only to the extent necessary for
+improving the performance of the source code with the NXP products or your
+products and for creating enhancements of such products. You may not further
+sublicense or otherwise distribute the source code, or any modifications or
+derivatives thereof as stand-alone products.  You will be responsible for
+qualifying any modifications or derivatives with the Bluetooth SIG and any
+other qualifying bodies.
+TARA Systems: Use of TARA Systems GUI technology Embedded Wizard is limited to
+evaluation and demonstration only. Permitted distributions must be similarly
+limited. Further rights must be obtained directly from TARA Systems.
+
+Texas Instruments: Your use of Texas Instruments Inc. WiLink8 Licensed Software
+is restricted to NXP SoC based systems that include a compatible connectivity
+device manufactured by TI.
+
+TES Electronic Solutions Germany (TES):  TES 3D Surround View software and
+associated data and documentation may only be used for evaluation purposes and
+for demonstration to third parties in integrated form on a board package
+containing an NXP S32V234 device. Licensee may not distribute or sublicense the
+TES software. Your license to the TES software may be terminated at any time
+upon notice.
+
+Vivante: Distribution of Vivante software must be a part of, or embedded
+within, Authorized Systems that include a Vivante Graphics Processing Unit.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 8a732b3148f9..79ef6e3aa5fd 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 42bb2012ff9d..892a12fd355d 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 6d59ca5f479a..1fa13a9d09da 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -32,6 +32,6 @@ DIST exim-pdf-4.97.tar.xz 2136852 BLAKE2B df188e658e9e86d1b651d12b29e8a440677d75
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.94.2-r7.ebuild 14776 BLAKE2B a0fb91597d669703f7c97874ff0989c90f6989d836bb12c2a24be64efecde184149374a7319495117d94a0fa75d6d94b612a63306dff3d17fb7f717ab97d5d6f SHA512 c9ff4091c66c7b3d60e17f95a542bc870edae5111e2690fae9f507081a6f9903a7dc587e9705c6adbad01fc9badad69f58ba8c24add3fc01a1e223387ebd6078
 EBUILD exim-4.96-r4.ebuild 16589 BLAKE2B dd4a8fafb95891d3a4ec779360cc0603b27d365a3bceed9ec977371c30b953f7fec8d3e132dda1d4da9611374082447d233cdbadc3e6f8cf01576465e459262f SHA512 64eda6530c502540669fc7934db59e16939cf44c90974a84d5c7fa5e5e1bc61b1b10d69c4d07351fc4f3966c3473fa8813e5c35feaa48999eb183ad26e4a0f0c
-EBUILD exim-4.96.2.ebuild 16604 BLAKE2B 8e8efd3227a3770fc448254fcc83e4f4ce72d6673ba75aeef1cda1babd6aa1a6d6593c1c450b71a4dcae87cf3fa9ee9a3519300cee12fbfb957dafd97c9c875c SHA512 b3b206dd406c63b9ab2113f6493d5f223659c98781f7b8e3f15e9bfebf036c0720bb0e2fcc0836f37c498cd5f4a79dd13bb0faa41f2638dba6284a172701a3c3
+EBUILD exim-4.96.2.ebuild 16603 BLAKE2B d9e0edd30a0c495a57e9a632a86afaa0740876a1f62dcc5b2d16a0fbf3707c542e9129919f35f5bc94c69a1c4f3981eee0dc26152455d66fbf78f51d2f57f664 SHA512 fe07f547e1cc06c93b0b727e68f920789018a3890f54e76cc21a92abd8a5fee9991be5086dca7c4bfb70fdb8549f14f47504951d9964a8bb3d3eda2041791abe
 EBUILD exim-4.97-r1.ebuild 15359 BLAKE2B d1e7b0c9a8d387a1e5564a05c1d72a4acdbe5b836f867cb98c9cde8cf24ac89cb9c2ccbb11b46a307486f8c724d929092aaa7649a31dc2cc711ee4069539dfdf SHA512 efce57763ea6b6aee956d7a975417943088f8a3fa0213094ee8a49a5782ade81bded74f57cb26b42e245f1106c33d05f404d9ce6e5e483065d02e268189f3eb0
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/exim-4.96.2.ebuild b/mail-mta/exim/exim-4.96.2.ebuild
index 54ec7974c088..27cf43584c3e 100644
--- a/mail-mta/exim/exim-4.96.2.ebuild
+++ b/mail-mta/exim/exim-4.96.2.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	dev-libs/libpcre2:=
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4e15283ce1b9..6476169e6907 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 334ffe6562aa..e4423a6a09b3 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,4 @@
 AUX libraw-0.21.1-CVE-2023-1729.patch 810 BLAKE2B 23388d0f1fe99d6d7641a6d871da5165118260107d70dd34dee691704f626e6bd12f9763b4076d0f790f21fccb590d95bdaa26329edb864ac0338b9535c23572 SHA512 c0e77285f9de35bd5511b1f07317facb63393135e5615fc6b44ad9b396d4486b7e95cbee5acef8ba82afd296d95d17fd10ead47686d07919a625b301f72de040
 DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d
 EBUILD libraw-0.21.1-r1.ebuild 1597 BLAKE2B 30e6b8e702c7751c2a54880ec90e0cb7cab5014fcba888de55e8aab82828679e51da97d57c6c23c2ae6d2bcf21f27c93d947878470e4d9b98119e4307ab3979b SHA512 d3a574a1dfd8da0aaea3546e65a026e046727869cd50ee90c840d409c13da64d25b2c63abbf3a0db0b942d79977c896b75e9c866a6f840eef1046956abf88934
-EBUILD libraw-0.21.1.ebuild 1545 BLAKE2B 6c064249c7ae9c3e1dd1119de71d463313b9a43c333167a373aec29a4434aed6e6b96345a79d0dad09017754b72234e30eda17c69854c0caaa6225a68ba82491 SHA512 4737b259683ca8557f5fa3ae58d10c3025dc63774bb8fb4a184012acc94a96267ebef5536dab3c6a6635d6580cb71c1f8758936c2954162d8d9a9b9ccdc3981c
 MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda
diff --git a/media-libs/libraw/libraw-0.21.1.ebuild b/media-libs/libraw/libraw-0.21.1.ebuild
deleted file mode 100644
index 27e5a64aa7cc..000000000000
--- a/media-libs/libraw/libraw-0.21.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-# SONAME isn't exactly the same as PV but it does correspond and
-# libraw has unstable ABI across releases.
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg +lcms openmp zlib"
-
-RDEPEND="
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README.md )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-jasper
-		$(multilib_native_use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable openmp)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 57421469ff7e..d1d184b40dec 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index a7b540f11d71..009cdb51732a 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,6 +2,6 @@ DIST abcMIDI-2023.09.13.zip 624566 BLAKE2B 6d2fd54562022230766ff067d38bf96e06c60
 DIST abcMIDI-2023.10.25.zip 624710 BLAKE2B 46ff87d73c9fb026e5c9d20864c0c3e0b48b8cea67ec7172cc8fa6fddb8d1c473ecfcccf96a566f9dead987f5e26c4e0d6d9beb2b57477c6e8c183bc5e23fe7e SHA512 99a1ae74840efd1c5fc1dbb48e5e3930b00f6c4867c2e2f007afabab2db55c708b5b13a3c0b33a991f96508bc219828bc42f95867020bbb66f524285761445be
 DIST abcMIDI-2023.11.17.zip 625619 BLAKE2B f52b36afd7f69b1ae5412b6cffbb56821942772fa4e37b5093c3df456c5c1caf847274db3dca8ca60e20bf2db66352d64a0bfa00e272593074150c07706e8b0b SHA512 6466427d3471fdd645dae616fd65397405bd49f4cae7e9540acefaa6d237520864ec0d98e7e5564dc020eac5347bcd8a0cd4aa793c21d9855f93f9240f4b6515
 EBUILD abcmidi-2023.09.13.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
-EBUILD abcmidi-2023.10.25.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
+EBUILD abcmidi-2023.10.25.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
 EBUILD abcmidi-2023.11.17.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2023.10.25.ebuild b/media-sound/abcmidi/abcmidi-2023.10.25.ebuild
index 636c9619449a..3ca144cfe9f4 100644
--- a/media-sound/abcmidi/abcmidi-2023.10.25.ebuild
+++ b/media-sound/abcmidi/abcmidi-2023.10.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d4c1086b827d..2337d676fcbd 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4ca135130255..2f743d70c873 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Nov 2023 09:40:24 +0000
+Sat, 25 Nov 2023 15:40:20 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 08d54edfe502..6e21a9052693 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 554222 BLAKE2B b8192c6cad8673128665e2bcbb263867375167b8afc7ec64afb228ca9734dad609b4a10892b93d53ecd9a822183ad7710567ea683d170512fc5f59563b03fdd8 SHA512 63c6723626955aea81134aa0309f9b28ef8b6ca57a101b31bec5f87c28cea30cdba4707ba9e12ac8b8de39ad140c58c903503402942317608f0f149c5429a7f4
-TIMESTAMP 2023-11-25T09:40:27Z
+MANIFEST Manifest.files.gz 554858 BLAKE2B 4f19a75565a5054be3c31a4dc88800b57c5bf8c0cce0f797ec11a4fdc90418321f82e646b672ccf214f6e5daf616ea1a3d8115453bb3365e85aee430998c6ff0 SHA512 4f9f54210f84e01496fd22447309d2a8874935b91ae5935863e7352b16bc198b5d50c3422852939c69e9eeb69efd2408cbb531b82c307ec560ecc068a89ef820
+TIMESTAMP 2023-11-25T15:40:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVhwQtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmViFWdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAQwA//YMJDdyE6powEFs/y6EHECnXgvNpCNAFmYBwzIoe5gtpNbkGoJFGUuq8N
-FxRwAFFk0oVcpDjh6mpqdyaUeYa2qIKcY3RyIU6eBc33Zd3fcaF1ZSqz8W2A/HE1
-/YtIUIeUMM3tM76UII2jj8oVJoZjfO+dEoJSIBZLdpQgwQIwcGsnnBNn3v8oQMzF
-g07GAMkrrXyGUasL9vPMJ0nldx6CbkXIMXp3c4gEgMrAlBr10eeatlAX3aEv21Oh
-apEGi62WRixw2XSSGYakTb6N8/gOkg44K4UrqYsgMFAIsECdKfbCUQhgoDqAOs5Q
-APgP8RGcmtMp2ulitGpjW3i3w3SeqpxyMeuLQs5BOCZuISC9VNV6ZcbQmP5qFsXu
-RwIT9LSUFHVsApO1Xd8c/kzy97eWcxPQrn87QVCaxmibZK5kJD5OHsesG547aCBa
-HDPp7b4S4+ij0eOYXEriin3rtIsV/6YKiUEnEk0TiV01cVTQZlfmD6Z0PACFfio5
-8MEVx9vJUtbQFWHqW2C40PpE19B9cOrTAGOe5u0GWRVl8QKyfL/x+oPg5k1kFehD
-dP5xotAQ2nV9umk9AdR3czFv0CnZcH4QxsJuVx+1Z3gb7zj65B2pb91/cUhAIs9b
-add6x5KuWHY2/Ugb00Ng2gEC0GEdpFVXi9ibGlSt3xtBz2OLeGw=
-=voLI
+klCMew//R3cxMZIkxJrbnb9BZgdUn46o9ERpGCQXjGbS0ALKR2bvHijitpGWpZs5
++ku44kC77Dhq7iEzByxSH85Fip4y7IwaZt0aD8T5ZAaN4yZKmxtuT8AmFOrNgq1l
+NWcWpRdveTLcdXUusFB7V3dD/wPECkz6w/Y5yZlhVnn/P2OLnAxVVTbLL0/pRs+8
+uKFmPZMoeqn3lqANHcSPwgGeMDgMg/GZ2INO+79Np6zZ0I0Y9ILDw7mDVBStZvUx
+bdU5Lv7o+//zAwxE3UQYPv+VxixW4byLekD3pwsjdU7DB96HG7AQeXWZhYJ6y4aV
+E2Fehr8wmvA9DJMHgKKMH/bSUFZiJNFc6AnllqRPadY04jzubOj9f8uWpqIhk4dM
+2FKRY7G6eVoOkBwx17f68+XSBdKqyBEYlRPnkNmOUHSFXumqzRCycWNueqPiQKT6
+ncWCcyRHqazQJxa2Tss7JvycBa2DaPua/LYFzWwK9dKd7uy8tDlizrr4CuqllNvW
+RgY48TvOBwqQxlOzgtRD7Mm6gDoHXfjMB1SgkRXUbD8Lh4s16t/zU3BsaswNvJk/
+8sVMWmYX4puqEsxKebnbIO14ERmCzqHUan2p/Dv9duM+FnTGYzBhOYGzzfa64JNk
+P7DVuUt/mN9LUaYhKlRMA43T0W52ayLWurBvJKLVc9/XYCp7eZE=
+=dHze
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 795869fbb09f..619c99eccf25 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202311-11.xml b/metadata/glsa/glsa-202311-11.xml
new file mode 100644
index 000000000000..1946a71030f3
--- /dev/null
+++ b/metadata/glsa/glsa-202311-11.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202311-11">
+    <title>QtWebEngine: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in QtWebEngine, the worst of which could lead to remote code execution.</synopsis>
+    <product type="ebuild">qtwebengine</product>
+    <announced>2023-11-25</announced>
+    <revised count="1">2023-11-25</revised>
+    <bug>866332</bug>
+    <bug>888181</bug>
+    <bug>903544</bug>
+    <bug>904290</bug>
+    <bug>906857</bug>
+    <bug>909778</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-qt/qtwebengine" auto="yes" arch="*">
+            <unaffected range="ge">5.15.10_p20230623</unaffected>
+            <vulnerable range="lt">5.15.10_p20230623</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>QtWebEngine is a library for rendering dynamic web content in Qt5 and Qt6 C++ and QML applications.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in QtWebEngine. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All QtWebEngine users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-qt/qtwebengine-5.15.10_p20230623"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2294">CVE-2022-2294</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3201">CVE-2022-3201</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4174">CVE-2022-4174</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4175">CVE-2022-4175</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4176">CVE-2022-4176</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4177">CVE-2022-4177</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4178">CVE-2022-4178</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4179">CVE-2022-4179</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4180">CVE-2022-4180</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4181">CVE-2022-4181</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4182">CVE-2022-4182</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4183">CVE-2022-4183</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4184">CVE-2022-4184</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4185">CVE-2022-4185</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4186">CVE-2022-4186</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4187">CVE-2022-4187</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4188">CVE-2022-4188</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4189">CVE-2022-4189</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4190">CVE-2022-4190</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4191">CVE-2022-4191</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4192">CVE-2022-4192</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4193">CVE-2022-4193</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4194">CVE-2022-4194</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4195">CVE-2022-4195</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4436">CVE-2022-4436</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4437">CVE-2022-4437</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4438">CVE-2022-4438</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4439">CVE-2022-4439</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4440">CVE-2022-4440</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41115">CVE-2022-41115</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-44688">CVE-2022-44688</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-44708">CVE-2022-44708</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0128">CVE-2023-0128</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0129">CVE-2023-0129</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0130">CVE-2023-0130</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0131">CVE-2023-0131</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0132">CVE-2023-0132</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0133">CVE-2023-0133</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0134">CVE-2023-0134</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0135">CVE-2023-0135</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0136">CVE-2023-0136</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0137">CVE-2023-0137</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0138">CVE-2023-0138</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0139">CVE-2023-0139</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0140">CVE-2023-0140</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0141">CVE-2023-0141</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2721">CVE-2023-2721</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2722">CVE-2023-2722</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2723">CVE-2023-2723</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2724">CVE-2023-2724</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2725">CVE-2023-2725</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2726">CVE-2023-2726</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2929">CVE-2023-2929</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2930">CVE-2023-2930</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2931">CVE-2023-2931</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2932">CVE-2023-2932</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2933">CVE-2023-2933</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2934">CVE-2023-2934</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2935">CVE-2023-2935</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2936">CVE-2023-2936</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2937">CVE-2023-2937</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2938">CVE-2023-2938</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2939">CVE-2023-2939</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2940">CVE-2023-2940</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-2941">CVE-2023-2941</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-3079">CVE-2023-3079</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-3214">CVE-2023-3214</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-3215">CVE-2023-3215</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-3216">CVE-2023-3216</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-3217">CVE-2023-3217</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4068">CVE-2023-4068</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4069">CVE-2023-4069</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4070">CVE-2023-4070</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4071">CVE-2023-4071</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4072">CVE-2023-4072</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4073">CVE-2023-4073</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4074">CVE-2023-4074</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4075">CVE-2023-4075</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4076">CVE-2023-4076</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4077">CVE-2023-4077</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4078">CVE-2023-4078</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4761">CVE-2023-4761</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4762">CVE-2023-4762</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4763">CVE-2023-4763</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4764">CVE-2023-4764</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5218">CVE-2023-5218</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5473">CVE-2023-5473</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5474">CVE-2023-5474</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5475">CVE-2023-5475</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5476">CVE-2023-5476</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5477">CVE-2023-5477</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5478">CVE-2023-5478</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5479">CVE-2023-5479</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5480">CVE-2023-5480</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5481">CVE-2023-5481</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5482">CVE-2023-5482</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5483">CVE-2023-5483</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5484">CVE-2023-5484</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5485">CVE-2023-5485</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5486">CVE-2023-5486</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5487">CVE-2023-5487</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5849">CVE-2023-5849</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5850">CVE-2023-5850</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5851">CVE-2023-5851</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5852">CVE-2023-5852</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5853">CVE-2023-5853</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5854">CVE-2023-5854</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5855">CVE-2023-5855</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5856">CVE-2023-5856</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5857">CVE-2023-5857</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5858">CVE-2023-5858</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5859">CVE-2023-5859</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5996">CVE-2023-5996</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5997">CVE-2023-5997</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-6112">CVE-2023-6112</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-21775">CVE-2023-21775</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-21796">CVE-2023-21796</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-11-25T09:50:35.910767Z">graaff</metadata>
+    <metadata tag="submitter" timestamp="2023-11-25T09:50:35.912934Z">graaff</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202311-12.xml b/metadata/glsa/glsa-202311-12.xml
new file mode 100644
index 000000000000..10b6be50a66a
--- /dev/null
+++ b/metadata/glsa/glsa-202311-12.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202311-12">
+    <title>MiniDLNA: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in MiniDLNA, the worst of which could lead to remove code execution.</synopsis>
+    <product type="ebuild">minidlna</product>
+    <announced>2023-11-25</announced>
+    <revised count="1">2023-11-25</revised>
+    <bug>834642</bug>
+    <bug>907926</bug>
+    <access>remote</access>
+    <affected>
+        <package name="net-misc/minidlna" auto="yes" arch="*">
+            <unaffected range="ge">1.3.3</unaffected>
+            <vulnerable range="lt">1.3.3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>MiniDLNA is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in MiniDLNA. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All MiniDLNA users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=net-misc/minidlna-1.3.3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26505">CVE-2022-26505</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-33476">CVE-2023-33476</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-11-25T10:21:19.244361Z">graaff</metadata>
+    <metadata tag="submitter" timestamp="2023-11-25T10:21:19.246643Z">graaff</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202311-13.xml b/metadata/glsa/glsa-202311-13.xml
new file mode 100644
index 000000000000..710e5d8071fb
--- /dev/null
+++ b/metadata/glsa/glsa-202311-13.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202311-13">
+    <title>Apptainer: Privilege Escalation</title>
+    <synopsis>A privilege escalation vulnerability has been discoverd in Apptainer.</synopsis>
+    <product type="ebuild">apptainer</product>
+    <announced>2023-11-25</announced>
+    <revised count="1">2023-11-25</revised>
+    <bug>905091</bug>
+    <access>local</access>
+    <affected>
+        <package name="app-containers/apptainer" auto="yes" arch="*">
+            <unaffected range="ge">1.1.8</unaffected>
+            <vulnerable range="lt">1.1.8</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Apptainer is the container system for secure high-performance computing.</p>
+    </background>
+    <description>
+        <p>A vulnerability has been discovered in Apptainer. Please review the CVE identifier referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>There is an ext4 use-after-free flaw that is exploitable in vulnerable versions.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Apptainer users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=app-containers/apptainer-1.1.8"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-30549">CVE-2023-30549</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-11-25T10:47:30.694976Z">graaff</metadata>
+    <metadata tag="submitter" timestamp="2023-11-25T10:47:30.697686Z">graaff</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202311-14.xml b/metadata/glsa/glsa-202311-14.xml
new file mode 100644
index 000000000000..8ae2ab551c6b
--- /dev/null
+++ b/metadata/glsa/glsa-202311-14.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202311-14">
+    <title>GRUB: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discoverd in GRUB, which may lead to secure boot circumvention or code execution.</synopsis>
+    <product type="ebuild">grub</product>
+    <announced>2023-11-25</announced>
+    <revised count="1">2023-11-25</revised>
+    <bug>881413</bug>
+    <bug>915187</bug>
+    <access>remote</access>
+    <affected>
+        <package name="sys-boot/grub" auto="yes" arch="*">
+            <unaffected range="ge">2.06-r9</unaffected>
+            <vulnerable range="lt">2.06-r9</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>GNU GRUB is a multiboot boot loader used by most Linux systems.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in GRUB. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All GRUB users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=sys-boot/grub-2.06-r9"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2601">CVE-2022-2601</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3775">CVE-2022-3775</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4692">CVE-2023-4692</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-4693">CVE-2023-4693</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-11-25T11:18:39.731078Z">graaff</metadata>
+    <metadata tag="submitter" timestamp="2023-11-25T11:18:39.734177Z">graaff</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4ca135130255..2f743d70c873 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Nov 2023 09:40:24 +0000
+Sat, 25 Nov 2023 15:40:20 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 65ba52468ad7..2d801c2ae516 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-335f69a9cbc971132afe551e722b25032997f1b5 1700905015 2023-11-25T09:36:55+00:00
+4c466f4d082dba9c6c82b370699194bb99c93843 1700911157 2023-11-25T11:19:17+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6a4c15b17826..f6a8d8609554 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 7eb9a96fdd5d..9e713e8452e1 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.29.78 b/metadata/md5-cache/app-admin/awscli-1.29.78
deleted file mode 100644
index 212740980f24..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.29.78
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[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/botocore-1.31.78[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.7.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(-)?] ) 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 multiprocessing
-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.31.78[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.7.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.29.78.tar.gz -> aws-cli-1.29.78.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a9ac7982c54d9f2233b962596f9977e1
diff --git a/metadata/md5-cache/app-admin/awscli-1.29.84 b/metadata/md5-cache/app-admin/awscli-1.29.84
index b23d7b1ebb6c..39fb6af9fcea 100644
--- a/metadata/md5-cache/app-admin/awscli-1.29.84
+++ b/metadata/md5-cache/app-admin/awscli-1.29.84
@@ -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.31.84[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.7.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.29.84.tar.gz -> aws-cli-1.29.84.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
+_md5_=0b5152a8ba8f038e9312c64c19f4992c
diff --git a/metadata/md5-cache/app-admin/awscli-1.29.85 b/metadata/md5-cache/app-admin/awscli-1.29.85
deleted file mode 100644
index 5bbab35215b5..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.29.85
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.31.85[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.7.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.31.85[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.7.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.29.85.tar.gz -> aws-cli-1.29.85.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/awscli-1.30.0 b/metadata/md5-cache/app-admin/awscli-1.30.0
deleted file mode 100644
index 09963f127d69..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.30.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.32.0[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.7.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.32.0[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.7.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.30.0.tar.gz -> aws-cli-1.30.0.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/awscli-1.30.1 b/metadata/md5-cache/app-admin/awscli-1.30.1
deleted file mode 100644
index 0247521b6108..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.30.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.32.1[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.7.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.32.1[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.7.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.30.1.tar.gz -> aws-cli-1.30.1.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/awscli-1.30.2 b/metadata/md5-cache/app-admin/awscli-1.30.2
deleted file mode 100644
index 0c63110e8977..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.30.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.32.2[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.7.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.32.2[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.7.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.30.2.tar.gz -> aws-cli-1.30.2.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/awscli-1.30.4 b/metadata/md5-cache/app-admin/awscli-1.30.4
deleted file mode 100644
index 3d67ecbaf1d3..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.30.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.32.4[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.7.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.32.4[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.7.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.30.4.tar.gz -> aws-cli-1.30.4.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/awscli-1.30.5 b/metadata/md5-cache/app-admin/awscli-1.30.5
deleted file mode 100644
index ea290d16c7ca..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.30.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.32.5[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.7.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.32.5[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.7.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.30.5.tar.gz -> aws-cli-1.30.5.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab759e1086e9bcfcf0b22f142125d63
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2308.0 b/metadata/md5-cache/app-admin/rsyslog-8.2308.0
index 6392242ae41e..24395116f908 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2308.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2308.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rsyslog.com/
 INHERIT=autotools linux-info python-any-r1 systemd
 IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads(+)] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
 REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2308.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2308.0.tar.gz )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f41bb08d7a7d7cb87e5b4e949b3bcc91
+_md5_=806952e6b2c2b57f36c0d6a73dc5cb26
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a54a11d05fc0..08a43d0601fb 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-29.1-r5 b/metadata/md5-cache/app-editors/emacs-29.1-r5
index 09652a56d4d9..b827d720c95f 100644
--- a/metadata/md5-cache/app-editors/emacs-29.1-r5
+++ b/metadata/md5-cache/app-editors/emacs-29.1-r5
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux small-ja-dic sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29
 SRC_URI=mirror://gnu/emacs/emacs-29.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-29.1-patches-5.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=b0710e5512961c7e0840dc01623da785
+_md5_=9ef1e8372ecba63fc817501f4ddb6235
diff --git a/metadata/md5-cache/app-editors/emacs-29.1-r6 b/metadata/md5-cache/app-editors/emacs-29.1-r6
new file mode 100644
index 000000000000..f286a5d9fc06
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-29.1-r6
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux small-ja-dic sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=29
+SRC_URI=mirror://gnu/emacs/emacs-29.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-29.1-patches-6.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=d219c6009e2a5590c6de03869601f2c4
diff --git a/metadata/md5-cache/app-editors/emacs-29.1.90 b/metadata/md5-cache/app-editors/emacs-29.1.90
index 7dc89718750e..7afa789bcf7f 100644
--- a/metadata/md5-cache/app-editors/emacs-29.1.90
+++ b/metadata/md5-cache/app-editors/emacs-29.1.90
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=29-vcs
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-29.1.90.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=8c5f63f5aab8669513bd53fb966a87a0
+_md5_=996021eb78881002dddd6ae9b33db88c
diff --git a/metadata/md5-cache/app-editors/emacs-29.1.9999 b/metadata/md5-cache/app-editors/emacs-29.1.9999
index 9ad1fcec194a..cf2ebc5a6d56 100644
--- a/metadata/md5-cache/app-editors/emacs-29.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-29.1.9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29-vcs
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=8c5f63f5aab8669513bd53fb966a87a0
+_md5_=996021eb78881002dddd6ae9b33db88c
diff --git a/metadata/md5-cache/app-editors/emacs-30.0.9999 b/metadata/md5-cache/app-editors/emacs-30.0.9999
index 6691dcc35cd6..7c1016a91b5c 100644
--- a/metadata/md5-cache/app-editors/emacs-30.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-30.0.9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=30-vcs
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=d85e8576f2ae6c73490c8747982069ad
+_md5_=642f1cb368817d4c338f4e64f3bf1ae3
diff --git a/metadata/md5-cache/app-editors/featherpad-1.4.1 b/metadata/md5-cache/app-editors/featherpad-1.4.1
index 8ff76c2b6bb3..2b935c987af2 100644
--- a/metadata/md5-cache/app-editors/featherpad-1.4.1
+++ b/metadata/md5-cache/app-editors/featherpad-1.4.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/tsujan/FeatherPad
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=qt6 +X
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=app-text/hunspell:= !qt6? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) qt6? ( dev-qt/qtbase:6[cups,dbus,gui,widgets] dev-qt/qtsvg:6 ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.4.1.tar.gz -> featherpad-1.4.1.tar.gz
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=552c27a77de551a8985b9cc8530a5d2a
+_md5_=84c296de3b1d55a94cda1fb484f0a1f1
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index d272391f403d..0cfba5a674c4 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/regex-markup-0.10.0-r2 b/metadata/md5-cache/app-misc/regex-markup-0.10.0-r2
index 0837ece0caa0..38e214114dc4 100644
--- a/metadata/md5-cache/app-misc/regex-markup-0.10.0-r2
+++ b/metadata/md5-cache/app-misc/regex-markup-0.10.0-r2
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://www.nongnu.org/regex-markup/
 INHERIT=flag-o-matic autotools
 IUSE=examples nls
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/regex-markup/regex-markup-0.10.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e79bffda2ff0b24742e1de8b3f58c6af
+_md5_=4e4ed9d513dcc5bdd2905b477cf56a34
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 37fa2ed69ee1..914b04759b27 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1 b/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
index c4ed69c5518d..d846800ba73a 100644
--- a/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
+++ b/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/xtensor-stack/xsimd
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xtensor-stack/xsimd/archive/refs/tags/11.1.0.tar.gz -> xsimd-11.1.0.tar.gz
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=88fbde8c838c0f5625dfdb726938bae3
+_md5_=59284234d5f58a07825ead8ae6e99bf4
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index bd96086dbd15..f7e8365ac733 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/go-1.20.10 b/metadata/md5-cache/dev-lang/go-1.20.10
index a3ab7f1e87db..13c04419bc56 100644
--- a/metadata/md5-cache/dev-lang/go-1.20.10
+++ b/metadata/md5-cache/dev-lang/go-1.20.10
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.20.10
 SRC_URI=https://storage.googleapis.com/golang/go1.20.10.src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0324a3bdf14623c0be1a06275b9ce447
+_md5_=4e7d4bb9f44b755bfd8ca1e4601ad3c4
diff --git a/metadata/md5-cache/dev-lang/go-1.21.3 b/metadata/md5-cache/dev-lang/go-1.21.3
index 611549079f3c..ef5e10a9f59f 100644
--- a/metadata/md5-cache/dev-lang/go-1.21.3
+++ b/metadata/md5-cache/dev-lang/go-1.21.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.21.3
 SRC_URI=https://storage.googleapis.com/golang/go1.21.3.src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=1d442563903a6f73b017823f1c534d31
+_md5_=d04389cdb5fe9ade7281ee5d90e9113d
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_p1 b/metadata/md5-cache/dev-lang/python-3.12.0_p1
index 6e8d4ea2dd5e..f033ebc92f47 100644
--- a/metadata/md5-cache/dev-lang/python-3.12.0_p1
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_p1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-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=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
 RESTRICT=!test? ( test )
 SLOT=3.12
 SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tar.xz.asc )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=ea7e9fb95b40d1739f96b8ec90ae5785
+_md5_=77d4fa286ed60ee0dcca234e799ee58f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2ee58b77c712..70a346bcb078 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-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index d4d72793fb06..3450c4bc7117 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index 59d30cf3f3e4..d86be7d27bd3 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	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 d60734088440..f92f70d1c890 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60cec33a95d6e032d0564390f85e4b74
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.4 b/metadata/md5-cache/dev-libs/libclc-17.0.4
deleted file mode 100644
index e61cb1565ff1..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
-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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ceacfc287a384d3743bea44709d83c62
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.5 b/metadata/md5-cache/dev-libs/libclc-17.0.5
index 1f01e173b49a..be8ac68d6ecc 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.5
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.5
@@ -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-17.0.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ceacfc287a384d3743bea44709d83c62
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
index 4958876f55ea..8a4d6e426fd2 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
@@ -9,5 +9,5 @@ IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dc9bc15e80ab532bfe00e0f981ba4b75
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231104 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231104
deleted file mode 100644
index 9f3685fad423..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231104
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc9bc15e80ab532bfe00e0f981ba4b75
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231111 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231111
deleted file mode 100644
index 33eb0da7ebff..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231111
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc9bc15e80ab532bfe00e0f981ba4b75
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231119 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231119
index fa9ecedeb48f..87d689a1cce1 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231119
+++ b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20231119
@@ -9,5 +9,5 @@ IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dc9bc15e80ab532bfe00e0f981ba4b75
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 648b931a7e1c..13ece376dd45 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 7ef3d1c7392d..f7d3cea9245e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index d1977ea29784..9712d913c485 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
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 818b3a8c346a..879de3210dde 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c02be85fe4a42bdff237e09f6f02b9cb
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.4 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.4
deleted file mode 100644
index f02bab322297..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.4
+++ /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 >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.4[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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-17.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.4[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/17.0.4
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c02be85fe4a42bdff237e09f6f02b9cb
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.5 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.5
index b9274730cf98..f70171057c8a 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.5
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.5
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c02be85fe4a42bdff237e09f6f02b9cb
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0.9999
index 59102e5cf0f3..54c3f591a120 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-18.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/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7b3b171e2ad06da788aa35bf390534a2
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231104 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231104
deleted file mode 100644
index fe28aabfa1d7..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231104
+++ /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 >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/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-18.0.0_pre20231104:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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-18.0.0_pre20231104:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231104[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.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7b3b171e2ad06da788aa35bf390534a2
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231111 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231111
deleted file mode 100644
index 2f450863f974..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231111
+++ /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 >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/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-18.0.0_pre20231111:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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-18.0.0_pre20231111:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231111[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.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7b3b171e2ad06da788aa35bf390534a2
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231119 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231119
index f5caabe4dde0..3f6c3c4943a9 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231119
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7b3b171e2ad06da788aa35bf390534a2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index bbd90d6c26d5..f9f9e31c4f73 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/black-23.11.0 b/metadata/md5-cache/dev-python/black-23.11.0
index 28736953e68d..2a01f078def7 100644
--- a/metadata/md5-cache/dev-python/black-23.11.0
+++ b/metadata/md5-cache/dev-python/black-23.11.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
 INHERIT=distutils-r1 optfeature 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/b/black/black-23.11.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=d0a8c62203da4cc0c965d6d2f435db11
+_md5_=2723d48e3199f36eebf12043764c7544
diff --git a/metadata/md5-cache/dev-python/boto3-1.28.78 b/metadata/md5-cache/dev-python/boto3-1.28.78
deleted file mode 100644
index ec6c3f2ac8be..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.28.78
+++ /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/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.31.78[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.7.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(-)?] ) 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 multiprocessing
-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.31.78[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.7.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.28.78.tar.gz -> boto3-1.28.78.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f73b805af1857727857ef1146ef03fcc
diff --git a/metadata/md5-cache/dev-python/boto3-1.28.84 b/metadata/md5-cache/dev-python/boto3-1.28.84
index ae98be7a7657..b969f9fb04d6 100644
--- a/metadata/md5-cache/dev-python/boto3-1.28.84
+++ b/metadata/md5-cache/dev-python/boto3-1.28.84
@@ -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.31.84[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.7.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.28.84.tar.gz -> boto3-1.28.84.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
+_md5_=39fade9c7efc7c3b4141e64b440b58a0
diff --git a/metadata/md5-cache/dev-python/boto3-1.28.85 b/metadata/md5-cache/dev-python/boto3-1.28.85
deleted file mode 100644
index 497d939b34ad..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.28.85
+++ /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.31.85[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.7.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.31.85[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.7.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.28.85.tar.gz -> boto3-1.28.85.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/boto3-1.29.0 b/metadata/md5-cache/dev-python/boto3-1.29.0
deleted file mode 100644
index ac421a058368..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.29.0
+++ /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.32.0[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.7.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.32.0[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.7.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.29.0.tar.gz -> boto3-1.29.0.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/boto3-1.29.1 b/metadata/md5-cache/dev-python/boto3-1.29.1
deleted file mode 100644
index e818f95bcc5f..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.29.1
+++ /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.32.1[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.7.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.32.1[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.7.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.29.1.tar.gz -> boto3-1.29.1.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/boto3-1.29.2 b/metadata/md5-cache/dev-python/boto3-1.29.2
deleted file mode 100644
index 0b9c5e3f96f0..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.29.2
+++ /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.32.2[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.7.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.32.2[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.7.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.29.2.tar.gz -> boto3-1.29.2.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/boto3-1.29.4 b/metadata/md5-cache/dev-python/boto3-1.29.4
deleted file mode 100644
index af3c2724a722..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.29.4
+++ /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.32.4[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.7.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.32.4[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.7.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.29.4.tar.gz -> boto3-1.29.4.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/boto3-1.29.5 b/metadata/md5-cache/dev-python/boto3-1.29.5
deleted file mode 100644
index 6ff97465c152..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.29.5
+++ /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.32.5[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.7.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.32.5[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.7.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.29.5.tar.gz -> boto3-1.29.5.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=29109e0f8a54a40ef3e7f70c084fffc2
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.78 b/metadata/md5-cache/dev-python/botocore-1.31.78
deleted file mode 100644
index 4a758d2d5b76..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.31.78
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.31.78.tar.gz -> botocore-1.31.78.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=7b5cde89a82be0beea148bb8e425cfb5
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.84 b/metadata/md5-cache/dev-python/botocore-1.31.84
index d8c1a15dec16..7e33df2d7788 100644
--- a/metadata/md5-cache/dev-python/botocore-1.31.84
+++ b/metadata/md5-cache/dev-python/botocore-1.31.84
@@ -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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.31.84.tar.gz -> botocore-1.31.84.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
+_md5_=72380d0f7487d34b6d367db8978aa32e
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.85 b/metadata/md5-cache/dev-python/botocore-1.31.85
deleted file mode 100644
index 7c7cf96c84b6..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.31.85
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.31.85.tar.gz -> botocore-1.31.85.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/botocore-1.32.0 b/metadata/md5-cache/dev-python/botocore-1.32.0
deleted file mode 100644
index ec54ede501b7..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.32.0
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.32.0.tar.gz -> botocore-1.32.0.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/botocore-1.32.1 b/metadata/md5-cache/dev-python/botocore-1.32.1
deleted file mode 100644
index 57aac2ac1efc..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.32.1
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.32.1.tar.gz -> botocore-1.32.1.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/botocore-1.32.2 b/metadata/md5-cache/dev-python/botocore-1.32.2
deleted file mode 100644
index 29fa34939f98..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.32.2
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.32.2.tar.gz -> botocore-1.32.2.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/botocore-1.32.4 b/metadata/md5-cache/dev-python/botocore-1.32.4
deleted file mode 100644
index 40b149fb2144..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.32.4
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.32.4.tar.gz -> botocore-1.32.4.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/botocore-1.32.5 b/metadata/md5-cache/dev-python/botocore-1.32.5
deleted file mode 100644
index f03726f9ed62..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.32.5
+++ /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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.32.5.tar.gz -> botocore-1.32.5.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a21cc439bd4b5460e8edf1b69668fbc0
diff --git a/metadata/md5-cache/dev-python/cachetools-5.3.1 b/metadata/md5-cache/dev-python/cachetools-5.3.1
deleted file mode 100644
index b684c0f2dd74..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-5.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-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/c/cachetools/cachetools-5.3.1.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cd0b64a2fe20d3cbecea9588c5cab959
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index 4fffddd6d5dd..7c7469bd4431 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=df1bc02b22483edeca144370d496a934
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 addee4614fb1..c31386f7c9e7 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	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _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 3acfd2dd45f9..1aa6071cb476 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	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=0efd225bad3b0e3b0055a8bea080c820
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.4 b/metadata/md5-cache/dev-python/clang-python-17.0.4
deleted file mode 100644
index 1bf4ae6665fb..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.4
+++ /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:17 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-17.0.4:* !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-17.0.4:* !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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=a1bb1fc9623920307055d74d32407bb8
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.5 b/metadata/md5-cache/dev-python/clang-python-17.0.5
index 080ea633a03b..d0cad59de925 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.5
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=a1bb1fc9623920307055d74d32407bb8
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-18.0.0.9999
index a8bfadcf0c1f..046ffdd187c6 100644
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-18.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-18.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	5133e393e8717a3a093660f990801dc1	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=c69e86e4bcbff663c8a6885606e21a9d
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231104 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231104
deleted file mode 100644
index 15f8f4b74a13..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231104
+++ /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:18 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-18.0.0_pre20231104:* !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-18.0.0_pre20231104:* !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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=c69e86e4bcbff663c8a6885606e21a9d
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231111 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231111
deleted file mode 100644
index 5a5ea170dea6..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231111
+++ /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:18 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-18.0.0_pre20231111:* !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-18.0.0_pre20231111:* !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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=c69e86e4bcbff663c8a6885606e21a9d
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231119 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231119
index 82fc1b576301..c37f34758d9d 100644
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231119
+++ b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20231119
@@ -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/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=c69e86e4bcbff663c8a6885606e21a9d
diff --git a/metadata/md5-cache/dev-python/cryptography-41.0.5 b/metadata/md5-cache/dev-python/cryptography-41.0.5
index 0bc72e1a7bf3..649998cb33f2 100644
--- a/metadata/md5-cache/dev-python/cryptography-41.0.5
+++ b/metadata/md5-cache/dev-python/cryptography-41.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 INHERIT=cargo distutils-r1 flag-o-matic multiprocessing pypi
 IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT Unicode-DFS-2016
 RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-41.0.5.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/asn1/0.15.2/download -> asn1-0.15.2.crate https://crates.io/api/v1/crates/asn1_derive/0.15.2/download -> asn1_derive-0.15.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.17.2/download -> once_cell-1.17.2.crate https://crates.io/api/v1/crates/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.88/download -> openssl-sys-0.9.88.crate https://crates.io/api/v1/crates/openssl/0.10.54/download -> openssl-0.10.54.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.64/download -> proc-macro2-1.0.64.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.3/download -> pyo3-macros-backend-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.3/download -> pyo3-macros-0.18.3.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/target-lexicon/0.12.7/download -> target-lexicon-0.12.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.9/download -> unicode-ident-1.0.9.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-41.0.5.tar.gz )
 _eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f0b60920a13cda9bf0a99197bc91ce09
+_md5_=80b7e0cbc288679b392aa8d63077c669
diff --git a/metadata/md5-cache/dev-python/ensurepip-pip-23.2.1 b/metadata/md5-cache/dev-python/ensurepip-pip-23.2.1
deleted file mode 100644
index e7241a157b48..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-pip-23.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared pip wheel for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/
-INHERIT=pypi
-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=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-RDEPEND=!<dev-python/ensurepip-wheels-100
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-23.2.1-py3-none-any.whl
-_eclasses_=pypi	2eecb475512bc76e5ea9192a681b9e6b
-_md5_=ba93b29dfa8a86c50f8845ce50412fe1
diff --git a/metadata/md5-cache/dev-python/ensurepip-pip-23.3 b/metadata/md5-cache/dev-python/ensurepip-pip-23.3
deleted file mode 100644
index 7e9748a61963..000000000000
--- a/metadata/md5-cache/dev-python/ensurepip-pip-23.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Shared pip wheel for ensurepip Python module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pip/
-INHERIT=pypi
-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=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
-RDEPEND=!<dev-python/ensurepip-wheels-100
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-23.3-py3-none-any.whl
-_eclasses_=pypi	2eecb475512bc76e5ea9192a681b9e6b
-_md5_=d9af240a7714b946582b2596e142ad9c
diff --git a/metadata/md5-cache/dev-python/executing-2.0.1 b/metadata/md5-cache/dev-python/executing-2.0.1
index 5a9d2b5ce714..f1d30304296a 100644
--- a/metadata/md5-cache/dev-python/executing-2.0.1
+++ b/metadata/md5-cache/dev-python/executing-2.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
 INHERIT=distutils-r1 optfeature
 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos
 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://github.com/alexmojaki/executing/archive/v2.0.1.tar.gz -> executing-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=85ce004902b3001c6ef399a6c0eabff5
+_md5_=dd355da91cca5c2e8e5e7eb7b1cab903
diff --git a/metadata/md5-cache/dev-python/flask-3.0.0 b/metadata/md5-cache/dev-python/flask-3.0.0
index fb9b22650d6b..b7ea48c95bdd 100644
--- a/metadata/md5-cache/dev-python/flask-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
 INHERIT=distutils-r1 pypi
 IUSE=examples doc 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/blinker-1.6.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-8.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/itsdangerous-2.1.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.1.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-3.0.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/f/flask/flask-3.0.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=44b1f42f0ef874aec2c4a0bfb98d97b8
+_md5_=d945c8180b26f109381c4cc5da7350b2
diff --git a/metadata/md5-cache/dev-python/hcloud-1.30.0 b/metadata/md5-cache/dev-python/hcloud-1.30.0
deleted file mode 100644
index 5bd0e811c95b..000000000000
--- a/metadata/md5-cache/dev-python/hcloud-1.30.0
+++ /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/myst-parser[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/myst-parser[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/myst-parser[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/python-dateutil-2.7.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.20[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=Official Hetzner Cloud python library
-EAPI=8
-HOMEPAGE=https://github.com/hetznercloud/hcloud-python/ https://pypi.org/project/hcloud/
-INHERIT=distutils-r1
-IUSE=examples doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.7.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.20[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/hetznercloud/hcloud-python/archive/v1.30.0.tar.gz -> hcloud-python-1.30.0.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=06239ef10f206017e1e57a586ee78070
diff --git a/metadata/md5-cache/dev-python/hcloud-1.31.0 b/metadata/md5-cache/dev-python/hcloud-1.31.0
deleted file mode 100644
index c83142630945..000000000000
--- a/metadata/md5-cache/dev-python/hcloud-1.31.0
+++ /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/myst-parser[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/myst-parser[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/myst-parser[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/python-dateutil-2.7.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.20[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=Official Hetzner Cloud python library
-EAPI=8
-HOMEPAGE=https://github.com/hetznercloud/hcloud-python/ https://pypi.org/project/hcloud/
-INHERIT=distutils-r1
-IUSE=examples doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.7.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.20[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/hetznercloud/hcloud-python/archive/v1.31.0.tar.gz -> hcloud-python-1.31.0.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=818bbdf83e1f86c471b8617b9b5de7e2
diff --git a/metadata/md5-cache/dev-python/immutabledict-4.0.0 b/metadata/md5-cache/dev-python/immutabledict-4.0.0
new file mode 100644
index 000000000000..0f37233470b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/immutabledict-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=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/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An immutable wrapper around dictionaries
+EAPI=8
+HOMEPAGE=https://github.com/corenting/immutabledict/ https://pypi.org/project/immutabledict/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+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://files.pythonhosted.org/packages/source/i/immutabledict/immutabledict-4.0.0.tar.gz
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=f6c75bc93254a1813f93107390ae64db
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.12 b/metadata/md5-cache/dev-python/ini2toml-0.12
deleted file mode 100644
index 8d3212a1db4b..000000000000
--- a/metadata/md5-cache/dev-python/ini2toml-0.12
+++ /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/configupdater[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-fmt-0.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-0.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=Automatically conversion of .ini/.cfg files to TOML equivalents
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
-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=MPL-2.0
-RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-0.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/i/ini2toml/ini2toml-0.12.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=856c863777f2962b4b110cd9131e04bb
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.25.2 b/metadata/md5-cache/dev-python/ipykernel-6.25.2
deleted file mode 100644
index aab9696849c6..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.25.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !elibc_Darwin? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipyparallel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !elibc_Darwin? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.4.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(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1 pypi virtualx
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !elibc_Darwin? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-6.25.2.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=cc4a94eb6f8d771927a507b2b222994e
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.26.0 b/metadata/md5-cache/dev-python/ipykernel-6.26.0
index 4bbe03f1bfe9..f0d08c5ed5db 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.26.0
+++ b/metadata/md5-cache/dev-python/ipykernel-6.26.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/comm-0.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !elibc_Darwin? ( python_targets_python3_10? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) >=dev-python/ipython-7.23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-4.12[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nest-asyncio[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/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 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://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-6.26.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=97298d052edfb0ac04a7b890998692bc
+_md5_=14f1e5848d20b56e29b4c06f4ff6c09c
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.4.0 b/metadata/md5-cache/dev-python/jaraco-envs-2.4.0
deleted file mode 100644
index 832923760ebc..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.4.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(-)?] 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=Classes for orchestrating Python (virtual) environments
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.envs/ https://pypi.org/project/jaraco.envs/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/path[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
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.envs/jaraco.envs-2.4.0.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e4ead2e25139e21cb6f313c3c135dbe6
diff --git a/metadata/md5-cache/dev-python/jsonschema-path-0.3.1 b/metadata/md5-cache/dev-python/jsonschema-path-0.3.1
index 583e61a64c64..63bfb3c94f00 100644
--- a/metadata/md5-cache/dev-python/jsonschema-path-0.3.1
+++ b/metadata/md5-cache/dev-python/jsonschema-path-0.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/jsonschema-path/ https://github.com/p1c2u/jsonschema-path/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm ~arm64 ~loong ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/referencing-0.28.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/p1c2u/jsonschema-path/archive/0.3.1.tar.gz -> jsonschema-path-0.3.1.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0cc91ed60ec6c241dccee837df632042
+_md5_=eaad88c5d636298465a76059b2e18fc6
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.0.6 b/metadata/md5-cache/dev-python/jupyterlab-4.0.6
deleted file mode 100644
index a0d82adc18e4..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-4.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=dev-python/pytest-7.3.1[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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 pypi xdg
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs 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://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.0.6.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=48b99ec8fec62b9ac9bd92a558b19eeb
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.0.7 b/metadata/md5-cache/dev-python/jupyterlab-4.0.7
deleted file mode 100644
index 8e8c25c37b3d..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-4.0.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[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/requests-cache[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs >=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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 pypi xdg
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs 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/j/jupyterlab/jupyterlab-4.0.7.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8cb04296189495e2a394eb16196bf4c6
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.0.8 b/metadata/md5-cache/dev-python/jupyterlab-4.0.8
deleted file mode 100644
index 0939c323ae1f..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-4.0.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[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/requests-cache[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs >=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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 pypi xdg
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs 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/j/jupyterlab/jupyterlab-4.0.8.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8cb04296189495e2a394eb16196bf4c6
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.25.1 b/metadata/md5-cache/dev-python/jupyterlab-server-2.25.1
index d35fe6dabad5..4b9db077ea5b 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.25.1
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.25.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/json5-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.31[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[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/j/jupyterlab-server/jupyterlab_server-2.25.1.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=1adfd3bc3053de1d300b86001ac087fd
+_md5_=a21fccd92b4bf098f175dd85be4a18b1
diff --git a/metadata/md5-cache/dev-python/lark-1.1.7 b/metadata/md5-cache/dev-python/lark-1.1.7
deleted file mode 100644
index 05e74b1d602f..000000000000
--- a/metadata/md5-cache/dev-python/lark-1.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regex[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=Python module to propose a modern general-purpose parsing library for Python
-EAPI=8
-HOMEPAGE=https://github.com/lark-parser/lark/ https://pypi.org/project/lark/
-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 ~arm64-macos ~x64-macos
-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/l/lark/lark-1.1.7.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=72c21acc5b455e2101b690d4f536021e
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index ef6496c4a040..b3f330ea8583 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=67d902868be793a5cb25a3d9aae6cdef
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index 59d5019c1fbd..53e1699d5fcd 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	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _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 f20ad9384c68..6372a0ddf9fd 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	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=11f95045aa3e1646a5cc1703113f36cc
diff --git a/metadata/md5-cache/dev-python/lit-17.0.4 b/metadata/md5-cache/dev-python/lit-17.0.4
deleted file mode 100644
index e9a7b6bcebec..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.4
+++ /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-16 )
-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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=94aea4161cdbf423216421676015b104
diff --git a/metadata/md5-cache/dev-python/lit-17.0.5 b/metadata/md5-cache/dev-python/lit-17.0.5
index a33a200778a3..85ea5c25101b 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.5
+++ b/metadata/md5-cache/dev-python/lit-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=7ba85786e3d4e1dc035f64b3e0e48b77
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0.9999 b/metadata/md5-cache/dev-python/lit-18.0.0.9999
index e11cfba20232..dac58e58d6e6 100644
--- a/metadata/md5-cache/dev-python/lit-18.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-18.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	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=41a907ce7cbe37df2632d55d89b4144a
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231104 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20231104
deleted file mode 100644
index fb74de6f1f86..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231104
+++ /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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e68c756d8408ff2f5ee4a48c8113e096
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231111 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20231111
deleted file mode 100644
index 14079ec79b76..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231111
+++ /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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=41a907ce7cbe37df2632d55d89b4144a
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231119 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20231119
index e7dd30ea6acc..bd8185ed3bde 100644
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20231119
+++ b/metadata/md5-cache/dev-python/lit-18.0.0_pre20231119
@@ -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/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=41a907ce7cbe37df2632d55d89b4144a
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.40.1 b/metadata/md5-cache/dev-python/m2crypto-0.40.1
index d3a9a0e901ba..c1e84e18fa9b 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.40.1
+++ b/metadata/md5-cache/dev-python/m2crypto-0.40.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/m2crypto/m2crypto/ https://pypi.org/project/M2Crypto/
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=test abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT openssl
 RDEPEND=dev-libs/openssl:= python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-0.40.1.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=79be5f44cffcd287696acee0d0a0bc78
+_md5_=936f19c52d8fa5d6983a9c63336c4f63
diff --git a/metadata/md5-cache/dev-python/networkx-3.2.1 b/metadata/md5-cache/dev-python/networkx-3.2.1
index 6128ae00d720..94c337b8caa5 100644
--- a/metadata/md5-cache/dev-python/networkx-3.2.1
+++ b/metadata/md5-cache/dev-python/networkx-3.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx/ https://pypi.org/project/networkx/
 INHERIT=distutils-r1 multiprocessing optfeature pypi virtualx
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/networkx/networkx-3.2.1.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=e7409d945a9e389a7310048f39eb0dda
+_md5_=b9236a075cfb06a04351d7b128c86b07
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.18.2 b/metadata/md5-cache/dev-python/openapi-core-0.18.2
index e64152f7e553..2782a1df28c0 100644
--- a/metadata/md5-cache/dev-python/openapi-core-0.18.2
+++ b/metadata/md5-cache/dev-python/openapi-core-0.18.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-openapi/openapi-core/ https://pypi.org/project/openapi-core/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=<dev-python/asgiref-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/asgiref-3.6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jsonschema-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.17.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jsonschema-spec-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-spec-0.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/parse[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/openapi-schema-validator-0.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/openapi-schema-validator-0.6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/openapi-spec-validator-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/openapi-spec-validator-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/werkzeug[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/o/openapi-core/openapi_core-0.18.2.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=6909104923ffee37e48c261b58b99e9b
+_md5_=e92db22256113388464c291f383af9fe
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.7.1 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.7.1
index 8685cd5aaf7a..a0bf3f53e53a 100644
--- a/metadata/md5-cache/dev-python/openapi-spec-validator-0.7.1
+++ b/metadata/md5-cache/dev-python/openapi-spec-validator-0.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-openapi/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm ~arm64 ~loong ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-4.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-path-0.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/openapi-schema-validator-0.6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/openapi-spec-validator/openapi_spec_validator-0.7.1.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=5f0b62971996bbdaceb172de36958f46
+_md5_=29be0de1114691399b53cd45f3bccae6
diff --git a/metadata/md5-cache/dev-python/pandas-2.1.3 b/metadata/md5-cache/dev-python/pandas-2.1.3
index 769f48bc8fdb..3c05cb3a9d36 100644
--- a/metadata/md5-cache/dev-python/pandas-2.1.3
+++ b/metadata/md5-cache/dev-python/pandas-2.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/ https://pypi.org/project/pandas/
 INHERIT=distutils-r1 multiprocessing optfeature pypi virtualx
 IUSE=full-support minimal test X python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.23.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2020.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tzdata[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !minimal? ( >=dev-python/bottleneck-1.3.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numexpr-2.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) full-support? ( >=dev-python/beautifulsoup4-4.11.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/blosc[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/jinja-3.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/openpyxl-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sqlalchemy-1.4.36[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tables-3.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tabulate-0.8.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xarray-2022.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xlrd-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xlsxwriter-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !hppa? ( python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_10(-)?] ) >=dev-python/scipy-1.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) X? ( || ( >=dev-python/PyQt5-5.15.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/QtPy-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 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://files.pythonhosted.org/packages/source/p/pandas/pandas-2.1.3.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=81a84f2065ba52403115b322d91735c2
+_md5_=71291a03799f95b50907398ef701bb37
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.6.0 b/metadata/md5-cache/dev-python/pikepdf-8.6.0
index 85060e7faccd..61065d1ac529 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.6.0
+++ b/metadata/md5-cache/dev-python/pikepdf-8.6.0
@@ -6,7 +6,7 @@ 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
+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/deprecation[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.6.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=ec43a391db9aa4c176bb6012a061688c
+_md5_=5bfea908648e1b0d0ad38c875c905843
diff --git a/metadata/md5-cache/dev-python/pip-23.2.1 b/metadata/md5-cache/dev-python/pip-23.2.1
deleted file mode 100644
index 693285be2ffd..000000000000
--- a/metadata/md5-cache/dev-python/pip-23.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_11? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) test? ( >=dev-python/setuptools-39.2.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:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] ) >=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=The PyPA recommended tool for installing Python packages
-EAPI=8
-HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test-rust 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 Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2
-RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] )
-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://github.com/pypa/pip/archive/23.2.1.tar.gz -> pip-23.2.1.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=235660a6d5cfd0b43010f9e46bb730b9
diff --git a/metadata/md5-cache/dev-python/pip-23.3 b/metadata/md5-cache/dev-python/pip-23.3
deleted file mode 100644
index 0043215b015b..000000000000
--- a/metadata/md5-cache/dev-python/pip-23.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_11? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) test? ( >=dev-python/setuptools-39.2.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:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] ) >=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=The PyPA recommended tool for installing Python packages
-EAPI=8
-HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test-rust 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 Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2
-RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] )
-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://github.com/pypa/pip/archive/23.3.tar.gz -> pip-23.3.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=131a16804a6f4a8c642f689ad7e36622
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.3.0_p4 b/metadata/md5-cache/dev-python/pyclipper-1.3.0_p4
deleted file mode 100644
index e5de811a2c17..000000000000
--- a/metadata/md5-cache/dev-python/pyclipper-1.3.0_p4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.3.1[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 prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clipper library
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/pyclipper/ https://pypi.org/project/pyclipper/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=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/fonttools/pyclipper/archive/1.3.0.post4.tar.gz -> pyclipper-1.3.0.post4.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=1ff115dc3357d58509dd8258f3b9e617
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.3.0_p5 b/metadata/md5-cache/dev-python/pyclipper-1.3.0_p5
index 06659479e1b0..d2fcedb4d431 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.3.0_p5
+++ b/metadata/md5-cache/dev-python/pyclipper-1.3.0_p5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/pyclipper/ https://pypi.org/project/pyclipper/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.3.0.post5.tar.gz -> pyclipper-1.3.0.post5.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0bbf613225c749eb603835f4040c65d2
+_md5_=0d0970aa2fd71f6c01218dd254735503
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.1 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.1
deleted file mode 100644
index 572efe9d3148..000000000000
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/accessible-pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[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/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
-EAPI=8
-HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme/ https://pypi.org/project/pydata-sphinx-theme/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-with-disclosure
-RDEPEND=dev-python/accessible-pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[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/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[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/pydata/pydata-sphinx-theme/archive/v0.14.1.tar.gz -> pydata-sphinx-theme-0.14.1.gh.tar.gz https://files.pythonhosted.org/packages/py3/p/pydata-sphinx-theme/pydata_sphinx_theme-0.14.1-py3-none-any.whl
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cab801bc0d687f2cd9898ede3a275cde
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.2 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.2
deleted file mode 100644
index 6473fca22c48..000000000000
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.14.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/accessible-pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[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/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
-EAPI=8
-HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme/ https://pypi.org/project/pydata-sphinx-theme/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD-with-disclosure
-RDEPEND=dev-python/accessible-pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[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/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[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/pydata/pydata-sphinx-theme/archive/v0.14.2.tar.gz -> pydata-sphinx-theme-0.14.2.gh.tar.gz https://files.pythonhosted.org/packages/py3/p/pydata-sphinx-theme/pydata_sphinx_theme-0.14.2-py3-none-any.whl
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=717468eb8898ca931224167f186ba9fa
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.8 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.8
deleted file mode 100644
index 9ebf16b62ab2..000000000000
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[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(-)?] ) test? ( ssl? ( dev-python/pyopenssl[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(-)?] ) doc? ( || ( ( dev-lang/python:3.12[ssl(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[ssl(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[ssl(+)] >=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[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] ) >=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=Python FTP server library
-EAPI=8
-HOMEPAGE=https://github.com/giampaolo/pyftpdlib/ https://pypi.org/project/pyftpdlib/
-INHERIT=distutils-r1 pypi
-IUSE=examples ssl test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] )
-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/p/pyftpdlib/pyftpdlib-1.5.8.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f58473e12563e6c3547a9cc73eabd138
diff --git a/metadata/md5-cache/dev-python/pyopencl-2023.1.2 b/metadata/md5-cache/dev-python/pyopencl-2023.1.2
deleted file mode 100644
index 56d49db20514..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2023.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-libs/pocl ) test? ( >=virtual/opencl-2 >=dev-python/mako-0.3.6[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/platformdirs-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytools-2021.2.7[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=>=virtual/opencl-2 opengl? ( media-libs/libglvnd ) 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 wrapper for OpenCL
-EAPI=8
-HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=examples opengl test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 ~ppc64 ~riscv
-LICENSE=GPL-2
-RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[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/platformdirs-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytools-2021.2.7[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? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pyopencl/pyopencl-2023.1.2.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=7d80c4454f37fbd92f3aa4aaa8139ea6
diff --git a/metadata/md5-cache/dev-python/pytest-7.4.3 b/metadata/md5-cache/dev-python/pytest-7.4.3
index e8280e4fd578..15efe3c6cf4b 100644
--- a/metadata/md5-cache/dev-python/pytest-7.4.3
+++ b/metadata/md5-cache/dev-python/pytest-7.4.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest/pytest-7.4.3.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=934283e7c2d83f3d725011fefc58713e
+_md5_=c49d2fe7b3b87508ae38cc7b005e1597
diff --git a/metadata/md5-cache/dev-python/pytest-describe-2.1.0 b/metadata/md5-cache/dev-python/pytest-describe-2.1.0
index d8dbe5b7471f..60d870503443 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-describe-2.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-describe/ https://pypi.org/project/pytest-describe/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=<dev-python/pytest-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-2.6.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/p/pytest-describe/pytest-describe-2.1.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e9d0063fed594e30611afae366e173e7
+_md5_=518e83d01323c368ddfb03e25ef4f2d5
diff --git a/metadata/md5-cache/dev-python/pytest-env-1.0.1 b/metadata/md5-cache/dev-python/pytest-env-1.0.1
deleted file mode 100644
index b5d0b0ef4457..000000000000
--- a/metadata/md5-cache/dev-python/pytest-env-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/pytest[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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin that allows you to add environment variables
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-env/ https://pypi.org/project/pytest-env/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest[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/p/pytest-env/pytest_env-1.0.1.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=072736f3a62cac2284813f133ae2dfb4
diff --git a/metadata/md5-cache/dev-python/pytest-env-1.1.0 b/metadata/md5-cache/dev-python/pytest-env-1.1.0
deleted file mode 100644
index 078543b99e01..000000000000
--- a/metadata/md5-cache/dev-python/pytest-env-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin that allows you to add environment variables
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-env/ https://pypi.org/project/pytest-env/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-7.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-2.0.1[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://files.pythonhosted.org/packages/source/p/pytest-env/pytest_env-1.1.0.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=46aed5eee281acb4b449dca512a7ff97
diff --git a/metadata/md5-cache/dev-python/pythran-0.14.0 b/metadata/md5-cache/dev-python/pythran-0.14.0
index 389b0cf9ebab..c2cc8dfcabd2 100644
--- a/metadata/md5-cache/dev-python/pythran-0.14.0
+++ b/metadata/md5-cache/dev-python/pythran-0.14.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost =dev-python/beniget-0.4*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ply-3.4[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.14.0.tar.gz -> pythran-0.14.0.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f41bd8c681bceac0035c0f39187a382d
+_md5_=87fa46dda7f192bca09f9f292c46bc39
diff --git a/metadata/md5-cache/dev-python/scipy-1.11.3-r1 b/metadata/md5-cache/dev-python/scipy-1.11.3-r1
index c866d0aab6ed..f9dff28bea8b 100644
--- a/metadata/md5-cache/dev-python/scipy-1.11.3-r1
+++ b/metadata/md5-cache/dev-python/scipy-1.11.3-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing pypi
 IUSE=doc +fortran test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.21.6[lapack,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] fortran? ( virtual/fortran ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.0/scipy-html-1.11.0.zip )
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0a02cbc46e56c7fe1b47d9ba848224e6
+_md5_=da9898ea703abff045b5f14a771653ea
diff --git a/metadata/md5-cache/dev-python/scipy-1.11.4 b/metadata/md5-cache/dev-python/scipy-1.11.4
index 320effd2942b..609dc0ebd56f 100644
--- a/metadata/md5-cache/dev-python/scipy-1.11.4
+++ b/metadata/md5-cache/dev-python/scipy-1.11.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing pypi
 IUSE=doc +fortran test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.21.6[lapack,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] fortran? ( virtual/fortran ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/scipy/scipy-1.11.4.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.11.2/scipy-html-1.11.2.zip )
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=904c5ec99e608079f70af58159573232
+_md5_=6cb3ed74fffa68a916a05fb75cac8c3f
diff --git a/metadata/md5-cache/dev-python/selenium-4.14.0 b/metadata/md5-cache/dev-python/selenium-4.14.0
index 142c1b3e3cea..18019d60c119 100644
--- a/metadata/md5-cache/dev-python/selenium-4.14.0
+++ b/metadata/md5-cache/dev-python/selenium-4.14.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.seleniumhq.org/ https://github.com/SeleniumHQ/selenium/tree/trunk/py/ https://pypi.org/project/selenium/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2021.10.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/trio-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trio-0.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/trio-websocket-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trio-websocket-0.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/urllib3-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.26[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/s/selenium/selenium-4.14.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-4.14.0.tar.gz -> selenium-selenium-4.14.0.gh.tar.gz )
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=45d8dca68afb5bec8532c376fb825862
+_md5_=b5517fd535cdc4c1e18f4b3f371b812a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.2 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.2
deleted file mode 100644
index f0648ff91295..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen >=dev-python/testfixtures-6.18.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/sphinx-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-3.0.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.2[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(-)?] ) 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/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extension to link to external Doxygen API documentation
-EAPI=8
-HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-3.0.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.2[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/sphinx-contrib/doxylink/archive/refs/tags/1.12.2.tar.gz -> sphinxcontrib-doxylink-1.12.2.gh.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0dc8836e320c0bc4b3f4445d1abd4137
diff --git a/metadata/md5-cache/dev-python/svg-path-6.3 b/metadata/md5-cache/dev-python/svg-path-6.3
index a03280139d98..9d441933081f 100644
--- a/metadata/md5-cache/dev-python/svg-path-6.3
+++ b/metadata/md5-cache/dev-python/svg-path-6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/regebro/svg.path/ https://pypi.org/project/svg.path/
 INHERIT=distutils-r1
 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=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/regebro/svg.path/archive/6.3.tar.gz -> svg-path-6.3.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=d89282ea6d26a25252ff36e2b3d92287
+_md5_=a149bf747cbcb99470d85b813aedfbd5
diff --git a/metadata/md5-cache/dev-python/time-machine-2.13.0 b/metadata/md5-cache/dev-python/time-machine-2.13.0
index 89c297518dab..f76d413d21b7 100644
--- a/metadata/md5-cache/dev-python/time-machine-2.13.0
+++ b/metadata/md5-cache/dev-python/time-machine-2.13.0
@@ -6,7 +6,7 @@ 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
+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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/adamchainz/time-machine/archive/2.13.0.tar.gz -> time-machine-2.13.0.gh.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=50e730c3d5aa544b9e0003706d011a92
+_md5_=e79b3d75e95064f6f5a4044cd062dabe
diff --git a/metadata/md5-cache/dev-python/traitlets-5.11.2 b/metadata/md5-cache/dev-python/traitlets-5.11.2
deleted file mode 100644
index 57c9dfcb5d14..000000000000
--- a/metadata/md5-cache/dev-python/traitlets-5.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/argcomplete-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/myst-parser[python_targets_python3_12(-)] dev-python/pydata-sphinx-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/pydata-sphinx-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] ) ) ) test? ( >=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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A configuration system for Python applications
-EAPI=8
-HOMEPAGE=https://github.com/ipython/traitlets/ https://pypi.org/project/traitlets/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
-LICENSE=BSD
-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://files.pythonhosted.org/packages/source/t/traitlets/traitlets-5.11.2.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=c2c2b0ddff8bc24c68e0491556260f12
diff --git a/metadata/md5-cache/dev-python/traitlets-5.12.0 b/metadata/md5-cache/dev-python/traitlets-5.12.0
deleted file mode 100644
index 3b00ceaa5c0e..000000000000
--- a/metadata/md5-cache/dev-python/traitlets-5.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/argcomplete-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/myst-parser[python_targets_python3_12(-)] dev-python/pydata-sphinx-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/pydata-sphinx-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] ) ) ) test? ( >=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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A configuration system for Python applications
-EAPI=8
-HOMEPAGE=https://github.com/ipython/traitlets/ https://pypi.org/project/traitlets/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
-LICENSE=BSD
-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://files.pythonhosted.org/packages/source/t/traitlets/traitlets-5.12.0.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=6e9d9cd59ef5b62cdb2ded53015fb435
diff --git a/metadata/md5-cache/dev-python/twisted-23.10.0 b/metadata/md5-cache/dev-python/twisted-23.10.0
index b405c399b2bc..2c3ad1505bab 100644
--- a/metadata/md5-cache/dev-python/twisted-23.10.0
+++ b/metadata/md5-cache/dev-python/twisted-23.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://twisted.org/ https://github.com/twisted/twisted/ https://pypi.org/project/Twisted/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=conch http2 serial ssl test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
 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/automat-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/constantly-15.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hyperlink-17.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/incremental-22.10.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/zope-interface-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/bcrypt-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-3.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) http2? ( <dev-python/h2-5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/priority-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/priority-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ssl? ( >=dev-python/pyopenssl-21.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/service-identity-18.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/idna-2.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 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://files.pythonhosted.org/packages/source/t/twisted/twisted-23.10.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=45e41753583ffdb8bd7d303b4393bdf0
+_md5_=d11cc4ccdd9570da21978e1f9a0c2411
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.24.5 b/metadata/md5-cache/dev-python/virtualenv-20.24.5
deleted file mode 100644
index d3ebbe1c2688..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.24.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[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/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pytest-freezer-0.4.6[python_targets_pypy3(-)?] ) >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8[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(-)?] ) dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.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/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=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.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/v/virtualenv/virtualenv-20.24.5.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=0e30a9d9cadd917d3bc2722ca3d14976
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.24.6 b/metadata/md5-cache/dev-python/virtualenv-20.24.6
deleted file mode 100644
index d9dd329c70e1..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.24.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[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/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pytest-freezer-0.4.6[python_targets_pypy3(-)?] ) >=dev-python/pytest-mock-3.6.1[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/setuptools-67.8[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(-)?] ) dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.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/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=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.9.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/v/virtualenv/virtualenv-20.24.6.tar.gz
-_eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=9c61611ab15e6f81e88c9baad6d5675e
diff --git a/metadata/md5-cache/dev-python/xarray-2023.11.0 b/metadata/md5-cache/dev-python/xarray-2023.11.0
index a9dc905e4cc6..5df7b6810a6c 100644
--- a/metadata/md5-cache/dev-python/xarray-2023.11.0
+++ b/metadata/md5-cache/dev-python/xarray-2023.11.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xarray.pydata.org/ https://github.com/pydata/xarray/ https://pypi.org/project/xarray/
 INHERIT=distutils-r1 pypi
 IUSE=big-endian test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.22[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pandas-1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[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/x/xarray/xarray-2023.11.0.tar.gz
 _eclasses_=distutils-r1	ae136dc2e1c0006e9480d44a6c1886d9	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=53f5803d149c549b037f13c9199badef
+_md5_=1f762d652b65491dd828919db2878aea
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e2c17d3c1728..f4b5c97d8caf 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/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 6199b9780ecc..dc7de33da1b0 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index e04fc5294616..0b6594a65682 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.6 b/metadata/md5-cache/dev-util/lldb-16.0.6
index 0265724ee9a5..1713ad943317 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.6
+++ b/metadata/md5-cache/dev-util/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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d5e6de7c2be060d2de85be06e53b2826
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.6-r1 b/metadata/md5-cache/dev-util/lldb-16.0.6-r1
index 148413e282c1..6b30aae91f31 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.6-r1
+++ b/metadata/md5-cache/dev-util/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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5247b1aac395415f1decd190bab01203
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.4 b/metadata/md5-cache/dev-util/lldb-17.0.4
deleted file mode 100644
index ac3999262a9c..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.4
+++ /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 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/six[python_targets_python3_12(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-17.0.4[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.4[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-17.0.4[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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-17.0.4 ~sys-devel/llvm-17.0.4 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +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=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-17.0.4 ~sys-devel/llvm-17.0.4 python? ( python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/six[python_targets_python3_12(-)] ) 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/17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a4b770665a18df9374e95cbada1c136
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.5 b/metadata/md5-cache/dev-util/lldb-17.0.5
index b069d203f2b6..1f120e944dd4 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.5
+++ b/metadata/md5-cache/dev-util/lldb-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6a4b770665a18df9374e95cbada1c136
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0.9999 b/metadata/md5-cache/dev-util/lldb-18.0.0.9999
index 5e198daa02b9..5306aef3f01c 100644
--- a/metadata/md5-cache/dev-util/lldb-18.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-18.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test !test? ( test )
 SLOT=0/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c2379b2bcf13f3758b68b8c02c2210e9
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231104 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231104
deleted file mode 100644
index ac5def8898d1..000000000000
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231104
+++ /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 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-18.0.0_pre20231104[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.0.0_pre20231104[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.0.0_pre20231104[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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.0.0_pre20231104 ~sys-devel/llvm-18.0.0_pre20231104 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=+debug +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=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.0.0_pre20231104 ~sys-devel/llvm-18.0.0_pre20231104 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.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2379b2bcf13f3758b68b8c02c2210e9
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231111 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231111
deleted file mode 100644
index 2904dbd30df4..000000000000
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231111
+++ /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 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-18.0.0_pre20231111[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.0.0_pre20231111[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.0.0_pre20231111[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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.0.0_pre20231111 ~sys-devel/llvm-18.0.0_pre20231111 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=+debug +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=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.0.0_pre20231111 ~sys-devel/llvm-18.0.0_pre20231111 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.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2379b2bcf13f3758b68b8c02c2210e9
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231119 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231119
index 0e0dc78b5c76..25804eec5882 100644
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231119
+++ b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c2379b2bcf13f3758b68b8c02c2210e9
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index a9c2b3eb9e09..5f4b8f523aa5 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/exim-4.96.2 b/metadata/md5-cache/mail-mta/exim-4.96.2
index 647a8e8e4aaa..a03bf4823bd8 100644
--- a/metadata/md5-cache/mail-mta/exim-4.96.2
+++ b/metadata/md5-cache/mail-mta/exim-4.96.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.exim.org/
 INHERIT=db-use toolchain-funcs pam systemd
 IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre2:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7:= ) elibc_glibc? ( net-libs/libnsl:= nis? ( net-libs/libtirpc:= >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis:= ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) || ( berkdb gdbm tdb )
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.96.2.tar.xz https://dev.gentoo.org/~grobian/distfiles/exim-4.96-gentoo-patches-r0.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.96.2.tar.xz )
 _eclasses_=db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=60357fb773182a3cd61a387081f16bae
+_md5_=0d5e3032ec33850c740efbb84507381c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4d02972093ee..703b8e9dacb5 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/libraw-0.21.1 b/metadata/md5-cache/media-libs/libraw-0.21.1
deleted file mode 100644
index a7b929bccf27..000000000000
--- a/metadata/md5-cache/media-libs/libraw-0.21.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=jpeg? ( 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(-)?] ) lcms? ( >=media-libs/lcms-2.5: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
-EAPI=8
-HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-INHERIT=multilib-minimal toolchain-funcs
-IUSE=examples jpeg +lcms openmp zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=jpeg? ( 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(-)?] ) lcms? ( >=media-libs/lcms-2.5: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/0.21
-SRC_URI=https://www.libraw.org/data/LibRaw-0.21.1.tar.gz
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=42ff0e565f4c9b429e8ffd28aaef9da9
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 72ee726f7e99..9909d63ccbb5 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/abcmidi-2023.10.25 b/metadata/md5-cache/media-sound/abcmidi-2023.10.25
index 5f81e305f9ba..f9e1c47f3546 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2023.10.25
+++ b/metadata/md5-cache/media-sound/abcmidi-2023.10.25
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2023.10.25.zip
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=71c7de92834a1d94685a3579089a9bec
+_md5_=4f73caf6e5e221eddb4fc0c7f25333f9
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index fa944e0f25f7..c39b3f494040 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/ipset-7.19-r1 b/metadata/md5-cache/net-firewall/ipset-7.19-r1
new file mode 100644
index 000000000000..2a05ae1a1099
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ipset-7.19-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=net-firewall/iptables net-libs/libmnl:= modules? ( virtual/linux-sources )
+DESCRIPTION=IPset tool for iptables, successor to ippool
+EAPI=8
+HOMEPAGE=https://ipset.netfilter.org/ https://git.netfilter.org/ipset/
+IDEPEND=modules? ( sys-apps/kmod[tools] )
+INHERIT=autotools bash-completion-r1 linux-mod-r1 systemd
+IUSE=dist-kernel modules-sign +strip modules
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables net-libs/libmnl:= modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://ipset.netfilter.org/ipset-7.19.tar.bz2
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	c7c63f408ac92135a3111a69f26c4a17	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=8c908e0b902db9691c1f48743b34e38f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 54e376702756..d16aa3f045f2 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libnet-1.3-r1 b/metadata/md5-cache/net-libs/libnet-1.3-r1
new file mode 100644
index 000000000000..9810f077eeea
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnet-1.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=man? ( app-doc/doxygen ) test? ( dev-util/cmocka )
+DEFINED_PHASES=configure install
+DESCRIPTION=Library for commonly used low-level network functions
+EAPI=8
+HOMEPAGE=http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet
+IUSE=man static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD BSD-2
+RESTRICT=!test? ( test ) test
+SLOT=1.1
+SRC_URI=https://github.com/libnet/libnet/releases/download/v1.3/libnet-1.3.tar.gz !man? ( https://dev.gentoo.org/~sam/distfiles/net-libs/libnet/libnet-1.3-docs.tar.xz )
+_md5_=56c1d78bea4b6d8f015cc62d84274e71
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1
index 129b9efb2c9a..0c3cc87330a9 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6aee131b54b1f1fc06e35f476302a7ea
+_md5_=ed95813ff3e306b33dadaf7a802d0242
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r410
index 199a2632795a..a0f1ef4a6d19 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r410
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a4eb565dfb2dd366cda27fecba34bfcb
+_md5_=f2a783f4cf98ac76987e818165bb6fa8
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r600
index 1d1f8171f4ae..b520fe3282e4 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.1-r600
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=gui-libs/gtk-4.4.0:4[introspection?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.1.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=220631424d46f9bafa471062645f9215
+_md5_=6c08955591768609612050f5dcda17ed
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a742e4365fb2..da89c5ff8c93 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/netkit-bootparamd-0.17-r5 b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r5
index 525c26cc27e1..86b016502d82 100644
--- a/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r5
+++ b/metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/netkit
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=+libtirpc
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~mips ~ppc ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!<=net-misc/netkit-bootpd-0.17-r2 libtirpc? ( net-libs/rpcsvc-proto net-libs/libtirpc ) !libtirpc? ( sys-libs/glibc[rpc(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/n/netkit-bootparamd/netkit-bootparamd_0.17.orig.tar.gz
 _eclasses_=flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=1b14d01e8701e14c76693c7dd64e02ee
+_md5_=1055b70784660e5a90034ae4938026c8
diff --git a/metadata/md5-cache/net-misc/netkit-timed-0.17-r11 b/metadata/md5-cache/net-misc/netkit-timed-0.17-r11
index d0db15c3f131..07260d8fb1ea 100644
--- a/metadata/md5-cache/net-misc/netkit-timed-0.17-r11
+++ b/metadata/md5-cache/net-misc/netkit-timed-0.17-r11
@@ -3,9 +3,9 @@ DESCRIPTION=Netkit - timed: Time daemon
 EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/netkit
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-timed-0.17.tar.gz
 _eclasses_=flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=dfbfdf52098147bf80dd1d853902e440
+_md5_=7765fcf3699cfc92cc13556e02633502
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 568aa1ec3632..55841bbbb168 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/openblas-0.3.25 b/metadata/md5-cache/sci-libs/openblas-0.3.25-r1
index 7b4680d03402..ad67ad04bd87 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.25
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.25-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.25/OpenBLAS-0.3.25.tar.gz
 _eclasses_=flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e053466516ee67e1a97c1d4aad330023
+_md5_=dc457020c64b6be64a708ee4ae7afe85
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 716fccc7fa8b..6f51c22f4d9d 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-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index f3d628f0ba45..d694a711327d 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 ) || ( llvm_targets_AArch64 ll
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=86c93692eb7f156cf22a7a103b6e1bea
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r4 b/metadata/md5-cache/sys-devel/clang-14.0.6-r4
index 4ce9614f781b..ad0bf653ebb7 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r4
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r4
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 ) || ( llvm_targets_AArch64 ll
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r4.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26acd33178229c26c6b4f519c5f3ab76
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 4e6f64b0d028..802280023d43 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_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.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b69921e3360c0c617082db23bde2927a
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 c185f762844b..a711ee03de63 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e3492714b4984732a4b63f876c21e47
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.6 b/metadata/md5-cache/sys-devel/clang-16.0.6
index a3f779d756f9..fbc3c453651c 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e45d588c279c992c0e37edeb4201970c
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.4 b/metadata/md5-cache/sys-devel/clang-17.0.4
deleted file mode 100644
index 79be439e4256..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.4
+++ /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 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/recommonmark[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.4:17=[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-17.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.4[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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 ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.4 sys-devel/clang-toolchain-symlinks:17
-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-17.0.4:17=[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-17.0.4 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.4[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=17/17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-17.0.1-manpages.tar.bz2 )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=515daa77f8fdc849ed549a0157d9b3ec
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.5 b/metadata/md5-cache/sys-devel/clang-17.0.5
index 7c165cdf176a..53a7dc68644f 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.5
+++ b/metadata/md5-cache/sys-devel/clang-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-17.0.1-manpages.tar.bz2 )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=515daa77f8fdc849ed549a0157d9b3ec
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0.9999 b/metadata/md5-cache/sys-devel/clang-18.0.0.9999
index c18b10a59a50..32ae90c1c952 100644
--- a/metadata/md5-cache/sys-devel/clang-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-18.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=18/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=31ed923b5919b1f5cdd23b5afaee6f6c
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231104 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231104
deleted file mode 100644
index 8c931e83aa9f..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231104
+++ /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 ) >=dev-util/cmake-3.16 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(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.0.0_pre20231104: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.0.0_pre20231104[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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-18.0.0_pre20231104 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.0.0_pre20231104: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.0.0_pre20231104 llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231104[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231104[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.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=31ed923b5919b1f5cdd23b5afaee6f6c
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231111 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231111
deleted file mode 100644
index 267e269d168c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231111
+++ /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 ) >=dev-util/cmake-3.16 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(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.0.0_pre20231111: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.0.0_pre20231111[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org 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-18.0.0_pre20231111 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.0.0_pre20231111: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.0.0_pre20231111 llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20231111[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20231111[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.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=31ed923b5919b1f5cdd23b5afaee6f6c
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231119 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231119
index 4748380b7f60..4765b16dbcd1 100644
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20231119
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=18/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=31ed923b5919b1f5cdd23b5afaee6f6c
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index f38c758a32b0..69ff294703ee 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
index f730ba85547d..c7a4e83a51d7 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
@@ -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 ) !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	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=9d88a62b4082774b870bb8a60799139d
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 cb9f097a8f8b..b1ee120a6b10 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	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _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 3294994fbb8e..74dafb201a10 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	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=3b94e79fcb603696c1b97d3f61a8d7a2
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.4-r1 b/metadata/md5-cache/sys-devel/clang-common-17.0.4-r1
deleted file mode 100644
index 79709dee6f74..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.4-r1
+++ /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-16 )
-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 llvm-libunwind hardened verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~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-17.0.4[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.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=1c74c395c7ca7761ef8d301dc817552e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.5-r1 b/metadata/md5-cache/sys-devel/clang-common-17.0.5-r1
index 8536a457ed76..0fc9e2d6bdf6 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.5-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.5-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.5[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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=1c74c395c7ca7761ef8d301dc817552e
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-18.0.0.9999
index 4f868c11a92f..a0ce02ea420c 100644
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-18.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-18.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	5133e393e8717a3a093660f990801dc1	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=af0450e434506b1f17a670398a761e8a
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231104-r1 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231104-r1
deleted file mode 100644
index 95a8e0006a0e..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231104-r1
+++ /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 llvm-libunwind hardened
-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.0.0_pre20231104[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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=af0450e434506b1f17a670398a761e8a
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231111-r1 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231111-r1
deleted file mode 100644
index e320a131e860..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231111-r1
+++ /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 llvm-libunwind hardened
-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.0.0_pre20231111[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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=af0450e434506b1f17a670398a761e8a
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231119 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231119
index 056cbba589a6..4efa3a48f30d 100644
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20231119
@@ -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-18.0.0_pre20231119[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/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=1f98dabe25e65e7ccf1ae34f9747b3f9
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.4 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.4
deleted file mode 100644
index 8ca0bf55af39..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.4
+++ /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 ~ppc-macos ~x64-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.4:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.4:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=17
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=26ee675f9dafad522d218d7d39c9454f
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231104 b/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231104
deleted file mode 100644
index 5c362dd26bd9..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231104
+++ /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-18.0.0_pre20231104:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.0.0_pre20231104:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.0.0_pre20231104[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.0.0_pre20231104[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	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=48b7ed4f4f747dc1e0f720f9272e64b6
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231111 b/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231111
deleted file mode 100644
index be0bb7d6a9f1..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20231111
+++ /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-18.0.0_pre20231111:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.0.0_pre20231111:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.0.0_pre20231111[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.0.0_pre20231111[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	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=48b7ed4f4f747dc1e0f720f9272e64b6
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index 8f3bc19778c6..6af40d1b3220 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 84556a70352a..d79835790bab 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.6 b/metadata/md5-cache/sys-devel/lld-16.0.6
index 5a001739957d..e6597df931aa 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2c109f3ac4a0977353e802cf6383d0f2
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.4 b/metadata/md5-cache/sys-devel/lld-17.0.4
deleted file mode 100644
index c3f591d1b4e8..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-17.0.4[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-17.0.4[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-17.0.4[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.4[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=debug test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.4[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=17/17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=abfba5be5dfaab09b89fa7bb75b48b37
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.5 b/metadata/md5-cache/sys-devel/lld-17.0.5
index 2ce84d74f7db..e79c70fbd555 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.5
+++ b/metadata/md5-cache/sys-devel/lld-17.0.5
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-17.0.5[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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=abfba5be5dfaab09b89fa7bb75b48b37
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0.9999 b/metadata/md5-cache/sys-devel/lld-18.0.0.9999
index 6c49148e70ef..04daaa3ce656 100644
--- a/metadata/md5-cache/sys-devel/lld-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-18.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-18.0.0.9999[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test )
 SLOT=18/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5ed70ddc0d45258a2f780cd48e38004b
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231104 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231104
deleted file mode 100644
index 6b92ef80e148..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231104
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:18 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-18.0.0_pre20231104[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.0.0_pre20231104[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.0.0_pre20231104[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.0.0_pre20231104[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org 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:18
-RDEPEND=~sys-devel/llvm-18.0.0_pre20231104[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5ed70ddc0d45258a2f780cd48e38004b
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231111 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231111
deleted file mode 100644
index f950d567eea2..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231111
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:18 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-18.0.0_pre20231111[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.0.0_pre20231111[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.0.0_pre20231111[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.0.0_pre20231111[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org 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:18
-RDEPEND=~sys-devel/llvm-18.0.0_pre20231111[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5ed70ddc0d45258a2f780cd48e38004b
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231119 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231119
index 4b8b1dbdf3c0..611b084a5c34 100644
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20231119
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-18.0.0_pre20231119[debug=,zstd=] sys-libs/zlib:= zstd? (
 RESTRICT=!test? ( test )
 SLOT=18/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5ed70ddc0d45258a2f780cd48e38004b
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r4 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
index 55aaaa3b2a0d..f74e3d02e028 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r4.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60ca4cd3cdef6f9d5fe8fd011a60e11d
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 62f8a72e2744..886551c32052 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8c8bb4eb628a6910552c6d459bdea2ae
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.6 b/metadata/md5-cache/sys-devel/llvm-16.0.6
index d44bde1dfdea..dcb640b73dd7 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=127a18ce19f11757a7de55906e3ec44b
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.4 b/metadata/md5-cache/sys-devel/llvm-17.0.4
deleted file mode 100644
index 6222e51966e7..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.4
+++ /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 >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.4.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.12 dev-python/recommonmark[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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(-)?] ) xar? ( app-arch/xar ) 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 llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug debuginfod doc exegesis libedit +libffi ncurses test xar 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 ~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:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-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(-)?] ) xar? ( app-arch/xar ) 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=17/17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-17.0.1-manpages.tar.bz2 )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a8745dfb09fd05f4bf7de86b97cdbb24
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.5 b/metadata/md5-cache/sys-devel/llvm-17.0.5
index 7f423a60a64a..13ee6d65110f 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.5
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.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.5.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bce4acae0cc650e47d22caeca56a1f5c
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-18.0.0.9999
index 897eea80f5e1..69c9faaa4d3d 100644
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-18.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=18/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=59f15e5d03e4449465d6934c4eb3e18a
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231104 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231104
deleted file mode 100644
index 1dda538df659..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231104
+++ /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-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-18.0.0.9999 >=sys-devel/binutils-apple-5.1 ) 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(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/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 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: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.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=59f15e5d03e4449465d6934c4eb3e18a
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231111 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231111
deleted file mode 100644
index 200d39d016c4..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231111
+++ /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-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-18.0.0.9999 >=sys-devel/binutils-apple-5.1 ) 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(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/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 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: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.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=59f15e5d03e4449465d6934c4eb3e18a
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231119 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231119
index 2f452146ad55..54a73579f1d9 100644
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20231119
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=18/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=59f15e5d03e4449465d6934c4eb3e18a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index 893b157df010..7f4cdd175151 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.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-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=336ae2250f613050cdb72be3f9313b21
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 acf5c47c2aa3..7c849c0fff24 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	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
 _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 f37d15b36ed6..37947391592b 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	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=59793eb07d60e2fa6970879291c147ff
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.4 b/metadata/md5-cache/sys-devel/llvm-common-17.0.4
deleted file mode 100644
index b8046a73e530..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.4
+++ /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-16 )
-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 ~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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=b8e26919e008b64dde5b21ac21cbc45b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.5 b/metadata/md5-cache/sys-devel/llvm-common-17.0.5
index 09a5bdf19914..cd6ea5aca0fa 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.5
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	798e0173d334021f14ba78a786c37059
 _md5_=b8e26919e008b64dde5b21ac21cbc45b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0.9999
index 7a891021b17c..86120d9d17d7 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-18.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	5133e393e8717a3a093660f990801dc1	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	git-r3	5133e393e8717a3a093660f990801dc1	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
 _md5_=4e56df1b08c8dd351154186d004f140d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231104 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231104
deleted file mode 100644
index 8b8740e5098a..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231104
+++ /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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4e56df1b08c8dd351154186d004f140d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231111 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231111
deleted file mode 100644
index 7af0277f28fb..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231111
+++ /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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4e56df1b08c8dd351154186d004f140d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231119 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231119
index fe98fb414f77..cd242d08ef6b 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20231119
@@ -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/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_eclasses_=elisp-common	2a0fa407d2e6363c663ccb299503b25c	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
 _md5_=4e56df1b08c8dd351154186d004f140d
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index f72c4e1ea7fb..79d7df1ce0b7 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/firmware-imx-5.4 b/metadata/md5-cache/sys-firmware/firmware-imx-5.4
deleted file mode 100644
index ed7531302d90..000000000000
--- a/metadata/md5-cache/sys-firmware/firmware-imx-5.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=NXP i.MX firmware
-EAPI=6
-HOMEPAGE=https://www.timesys.com/
-KEYWORDS=~arm
-LICENSE=LA_OPT_BASE_LICENSE
-SLOT=0
-SRC_URI=http://repository.timesys.com/buildsources/f/firmware-imx/firmware-imx-5.4/firmware-imx-5.4.bin
-_md5_=ea78b808a46fb1c966f75649ecb76e9a
diff --git a/metadata/md5-cache/sys-firmware/firmware-imx-8.17 b/metadata/md5-cache/sys-firmware/firmware-imx-8.18
index be409647104c..0ac6dc77ea6d 100644
--- a/metadata/md5-cache/sys-firmware/firmware-imx-8.17
+++ b/metadata/md5-cache/sys-firmware/firmware-imx-8.18
@@ -5,5 +5,5 @@ HOMEPAGE=https://www.timesys.com/
 KEYWORDS=~arm
 LICENSE=LA_OPT_BASE_LICENSE
 SLOT=0
-SRC_URI=http://repository.timesys.com/buildsources/f/firmware-imx/firmware-imx-8.17/firmware-imx-8.17.bin
-_md5_=27e17b09e27439dc128f119fbbd543f3
+SRC_URI=http://repository.timesys.com/buildsources/f/firmware-imx/firmware-imx-8.18/firmware-imx-8.18.bin
+_md5_=65dd7b34575d6129cdba66661208144b
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 3e30f9f6878d..a94f87348bfe 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 0c737a2165d4..5bd8f94b9b7f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f541873204a80a70f69b34092750b75d
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 d4c5753ffc87..23c8c07a187d 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00933d3bb15ec9382379ccab1da56544
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 3991bae7cbb3..ce06c0caaf10 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	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b18e77a22b64a6c05b43af6ca7f6a952
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 d05d44cad89d..7f0cae904624 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	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=160edca16d2528669cbd04f6a368a2c8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.4
deleted file mode 100644
index 3e2b634240d9..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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-17.0.4*:17 ) !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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm llvm.org 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 ~ppc-macos ~x64-macos
-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.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=70f02ba2557df2910a9e33a11666a135
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.5-r1 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.5-r1
index c0b5ab0866eb..b568f6cb71b8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.5-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.5-r1
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-17.0.5-r1.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=16f7a727fe36cfd860bf0f7329ac5bf6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0.9999
index a4b592793b8d..c859eac11126 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-18.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=18
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d92be811281b1c19704daf01f94acaa5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231104
deleted file mode 100644
index 82e801ce7e92..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231104
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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.0.0*:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm llvm.org 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=18
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d92be811281b1c19704daf01f94acaa5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231111
deleted file mode 100644
index 209257dbe299..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231111
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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.0.0*:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm llvm.org 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=18
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d92be811281b1c19704daf01f94acaa5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231119
index 067287616acf..d58a1b457eeb 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20231119
@@ -10,5 +10,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/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d92be811281b1c19704daf01f94acaa5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index fbab14c6dcbc..af1868e9ae5a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1c1c912e6047d4dbf13b18213c38e789
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 37beec0ff1cc..1b167f2d08a8 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=073adf97b984c7834ca31d3d6fe4093c
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 9c86b0975601..d8e5e5bbd37d 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	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0b9639849210be2fedb285caac683c74
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.4
deleted file mode 100644
index 1997df2ff2d2..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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-17.0.4*:17 sys-libs/compiler-rt:17 ) !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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org 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=17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=808233441874787d95190415ca28db2b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.5 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.5
index 399a80cdd54d..5202eff2d536 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.5
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=808233441874787d95190415ca28db2b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0.9999
index 9186a2e81d4d..4a88a40f7da5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.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=18
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3974b70b41f94cc4a0687dcb8d701cf4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231104
deleted file mode 100644
index 0bdfdbef9039..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231104
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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.0.0*:18 sys-libs/compiler-rt:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org 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=18
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3974b70b41f94cc4a0687dcb8d701cf4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231111
deleted file mode 100644
index 9d55d157a5d8..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231111
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 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.0.0*:18 sys-libs/compiler-rt:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org 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=18
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3974b70b41f94cc4a0687dcb8d701cf4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231119
index 8d2da61fdddf..12cbdd99417d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20231119
@@ -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=18
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3974b70b41f94cc4a0687dcb8d701cf4
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 09950b15a9de..daa4bf9c875e 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f95daf51c66fe7b280c304887543471f
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index dd2353d62396..0611cf82ec5c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ddc02e83563bc9914bfbef3c80fe44e1
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 8303dda6d2a2..ed687e95d42a 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cafe83e18230110b3807a83c0bc33d18
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.6 b/metadata/md5-cache/sys-libs/libcxx-16.0.6
index ae4c0aafff93..85913b8699b9 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=493297223f328327113043a26837c59a
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.4 b/metadata/md5-cache/sys-libs/libcxx-17.0.4
deleted file mode 100644
index cd3f1078ff4c..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.4[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:17 !!sys-devel/llvm:0
-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 llvm.org 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 ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.4[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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=39bd85f17b1b2b713c1366985af950b3
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.5 b/metadata/md5-cache/sys-libs/libcxx-17.0.5
index 067a63dc7778..9fbbdb2be6b7 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.5
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=39bd85f17b1b2b713c1366985af950b3
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-18.0.0.9999
index a21ed1942735..ab2e38aea3b3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-18.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d557962fb98907b67ac684a7b73442bf
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231104
deleted file mode 100644
index 4dfef86683bd..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231104
+++ /dev/null
@@ -1,16 +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-util/cmake-3.16 sys-devel/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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.0.0_pre20231104[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 !!sys-devel/llvm:0
-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 llvm.org 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-18.0.0_pre20231104[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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d557962fb98907b67ac684a7b73442bf
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231111
deleted file mode 100644
index a4de8b62d839..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231111
+++ /dev/null
@@ -1,16 +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-util/cmake-3.16 sys-devel/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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.0.0_pre20231111[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 !!sys-devel/llvm:0
-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 llvm.org 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-18.0.0_pre20231111[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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d557962fb98907b67ac684a7b73442bf
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231119
index e93e7f7fb7ff..655103591868 100644
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d557962fb98907b67ac684a7b73442bf
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index f2741fcbc839..fb327cf350f2 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=946e2934f880e269a208e4194545a8d1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 929752b9412e..e18f849cac6a 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	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 8899bb793479..326f02e4b96a 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ee781fcffe10295a7c279e1456f8cab4
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.4 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.4
deleted file mode 100644
index 52ca6fb80dc4..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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 ~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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ee99d0be142171cefd49c930b0b4263a
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.5 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.5
index 14c4d44f9cd8..1d0485d3dac8 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.5
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ee99d0be142171cefd49c930b0b4263a
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0.9999
index 2ed6ad278a2a..a0bd0c6bca1d 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-18.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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=59ecf5bedbc72cf169ae4842a6646faf
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231104
deleted file mode 100644
index b9ecfd839ff7..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231104
+++ /dev/null
@@ -1,16 +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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=59ecf5bedbc72cf169ae4842a6646faf
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231111
deleted file mode 100644
index ab4dd1c3d800..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231111
+++ /dev/null
@@ -1,16 +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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=59ecf5bedbc72cf169ae4842a6646faf
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231119
index 3b891ea001e8..3fc85f1c50e1 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=59ecf5bedbc72cf169ae4842a6646faf
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index 3b96cacec129..3c67af21b78c 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
index 0e74e6d45b18..cda98ffed28d 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
@@ -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-r2.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=919fc31c2f3e10e592ad25fa7fc1b724
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 993f78e49e19..2a7512dc4b4b 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=402dc95da322e83ee23015a135d49ff7
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.6 b/metadata/md5-cache/sys-libs/libomp-16.0.6
index ca3768defc33..08a281473012 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8d37363d5c4510e263ab7f7364e0c990
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.4 b/metadata/md5-cache/sys-libs/libomp-17.0.4
deleted file mode 100644
index d37e47cea02b..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.4
+++ /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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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-17.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org 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-17.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/17
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c355be7d2f10d75acb5e201232698df
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.5 b/metadata/md5-cache/sys-libs/libomp-17.0.5
index ae20c9588f2f..1264d2ed4700 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.5
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1c355be7d2f10d75acb5e201232698df
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-18.0.0.9999
index 7a21b45d5227..f80d62e1d8cf 100644
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-18.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/18.0.0.9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7de8093c2f56d537449f718acf94bd23
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231104
deleted file mode 100644
index cc32b2dca32c..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231104
+++ /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 ) >=dev-util/ninja-1.8.2 >=dev-util/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-18.0.0_pre20231104[abi_x86_32(-)?,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:= ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org 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-18.0.0_pre20231104[abi_x86_32(-)?,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.0.0_pre20231104
-SRC_URI=https://github.com/llvm/llvm-project/archive/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7de8093c2f56d537449f718acf94bd23
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231111
deleted file mode 100644
index 25606fe50ab9..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231111
+++ /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 ) >=dev-util/ninja-1.8.2 >=dev-util/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-18.0.0_pre20231111[abi_x86_32(-)?,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:= ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org 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-18.0.0_pre20231111[abi_x86_32(-)?,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.0.0_pre20231111
-SRC_URI=https://github.com/llvm/llvm-project/archive/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7de8093c2f56d537449f718acf94bd23
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231119
index 78556e64b27d..ef1c73a92183 100644
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/18.0.0_pre20231119
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7de8093c2f56d537449f718acf94bd23
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index edb0a71d7d58..b1e4012289c2 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 9b263cdad3e4..ef043d1e4afd 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	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 9e6d6c7c27e2..8c454fe3d6dd 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	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9c0af3fbc34dcae11a870649274cf23c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.4 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.4
deleted file mode 100644
index bbd960010b44..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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 ~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-17.0.4/llvm-project-17.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-project-17.0.4.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e6e3ab872dccaee96ecd432dc81a2f7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.5 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.5
index 86ca56af6719..3a84af87dad6 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.5
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.5
@@ -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.5/llvm-project-17.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-project-17.0.5.src.tar.xz.sig )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e6e3ab872dccaee96ecd432dc81a2f7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0.9999
index 8ac165afe250..6ba583463a71 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	git-r3	5133e393e8717a3a093660f990801dc1	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=89c3c15608ba174bf686ffa2a6a96009
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231104 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231104
deleted file mode 100644
index 5941e6587836..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231104
+++ /dev/null
@@ -1,16 +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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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/83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz -> llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89c3c15608ba174bf686ffa2a6a96009
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231111 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231111
deleted file mode 100644
index 1fcce7aac0cd..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231111
+++ /dev/null
@@ -1,16 +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(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:18 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org 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/167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz -> llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89c3c15608ba174bf686ffa2a6a96009
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231119 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231119
index df5a069c2124..bb88581a10e7 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231119
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20231119
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5237193b87721134541f228e28edfd544a9c8ac8.tar.gz -> llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	1c8144b0bf2178b383eee76c85b0c601	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	llvm	2e1701c714b75feb512bffdecd3fe7d0	llvm.org	7feeaf35c89e70e1c0646cd968b58d3f	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=89c3c15608ba174bf686ffa2a6a96009
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index cd7bacc2b427..2876dfccba0c 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/procps-4.0.4 b/metadata/md5-cache/sys-process/procps-4.0.4
index acee15994c1b..ce1d831902e8 100644
--- a/metadata/md5-cache/sys-process/procps-4.0.4
+++ b/metadata/md5-cache/sys-process/procps-4.0.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/procps-ng/procps
 INHERIT=autotools flag-o-matic multilib-minimal usr-ldscript
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~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+ LGPL-2+ LGPL-2.1+
 RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<app-i18n/man-pages-l10n-4.2.0-r1 !<app-i18n/man-pages-de-2.12-r1 !<app-i18n/man-pages-pl-0.7-r1 kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] )
 REQUIRED_USE=unicode? ( ncurses )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0-ng
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-4.0.4.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	6b3c606c5de2531072ffd36eca06a5a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=c31283fb312e1ec3524a844a66760fbd
+_md5_=8293a36831988ad9e559fcbee75167c2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 62cc471a91c1..ad618baf0370 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.6.0 b/metadata/md5-cache/x11-libs/libxkbcommon-1.6.0
index 61fdd827506c..1bc5c20f53cd 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.6.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.6.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
 INHERIT=bash-completion-r1 meson-multilib python-any-r1 virtualx
 IUSE=doc static-libs test tools wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( wayland? ( >=dev-libs/wayland-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables x11-misc/xkeyboard-config
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.6.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1be925a1f585b2f19a8e45737f09016c	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	e989dbdcbb647bd8655857c1f95be244	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5
-_md5_=eb907de69ac9bd090c1e03488fe97dc9
+_md5_=b8af31401e724eab2ce3bef576fed212
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 221c925e3c45..25c9a8a5e24f 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/xfdesktop-4.19.0 b/metadata/md5-cache/xfce-base/xfdesktop-4.19.0
new file mode 100644
index 000000000000..a126c41e8262
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.19.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[wayland?,X?] x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
+DESCRIPTION=Desktop manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
+INHERIT=xdg-utils
+IUSE=libnotify +thunar wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[wayland?,X?] x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.19/xfdesktop-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f7f3b6e41623e7405a18bc86defca5fa
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 68921cb84755..7b50d1faacdc 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-11-25T09:40:27Z
+TIMESTAMP 2023-11-25T15:40:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVhwQtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmViFWdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAq/g/+Mrci/q62Zq+PvlECFVPU66Ai3KQFESHgjXy8Zf2zgo8Rf+nrqCFUM04t
-OmB/xOOjDyEVCseL16WiUS17rVPJlZ4lQ9YvMani/b+NYNiJSe0Wf3sFcMj+STOs
-pNenKqc4P7EqOXHI6IStCpN+RBcoiYWu6aREh/PymP+c53k6BU987yr85MU1Uafi
-nvAfSKB3mx3Nc9+7NGA5JLXAurWp1OQoc9EHz/DeSFLnvru5onsZvRwGZfjeZVYv
-OCM/WeBCIdwjUH4lRH5EWYKe0pwnMdmW/nAld2kxS2/UvxlyQap/qQaNlkfurSAx
-Dl7YwL/45dI9tg2YF1kmpH7dJQfSZ4+Cb6bvEmed4B22MRzGCyHQQEWp22hbOYyH
-77yecTuBeZoJIXP4FA97OqDJhGa0fGmKcFGoHevZOayAzmooLhwgtiFy7qSflVu/
-h8TMC2fBPPf7K6M7njg10RuqOrDA/yC/NCuSIThcLr4vevdqsgaTEkCNh2U7lSUS
-fmBEqRxcNZK9LVnm/z2OEYybZE8khhYM2B6CpX3+6/WGklhc5HiY4Wug4iWQhya2
-IFeh0UF10PlgY/OO7d6hIgFjQShgzp/h819SFxl7578qv6yLa1a3sW5BI+iW36eX
-e0r/dbTJDvdyHXs2hcS6Rey08Zklh68a2km5qf0rTTNQ3JoMEZo=
-=FxVb
+klDM+RAAhntEBXxyP9+LrAXL6ijc6MORmR7QA5YRy5oudzFGrNfeAqytQjzqzO34
+3/S0wZH2uzzcSHt8d6e8rhqmwjk7a8hwx6fu/C4RTIzGj0yNuuc+rHM6+rFb7yST
+YScC0KDqvH0NwQhVLBWXrjbbTeR5bjuT02/hfxkCvrrOeXUK/BBcwXIEyah0Lpi6
+aVooXmVGUANlmHjKpv0DA6BhY5j/+FUMeRDlHscqeW9nudpETN+TFuw3yPZomx13
+D1AF853ukRAaqdHz1KeYvoU83mtyNd845ASt1m8thPxoETwWC+M7h4vqveGSSLdy
+H/ZGtTq7upsuvo8Z0oYXJOS8Ax/+LijcodbZPbtNqXsTp93PS2Z/eIqNyeboTKut
+gws7qqG8Xi94j1M6jSqnFmOa3ve7e8dPUtfC/bRzmBn0mdjWtd1BMIN7Rau1o9fx
+fjQQ1BHkC3/nD9/jBgKTUCas0r9c6Fp/wzXPjKX3n0ksxqAQ8RbRc46B1THlBWcC
+0WgMYgh/jqVhIl/uBFNADN3gqn9pYpLvhTxKbkn7BWLhh8tWjW4giecZx6+BCg36
+QiBA/HmW2L5ytKQEKNM4cZ8gJazkmiCWXG9mTEg7XBIJHStQu1eKZOs5EGeHvnu2
+JZ+2MHZFVUVnI2K2YS2iQYUXS8fFL0/1q7EsKI3LGvVM2lAKfFk=
+=w6Ye
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4ca135130255..109bea0d55ab 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Nov 2023 09:40:24 +0000
+Sat, 25 Nov 2023 15:40:21 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5cd527ec9c27..56fce7bfc199 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Nov 25 09:40:24 AM UTC 2023
+Sat Nov 25 03:40:20 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 590390d1335e..32ac7d089323 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Nov 2023 09:45:01 +0000
+Sat, 25 Nov 2023 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 835049ca68eb..b0ab3a2da0b8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8f8a611a99e48aceed2593fbf7ff10679364e371 1700903510 2023-11-25T09:11:50+00:00
+ad618be5abd65bcd8fe1ab0450ec696ce53f72e4 1700925610 2023-11-25T15:20:10+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 28a60ccbccdd..89bf99b49ed6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1700905202 Sat 25 Nov 2023 09:40:02 AM UTC
+1700926801 Sat 25 Nov 2023 03:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4ca135130255..2f743d70c873 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Nov 2023 09:40:24 +0000
+Sat, 25 Nov 2023 15:40:20 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ef87997c1c90..823a73ea0778 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 3fbd2230c5ab..a3195d4b2512 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -9,5 +9,6 @@ DIST ipset-7.17.tar.bz2 684983 BLAKE2B 43b74ab7caf5a963787184aa75b6c071388c8d289
 DIST ipset-7.19.tar.bz2 686712 BLAKE2B 04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640 SHA512 0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e
 EBUILD ipset-7.17-r1.ebuild 3511 BLAKE2B 4b7547736bf7665d96d5907d1b9c1ac1f53485533db548e29a91544cba794efe5e276c540a4f4493de96105a932cdc885595e6fcaf7f8b82aee8f6f9e80827bb SHA512 2f298e598775e2b53baff13335b13630545d1c9e3f278a082fb7be3acf1c544a0e0a04beedf1c16c57525d770c7514c76b61230383bc134785c542288bbeeb95
 EBUILD ipset-7.17.ebuild 3507 BLAKE2B 830f9465dda941460c1b4148989fb0aa79f2c500ac6daea948eac6609d50778bd2716e9cad2248b6bad1e80c73e1612188000b0ecb3f6bdd5cadac279fcd6aa2 SHA512 117834d3727b3dd50112c2f53734753ccfb8a21c71d98892e7a5c706ca0dcc98ddc4e4b43c51a1f9ad68bc3b09ab9871b4d625923ed041e0b51e8ea4b881bb12
+EBUILD ipset-7.19-r1.ebuild 3385 BLAKE2B 8cf5e0db9751fe80573077dc4b0a904f34338945142da4d136ec7ae2cf9c92ea1d86fef04766d7e8ea9724ac3eb9c314f1f49aa11c0073ed7f3d281e370a55d0 SHA512 8de3cefdc63a9495e3d546cc009c3e14147048f6a8f8615bc0f5bc2f635503f906d05a69f168d699e162bf33c423eb0e83a60c148daa41eae3aa87600d021653
 EBUILD ipset-7.19.ebuild 1707 BLAKE2B 88b972913daa212a6596543ed971ffd37ca5bfe6f5d9f8eb5476e847c5df2bfa968d589bd09e2118ba9a2465bce20149e01d5039199e0afb57329661c52b6de1 SHA512 968652a40abb9cff26e6157e4d95cda9585cf24ab3ea69d271c2c8ba46b5ec48fb88dcdd51d5d19406d9c4e82542aa531d3267b8ea9c56637cdc6ecf34ebaf0e
-MISC metadata.xml 369 BLAKE2B f41c3bdbd41f5cd6ae9451f00d80d3ca0e17343f45c37f88ab6e34dda8fce78e4d9b4d670385b3f8d9025f6065f1911d1815b610bbbbbfeb364942b8512ccc7b SHA512 f359ed08f769da53de8c31350f48b7fd0504c863fb29664ce40eac4e56f2cca842d9dc8de350fd4790a3a143ed4db6ed3df3419cc9daad4403078039ced52d3e
+MISC metadata.xml 475 BLAKE2B e1e06003a410249ed76d39b74ccbcd64b8572ff05f1c818729d787cecfb19cfa9c7e3463473688abc7a398efb908b0c7145bad88bbb7259e69f1b7d985584bcc SHA512 d0a3dca6593e8a62cbf5c325eb59b620137af8d8f5a463702c4d6ec102fd03b8adbbdcd9358777d0461f57a98d892d359d80b8f722d3f322f3d4766d762f6585
diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild b/net-firewall/ipset/ipset-7.19-r1.ebuild
new file mode 100644
index 000000000000..15cdfadce814
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit autotools bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/"
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	net-firewall/iptables
+	net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	CONFIG_CHECK+=" NETFILTER_NETLINK"
+	ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+
+	[[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup
+}
+
+src_configure() {
+	export bashcompdir="$(get_bashcompdir)"
+
+	econf \
+		--enable-bashcompl \
+		$(use_with modules kmod) \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+
+	local modlist=( xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/:
+					em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules )
+
+	for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do
+		modlist+=( ${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset )
+	done
+
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		linux-mod-r1_src_compile
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/ipset.initd-r5 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
+	systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod-r1_src_install
+	fi
+}
diff --git a/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
index 64616aa9d16b..2538887d06a7 100644
--- a/net-firewall/ipset/metadata.xml
+++ b/net-firewall/ipset/metadata.xml
@@ -9,4 +9,8 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mpagano@gentoo.org</email>
+		<name>Mike Pagano</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 79880f9d6f20..5314ac11c5cd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 03a9636864f3..a799723c9e03 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,6 +1,8 @@
 AUX libnet-1.2-int64_t.patch 569 BLAKE2B 8b07c6dee008102d4d1ab8863606c78219f8811a0153f341709f96347dc62c8cb207ef61f37aca5a3e440fac5def11b11a032f8e09944a86da9aff1a2e9f19cf SHA512 c3e42efd4b2621a4a068764ba9072e2dfb6506940c0dd48d6e66ec7392a60c0a53178d6e75e28d4e800b69e2342abc82b8102cc3add1edd339a5581a233be35d
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
+DIST libnet-1.3-docs.tar.xz 21264 BLAKE2B a2c837cde6966a580b5b0cae12bfd8bb33793a5835c3c1ff1ecc273055f56d0f0084b48d7ebe768c1326ed54b67bed5dd23bb9f7524590a2095283950036e848 SHA512 b36bdd7cf9b7acca261004d2308ea6bcf11a67efe581f15ac77548dd02ed1f3e86f1daeb00cef4e774db983e13a95d7f79062258229909cb41886a45f8fd974a
 DIST libnet-1.3.tar.gz 595500 BLAKE2B b43f15143e6a1de3350b814d7acd4a41d61eb08e6dfeb729868e55f65c445942ae52905953f3a4fad00402b47fc5119634233ea3ae28806c1869bb34ef6fba9b SHA512 c434327108b61e73b61acc5f2b346d049ab5d58e494db21971368eac733a9a0a3e9d95e0b4523c20629b02ed0feef086c50c582719635f21e980c440d55dd462
 EBUILD libnet-1.2.ebuild 904 BLAKE2B 18e30802c5cd41fe8c8e9a5414e69d6d1d4050e7239a3df68a935d9b48ddc8bebfe3b47976293ec591cb63aad30483539edfed7a5c1ca6ef44da88ba543a6140 SHA512 de9a422ac93465a16c75619c4af4ad87b78cb779a3d87af68fc3d3642f636cfa3a6a44c0921fe19861566bc7604ead2fbf037c75d04702a1b728c7267ff24a46
+EBUILD libnet-1.3-r1.ebuild 1909 BLAKE2B 5884facd38c5111a733c7be45efe50d2fffecfff7bb6e6e0c7b2c4459620ea165fadd3e642919dcc9a278e04d15b6004a3e746e8bb4d8ce19fc0a7497090f48d SHA512 bca1c92f0ce1c8568c77ea12e7e90b92dd6491edd60d013b2ce7be8f8e1bc16776fc726d039939499987331b45308cb89f8078282a6b4c0f16d2460b2024980f
 EBUILD libnet-1.3.ebuild 1000 BLAKE2B 1e8474d55a1bfea4ce42ce84664b9e36dbc30c1f6d9e4ea8fcc53a6315bd72449c0c56b8d4d829a5c3f7f5e832b913c5e60298d846b95488d6d27f14b7058e58 SHA512 5ed2f6792bb3de608d452a3890648b1c34fea7c65cc0b6de870924ea4db6a8c431421b0ef2ec58b9e6b52575816e6eaa7dd0c1fd7284c9e5a970844f5f7af9aa
 MISC metadata.xml 1344 BLAKE2B a4798ed5db1e0a20c9a97794e6c7ba98a473e283799cb51ca39e072437508933e1b6656fe558f47600ef6da2a59966c7235e82a6d64cc89b261f3106d8df2399 SHA512 a846b017e37680462b7a4b66a883d77eccb72f7aaa2ef0bf854e507adaa30c94042effd22bacf5756bffe575932fc014cf7c5393e933f9b59de8da43f849060d
diff --git a/net-libs/libnet/libnet-1.3-r1.ebuild b/net-libs/libnet/libnet-1.3-r1.ebuild
new file mode 100644
index 000000000000..af851efcc470
--- /dev/null
+++ b/net-libs/libnet/libnet-1.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Fix upstream dist tarballs to include man pages!
+# https://github.com/libnet/libnet/issues/169
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libnet-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${LIBNET_DOCS_PREBUILT:=1}
+
+LIBNET_DOCS_PREBUILT_DEV=sam
+LIBNET_DOCS_VERSION="${PV}"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+LIBNET_DOCS_USEFLAG="+man"
+
+DESCRIPTION="Library for commonly used low-level network functions"
+HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+if [[ ${LIBNET_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !man? ( https://dev.gentoo.org/~${LIBNET_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBNET_DOCS_VERSION}-docs.tar.xz )"
+	LIBNET_DOCS_USEFLAG="man"
+fi
+
+LICENSE="BSD BSD-2"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="${LIBNET_DOCS_USEFLAG} static-libs test"
+# Fails in sandbox, tries to access /proc/self/uid_map.
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	man? ( app-doc/doxygen )
+	test? ( dev-util/cmocka )
+"
+
+DOCS=( ChangeLog.md README.md doc/MIGRATION.md )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable man doxygen-doc)
+		$(use_enable man doxygen-man)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use man && [[ ${LIBNET_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${LIBNET_DOCS_VERSION}-docs/man/*/*.[0-8]
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bcd9450b4d20..80c368dc06e8 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,7 +5,7 @@ DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217
 EBUILD webkit-gtk-2.40.5-r410.ebuild 8099 BLAKE2B 944259f71714a4b21081d8bff8e27e394ab708d76ee4d2e5bcb37e2615d127c810b54e9b01c727daa8f18894da049dd4cfa4f5f12a4368d5858d81f9476caff0 SHA512 ab8888a79c9d9b990b5b8c114fd17488a6f7762cab9f12c3f239b38a790011d69782475322f1315bce9fcab97b0496c1e89e5a5c876a770c6987c02f76a96446
 EBUILD webkit-gtk-2.40.5-r600.ebuild 7988 BLAKE2B 2f9b8087eb25d576a3c6645b94ead0f39696ebd26456afbdece19b8258d935855fb31f9c7681318e179d5141b2403f643c92d91c62f1455c8959e4b756a83df3 SHA512 577b7b7e10d27075d73936df16f6d0b8014b41f34141ddc23335788bdf6aad87d6525a95b0b7819bab3cf79b544d6ed5e66c3c7e6c8337fb76063f1673ed8e0a
 EBUILD webkit-gtk-2.40.5.ebuild 7825 BLAKE2B 08e9ad86b3dca85c4c9a728c4c7b7e0374c732f35949cc9441d1b24e50bae4e5e62602d94e9a4a34a10032ea63ae858487dd514b551a591eb311ef0f2ca1bf12 SHA512 1c4a274afcd91639eaa22862fc01594109b257688dcdc917e80cc71dc198ff3ba55d89a28fc925cc1e02b16c606bdde35f20a5d85e1994d348955cd8bdfc4c6d
-EBUILD webkit-gtk-2.42.1-r410.ebuild 7963 BLAKE2B 44c4db79cd387daeb69c40d98ac59d9c968d07ef3f8af63595cc307412fcd734f5568d0a50aef44c8fbadbc9ece4b702de8d51ab034b40d1ec23cbb255366997 SHA512 f4250d6acb164affb902d64323be6408eeafa4615e0ed569e466da37a14fedf2c5d99e6b2ebe71c3f7599f55fd8ebd1d82326058b10740d7552344f8441c43da
-EBUILD webkit-gtk-2.42.1-r600.ebuild 7860 BLAKE2B 39cfb17f63242f765ad10c92935399db12a625be9653d6bb688b864c1ab43077ea7218cd13beb2074c39f28f3f5a40abaa6b291cc17706935b38edd86da21fff SHA512 31861c0b47a31550c91477194490bf5e0854e1eea67498744bb7b8dfc9bd3526bccc39e347e9bb99da36f5ad07150593b8512293ec12dfdb77d893a01217b4a7
-EBUILD webkit-gtk-2.42.1.ebuild 7689 BLAKE2B e7c6f7444cef8a9a67b49bf51f4e6b5935faa6536ac15b02fd75490da485457a86d33ce17ff735f2adfe3a995b9c2db181565027ffece692b76ccd82051a2e24 SHA512 9c5b7d002da9ae285afa4f823f6a68a6de9b7a1a1828abdf0d4ab81d676ae25cca2858fd0d214df52da4e6a00cf358bbf8473a31a7400910e7da116ebb9eb578
+EBUILD webkit-gtk-2.42.1-r410.ebuild 7962 BLAKE2B 87ffea5a28b613ba928e6d51b9efc5ca30b8fde1c6b583af6bd5f34244c876f3de0642fda8e7b8a4d71cd26bb08bdc81e8606406e283ee7bd4822b74a5223cf3 SHA512 ef9bc6ddeb92956b80c8bb3137475f815b3b7a4500db147a85321d5edc968c25f8d0fec23212c2d6a411aea1b1b1d22eccd375be13e2a85a71bb6834dc60dbf1
+EBUILD webkit-gtk-2.42.1-r600.ebuild 7859 BLAKE2B 98d5defb974ec96c3c643b48f0467da382271b770a32db326c18ca086ef36535c5ad936aa2167e75647717fece8cb3cb00d5dd07a22691328f8ac8b680b35d71 SHA512 d16478314e5368968f5e9e551a6fc835754d368ee8a9bb1aa5270b330211f4e06d440ac9e3a2667a90ba139221facb7e9b95ac9f16331800ae78cb242219fb58
+EBUILD webkit-gtk-2.42.1.ebuild 7688 BLAKE2B 56890e2ca664f064e364c9c8bd34ac40cd1e58815ed8c0dad9fd53a25512c15ca80965fb590175646763995f83b658222d377d7e91a07a1272d978cd9c9b8264 SHA512 e44da6ba005333f2a93fcc97446923f0573e39694eac1b92b17e0bd3e6c5662684138f3effcbbcc896f89fd8ddc4afb73eeae0ade665a78e9117946bf45bef5b
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 83b897fc606e..693d5fa4f7fa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index 57f799350171..270c8e388dd2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index fcdc8ba20a52..bf663a9ef933 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3a61dcfc718f..e51081ff7d05 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
index 67521bffd1f9..1bb44cca69d1 100644
--- a/net-misc/netkit-bootparamd/Manifest
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -4,5 +4,5 @@ AUX bootparamd.confd 29 BLAKE2B a2697cebfe9e2c7a9617b2624b70d0615b4ad920d034dbd0
 AUX bootparamd.initd 502 BLAKE2B ebc4d4c3381c1003924c402415aea4ad820e24f38520b4f0bc41643dc3f24642e8010907ae1451f7286607ab387d256e9e74f43ca53c5f3677e876956d0a686f SHA512 9326e3a3dfca43cd7233a289b1f58c22db22aabc2136cba2d61a4bdab17652f9d031e4eddc877126aa09e08e048e63ba9fcf4219f9dbbf55d6787e03d5ee2548
 DIST netkit-bootparamd_0.17.orig.tar.gz 13934 BLAKE2B d828175594b0aae60c5284d4f02c73b4bb91cee2601dc52c6cbfb21e02779825a03567de7dbcc945246104889b7b4bc74f0429b508bda082a365a1d605e213e5 SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca
 EBUILD netkit-bootparamd-0.17-r4.ebuild 1454 BLAKE2B cb36308c62f7fe7186037150233352d2a780c52b13d94df3bdd4ae1ea016f3e6742c14899fb8b51b654eb3b94c703ec27121c42c625ef722202481396b6e617a SHA512 a48c201c0aa38f861ed0e5677a404814d5ebdb3c17079763d335e75fcc7c47a770f93d8567ff1a5f161a27a2d09d946e8de0dc533eb1030ff16372ff4013d9b9
-EBUILD netkit-bootparamd-0.17-r5.ebuild 1479 BLAKE2B 0af8ed8db970c1fe0e39477a84784f686a530112b520ef9f771c7190a68b72d7a8f8427da7aa9ce5078e0ea650956e903900d3870dcd73f92b1f509693c086b0 SHA512 2fb787255ad0f4177bb1265c9c9c6fb228c59594dec251915a1a1080609dbec02faed41b821e8faf8d07e38072f9e7e091bbb20d4af6a14de7bcb1d21fea3847
+EBUILD netkit-bootparamd-0.17-r5.ebuild 1477 BLAKE2B 4165a3e6c5d40136650635db5ef44fe975e3829f4aaf76f6390a4d901267b0fcc6d09919a0c039360c646f86fbcb4462c359839b53e586bc50b742ff5574550f SHA512 3e36e021cddd10f24f3cc893df311a7077f57c287a8276c769ba89c7ee168d7b0ce947a8700e82ed1db263ef159e18908532d03709dd281b21318fb66d3d18e3
 MISC metadata.xml 268 BLAKE2B 91c62a36cbf68e44d577a77084141c8505ad6f4f4d0455c4e68aa99e758518505c09161acc56f77de536d94e05b22ed8f6eff2f61d4a1744e1e752d24ba785f1 SHA512 e08f7d0f198f125c9a66e8503eab99802b27d5bd5c2cfd99c03d9acc3bcc67e404c44945dd4271fed3257b123492ead2492cbce645dbf383ffc0b684a5050bb1
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild
index 59faca2de934..666f5f660233 100644
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="+libtirpc"
 
 DEPEND="
diff --git a/net-misc/netkit-timed/Manifest b/net-misc/netkit-timed/Manifest
index 31b5f68c635d..88969e098197 100644
--- a/net-misc/netkit-timed/Manifest
+++ b/net-misc/netkit-timed/Manifest
@@ -3,5 +3,5 @@ AUX 0.17-timed-opt-parsing.patch 403 BLAKE2B e0164998a4845da439b640d60b3cdac1dd8
 AUX timed.rc6 358 BLAKE2B 358a7b3fc14f30b0146e1269cf9327d9aaf64d8329b25c610b0405adfc91d4d21d6d14ec08c7234b53934460851db6f947117733b3d4070645503dbe1761eaa5 SHA512 cde2063563dd02b404560fa84bfa536f2f7c75e9271225e94b08630348d78639e386b8a0f59f04b389ad66f2d714c63edf2eed507b690d5ba989780b400547a4
 DIST netkit-timed-0.17.tar.gz 48655 BLAKE2B 5e076394e2605569b8a9a34d47b59234ffa0f643a13ef7ac688b40d259079ec5d2eef99a0efa35d7975e11118c1fe87bd138edd98199dde68cc4d8d9f10c3599 SHA512 781a41555953a165949dde7e7279298d4faf348575ba1214c6ce60cdbc74f6f03ab31002d57a441cbcaf674f7e2cc00afa17632bc3fcb28e2afd95d39cd70b99
 EBUILD netkit-timed-0.17-r10.ebuild 1019 BLAKE2B 000b7f43ea394aab89876c30d3f23bd3c63fa66010279c8dc6526653d8989c12089e3933ee4ea6637926cef2a3069674703cf345e64c3230d75a37b4bd3cf9b8 SHA512 c551b9a8d71a1b77ecfd72142924046e4d16882c274d129cda88fd06c26feba995afcc11ccb626e4e301cca3bba56fcc90a9c42fb011eebe1ab0b07a8c071635
-EBUILD netkit-timed-0.17-r11.ebuild 1061 BLAKE2B 211c3ad5aa6efc462161bf6fdc99f0f8c69908a8f88301cb0d004e68ede7fb23c4044bab0e5bc8bbbb7fcfb35ac0c8c8461bc7b1bc7d822cb5f629f8d15c0a1e SHA512 1968ad82aae9e35572912b30a3d9b69440bcde842b1590047a3f8dcb8f9d721f449a218f7ccdaab79f0e2a2e663be92f6e48e5bb098a337e24097a5ceb225d38
+EBUILD netkit-timed-0.17-r11.ebuild 1059 BLAKE2B d3fdc92fbb8050b201ac62384f03b57dca11ea165031c1ca36730846514d04f8cf5de8b026794c21b75522b72f0476413e420739f3d1d311b81efa2953c3eb4b SHA512 4fb7bcbce791d622b6631bf70932ff442028db5283bf0925124d2ef9b0ea3c4c90a8b2246cc0fd3f306becdb73ba7db01dbbc8726fe5a598fb020fec63d81946
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild
index 660a85f76e2a..4a3ad68b5440 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Netkit - timed: Time daemon"
 HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
 SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 LICENSE="BSD GPL-2"
 SLOT="0"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b189a4a74bf8..5a85df02dcfc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 72d68286212d..1c2c168346d0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# John Helmert III <ajak@gentoo.org> (2023-11-25)
+# app-text/gocr has been masked for removal, bug #824290
+media-gfx/xsane ocr
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-11-20)
 # Qt6 is still experimental in freecad, currently the configure phase
 # gets itself stuck by importing both qt5 and qt6 cmake files.
diff --git a/profiles/package.mask b/profiles/package.mask
index 8476225cfcd2..5649cb893a1e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,19 @@
 
 #--- END OF EXAMPLES ---
 
+# John Helmert III <ajak@gentoo.org> (2023-11-25)
+# Multiple vulnerabilities, unmaintained upstream and in Gentoo.
+# subtitleripper included as sole reverse dependency, similarly
+# unmaintained, and with no other reverse dependencies.
+# Removal on 2023-12-24, bug #824290.
+app-text/gocr
+media-video/subtitleripper
+
+# Sam James <sam@gentoo.org> (2023-11-25)
+# Breaks desktop icon rendering, see bug #904468.
+# Upstream bug: https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242
+=xfce-base/xfdesktop-4.19.1
+
 # Sam James <sam@gentoo.org> (2023-11-22)
 # Further bugs with CoW via copy_file_range (bug #917224, https://github.com/openzfs/zfs/issues/15526).
 # The issue is very similar to bug #815469.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 855b41e88a1e..6246c70e2d00 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index feb9a2ad506b..2835562049e6 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -8,5 +8,5 @@ DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9
 DIST openblas-0.3.23.tar.gz 23950794 BLAKE2B 8394e09c682bba10450248cbbe090bb81c26661eac7d238942055ae0eecce752c8a3481af905de9efe20fe635f2c4a0e06af83bb64c998ab410e4cdc56751a47 SHA512 ea64c693e57eb63cc2a88e4d6ab2d8cf9ab84ae6a15048fb12090a3570dd41053e62e99c1ff9d3e02dd67ca93233591ab41b8c017d06585d0a69222e1ad3023f
 EBUILD openblas-0.3.21-r1.ebuild 5639 BLAKE2B 9f42f3af66c8d65d208cff75c03df80df9f9337c55a8c52557e9c6fecbc732cf10a47b36d341bafc0960550fbdc989f263d2aa07a04d7cc1911682ec3953c1b4 SHA512 4a663034ad381724dcaaaabe292d5f5c527c0d66c10f8b7f674ec6d66976d75f072299a90162e04379e6426ca0b4a3967b8ca253e0f125053911b37325f2ad9f
 EBUILD openblas-0.3.23.ebuild 5764 BLAKE2B f12334cd767a6261178a04718f7e58d05e43c4d2e97c3973ea3bd844e65041858d5db1b3641eef733faeade0f41d86c12bcdd9f502dae705f39f9605d7769d69 SHA512 368c95b48c89a424fa0ef07520c3e46e2e3c9bb5eb796a45df3e70d7e41b970a9883c346f711d34617cb88a63a2080e63cffb9ddafb082f56efe61345c0afac9
-EBUILD openblas-0.3.25.ebuild 5900 BLAKE2B faa42541b5ac6face1fc7e677364164277faf782c94f58724d611dc89677f8c7e14d403013c64e32c6cc6423e4bfade8f3d2126fa134993244e54693590f04a0 SHA512 6b2a11aea1face9cc40a2290d8e12874bb5a30a01aaca6365fe498d9b514e66243d6ba1c60e2a94801a3ff9c3e48ba538903dc9076d992593383dfd62494d252
+EBUILD openblas-0.3.25-r1.ebuild 5999 BLAKE2B d41a6ec4c8b0e934fe2b7b855e9ea62403aa2aa39497532d2205bf35c27885c1f1b8c9f8ffa1aebdf2d82923682dd8a83e018edc0998a4e3f11fa41e71bf6929 SHA512 8d6c08dfc365f934511af59edab65132cba84ae8014728cee793b217de38cb07db2b048e527a6b645eccbbe7134c187f9cc9afe79c0023ab7d8db670d59ece4e
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.25.ebuild b/sci-libs/openblas/openblas-0.3.25-r1.ebuild
index 904044a4d4ff..c32ecf3ad4d7 100644
--- a/sci-libs/openblas/openblas-0.3.25.ebuild
+++ b/sci-libs/openblas/openblas-0.3.25-r1.ebuild
@@ -126,7 +126,7 @@ src_compile() {
 	if use index-64bit; then
 		emake -C "${S}-index-64bit" \
 			  INTERFACE64=1 \
-			  LIBPREFIX=libopenblas64
+			  LIBPREFIX=libopenblas64 shared
 	fi
 }
 
@@ -148,15 +148,15 @@ src_install() {
 	if use eselect-ldso; then
 		insinto /usr/$(get_libdir)/blas/openblas/
 		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/openblas/libblas.so
 		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+		dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/openblas/libcblas.so
 
 		insinto /usr/$(get_libdir)/lapack/openblas/
 		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+		dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/openblas/liblapack.so
 		doins interface/liblapacke.so.3
-		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
+		dosym -r /usr/$(get_libdir)/liblapacke.so.3 /usr/$(get_libdir)/lapack/openblas/liblapacke.so
 	fi
 }
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9387ad1b743c..4ec6fe611471 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 3c398fc4c3ef..5fe6683abd49 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,21 +4,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.7-r5.ebuild 5090 BLAKE2B 39974630209630607d10903585223df68cd809fb390fc9eb2a80c4235ce70ae21120083f8eaf749c769a93f738c4e971e31e978dd637a0b87d07260281db4b83 SHA512 6cb37a7eb373d300d165e851e3643fd35e11d78a6a88617b4a8c0063b83558d10d307c32861e9ba2d0ac902c1cd2069ece6bd1446e309a6753f13adf8cd8fa2c
 EBUILD clang-common-15.0.7-r7.ebuild 5462 BLAKE2B 098697c65115e672a1e878167997d820c93cad6a71c5a1dc17c731a031d37f20e50ef41e2f1d3238bc91065ba23bab5db4ab48e8274be9db3cb086ec6cdf7868 SHA512 7500bf0c4fde82b90aac68d09b95a49c241fae8b0d2340f7780e9baed1c85d855e45c4296a7daaa0b831a07f442e0be4faf6510a335fa5c979b3061e28fdb99d
 EBUILD clang-common-16.0.6-r2.ebuild 4972 BLAKE2B 7ce71ef4c5ca19ef5847c90a23662b30e028d97fba045ec64976a3093c94e65bc8b5b04535d2ecf9ec51526fedc6b2b264135162acedcfb6df88cf426ce36357 SHA512 490b4afdc3ebbac15152d8da7cb86b3f2030e7ea1c70b09542f8bfd839d0194b97ee979fffcfb19fba8cca97ecfe565a5e77968b9afd618851772d7ccf444624
-EBUILD clang-common-17.0.4-r1.ebuild 7636 BLAKE2B 93b061d1a20fef63437ce3385c32b5a5c1dac613154b02e266e0763385d5553ac46ca972b8ebb8e84dafcc76e37084f0d60b8e910ec6599e2c798656d61b065a SHA512 88458c8325b9a60eda9e031d1773f1a5dbeabe4da39d3a306bdfab0908143759d1db64b46231089f2b4c4a5da337542c3c250b9c937d82df54058e04560e891a
 EBUILD clang-common-17.0.5-r1.ebuild 7636 BLAKE2B 93b061d1a20fef63437ce3385c32b5a5c1dac613154b02e266e0763385d5553ac46ca972b8ebb8e84dafcc76e37084f0d60b8e910ec6599e2c798656d61b065a SHA512 88458c8325b9a60eda9e031d1773f1a5dbeabe4da39d3a306bdfab0908143759d1db64b46231089f2b4c4a5da337542c3c250b9c937d82df54058e04560e891a
 EBUILD clang-common-18.0.0.9999.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
-EBUILD clang-common-18.0.0_pre20231104-r1.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
-EBUILD clang-common-18.0.0_pre20231111-r1.ebuild 7536 BLAKE2B c0e8010200824a7b6bd2c63682ae1a8ef3bfbc95a6188b6c585e74cdf4013c3082adb640ef2a9d6fe22caca6e685709e38ebfe7089e79a88996b123717089cee SHA512 d85cb3ef7d366b9dcc3163002fd4ccbe59dd03cdc80e2baeb5b1f13bce78204799236e9ddbde4fc0698ab016fb9d287fa174ad068c29eed09e40377eaf898646
 EBUILD clang-common-18.0.0_pre20231119.ebuild 6752 BLAKE2B 2284a2924d3a95030282729976e2b501b4965534a3401dbce2dae1ea95a10a82a927dad62426be98805d9c1b6aff67af6eac079d0e402c509e66766ca339a84f SHA512 d4ade666fc2dac27ed30099565b3defcd69457d29e9156d9e4034b6fa51ce9a6229e767cb319b18f5ec3c18df4905efa75f98c56f242341094aeffbe53547b9c
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-17.0.4-r1.ebuild b/sys-devel/clang-common/clang-common-17.0.4-r1.ebuild
deleted file mode 100644
index 99047721833e..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.4-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2023 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 ~ppc-macos ~x64-macos"
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened
-"
-
-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
-
-	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
-
-	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
-
-	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
-
-	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_ENABLE_ASSERTIONS=1
-		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
-}
-
-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-18.0.0_pre20231104-r1.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20231104-r1.ebuild
deleted file mode 100644
index c70a4d8bd045..000000000000
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20231104-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2023 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 llvm-libunwind
-	hardened
-"
-
-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
-
-	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
-
-	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
-
-	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
-
-	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_ENABLE_HARDENED_MODE=1
-		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
-}
-
-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-18.0.0_pre20231111-r1.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20231111-r1.ebuild
deleted file mode 100644
index c70a4d8bd045..000000000000
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20231111-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2023 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 llvm-libunwind
-	hardened
-"
-
-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
-
-	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
-
-	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
-
-	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
-
-	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_ENABLE_HARDENED_MODE=1
-		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
-}
-
-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-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 22f61bb83616..15e874d9740f 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,10 +1,7 @@
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.6.ebuild 1435 BLAKE2B dfbb6047c0541de72f3447fa61f00d96c2b7c4b96454fa82796f59bd2884ecdbb01539bf08741d3b5ed866b18f4003bca6878cac549b6ef46aa5c6a15bc56c85 SHA512 d63983cb60299866a743ff6b71279b433a10f011fc51e53f3d3d6d6b99dffc080ef0110e21b4dd6b8a54bceb47035d28bf670e6e81fd0939630b593912d77eb5
-EBUILD clang-runtime-17.0.4.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
 EBUILD clang-runtime-17.0.5.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
 EBUILD clang-runtime-18.0.0.9999.ebuild 1339 BLAKE2B 60f0ce6dc250d959f058872d748bbffcbf3f036b3546a8c83c8178d809c9699095f84731fd1195b690b2d9b000c0f2a06d95153d1688809c325abe2f80dad88a SHA512 22d8cdc017390809ad96b917a85639a5c0f687db6737217447f49630004b5dffa8468db92a42f5f3e84788365380dd9b707fc03dcb5b4b102ec7f13b764d5d2c
-EBUILD clang-runtime-18.0.0_pre20231104.ebuild 1339 BLAKE2B 60f0ce6dc250d959f058872d748bbffcbf3f036b3546a8c83c8178d809c9699095f84731fd1195b690b2d9b000c0f2a06d95153d1688809c325abe2f80dad88a SHA512 22d8cdc017390809ad96b917a85639a5c0f687db6737217447f49630004b5dffa8468db92a42f5f3e84788365380dd9b707fc03dcb5b4b102ec7f13b764d5d2c
-EBUILD clang-runtime-18.0.0_pre20231111.ebuild 1339 BLAKE2B 60f0ce6dc250d959f058872d748bbffcbf3f036b3546a8c83c8178d809c9699095f84731fd1195b690b2d9b000c0f2a06d95153d1688809c325abe2f80dad88a SHA512 22d8cdc017390809ad96b917a85639a5c0f687db6737217447f49630004b5dffa8468db92a42f5f3e84788365380dd9b707fc03dcb5b4b102ec7f13b764d5d2c
 EBUILD clang-runtime-18.0.0_pre20231119.ebuild 1339 BLAKE2B 60f0ce6dc250d959f058872d748bbffcbf3f036b3546a8c83c8178d809c9699095f84731fd1195b690b2d9b000c0f2a06d95153d1688809c325abe2f80dad88a SHA512 22d8cdc017390809ad96b917a85639a5c0f687db6737217447f49630004b5dffa8468db92a42f5f3e84788365380dd9b707fc03dcb5b4b102ec7f13b764d5d2c
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.4.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.4.ebuild
deleted file mode 100644
index 6483c7c0c78e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 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 ~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-18.0.0_pre20231104.ebuild b/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 1ce7130b4264..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-18.0.0_pre20231111.ebuild b/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 1ce7130b4264..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 97a00a6faefe..8eaf82e2d782 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -13,22 +13,15 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-14.0.6-r4.ebuild 11939 BLAKE2B c51ff82c0ab846a0b7e5f74460e000b0bab1ce165fbdf33a82da812a1b6adcb0e0a1dc5dcb6a4ff648f401a8507e6a2d6060d601a0620ce42a161b40571ed5ee SHA512 3ac82347c5c97c4ef2103611c4870664bb8f0a00f4d41683dfb165aa15d772941d9bace8157171fd2469e116e5b561549d0db63714ba53c1a440cde878c68588
 EBUILD clang-15.0.7-r1.ebuild 12617 BLAKE2B 780db8dc3c92efab35280d32f6b7d4ffcea912d7839b995a18aa603d0cf59df1199eabd53eb5a475e67da7a45e10fdd08e9879b871a25672f135dbdb001a5f46 SHA512 f6302415c9a4fb8571613ff5ebea4096f1318333ba4bc0f3c0b63b04eb0d10755c4555f55186875db0d34bb5d2c0b245b758aff387b97033bc643a1a291d1195
 EBUILD clang-15.0.7-r3.ebuild 12545 BLAKE2B 5fa553863fb4932189fe38a3bf261b7dc8cce8897d186ca914ba56968b466fc4bbf2cdf05f9f0e92eebdf5fe6d956667399d03efde68192c116a277920d52b32 SHA512 429b0374e9cffda1b964159e8efa2476554395c2a11d584b46e23f9a8c5da6c3f107b2dd4b0c0fe49e7a34fcff001d3164f1971744a1049e984b175c0cae557a
 EBUILD clang-16.0.6.ebuild 12462 BLAKE2B 532fbc03f98a4135371238de3f3d933ac321d4ecccb1e1ce2511563a6529a7bd55444dcdfa4b46140b4b592e1174d534be82e9b29fb1161522253e25c86f75fe SHA512 6e2dc62b7281caf5aa2378eb19f8c24023b62814be4f82e678ee8b98f92cc032de64d5feef0f29c7512aadb34a16b8f50e05a8eadc3bf6663f71504045ad3822
-EBUILD clang-17.0.4.ebuild 12145 BLAKE2B 6470f6623bba6514bc91dd71435414f8e337ac83242c3542fee07848a8e4f95c8c5b16922d2a617855068d970687f84c043da7e7c92164da17833717bf08f3fe SHA512 5853c832b8588ab2a0013dfb4060896eaad5a6d21d7516124d18f6b47ce635a998d3306f0b3ff5f6dcec2aaf27699a142dff6ecb6dfe04790ea10a054b84ac36
 EBUILD clang-17.0.5.ebuild 12145 BLAKE2B 6470f6623bba6514bc91dd71435414f8e337ac83242c3542fee07848a8e4f95c8c5b16922d2a617855068d970687f84c043da7e7c92164da17833717bf08f3fe SHA512 5853c832b8588ab2a0013dfb4060896eaad5a6d21d7516124d18f6b47ce635a998d3306f0b3ff5f6dcec2aaf27699a142dff6ecb6dfe04790ea10a054b84ac36
 EBUILD clang-18.0.0.9999.ebuild 12053 BLAKE2B 82acbf1a0b5b6e40a1541cfc5ebdcfe1f2dc38d4927cb0ada69da41c80c2364477366f5cdaf2c37e9117f3000ab566bd3f47c8fee5b37f26abb1b1c3d535c911 SHA512 0aac9f780dea68b0369fa87ed8537d181dc09d2d40b6e7254bfbf8330f775c1d81c78397bf249a975d80bb50ce23346da3e5b6f6152b29cf548f1ceacf5165be
-EBUILD clang-18.0.0_pre20231104.ebuild 12053 BLAKE2B 82acbf1a0b5b6e40a1541cfc5ebdcfe1f2dc38d4927cb0ada69da41c80c2364477366f5cdaf2c37e9117f3000ab566bd3f47c8fee5b37f26abb1b1c3d535c911 SHA512 0aac9f780dea68b0369fa87ed8537d181dc09d2d40b6e7254bfbf8330f775c1d81c78397bf249a975d80bb50ce23346da3e5b6f6152b29cf548f1ceacf5165be
-EBUILD clang-18.0.0_pre20231111.ebuild 12053 BLAKE2B 82acbf1a0b5b6e40a1541cfc5ebdcfe1f2dc38d4927cb0ada69da41c80c2364477366f5cdaf2c37e9117f3000ab566bd3f47c8fee5b37f26abb1b1c3d535c911 SHA512 0aac9f780dea68b0369fa87ed8537d181dc09d2d40b6e7254bfbf8330f775c1d81c78397bf249a975d80bb50ce23346da3e5b6f6152b29cf548f1ceacf5165be
 EBUILD clang-18.0.0_pre20231119.ebuild 12053 BLAKE2B 82acbf1a0b5b6e40a1541cfc5ebdcfe1f2dc38d4927cb0ada69da41c80c2364477366f5cdaf2c37e9117f3000ab566bd3f47c8fee5b37f26abb1b1c3d535c911 SHA512 0aac9f780dea68b0369fa87ed8537d181dc09d2d40b6e7254bfbf8330f775c1d81c78397bf249a975d80bb50ce23346da3e5b6f6152b29cf548f1ceacf5165be
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-17.0.4.ebuild b/sys-devel/clang/clang-17.0.4.ebuild
deleted file mode 100644
index 336fa7d9fca1..000000000000
--- a/sys-devel/clang/clang-17.0.4.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm llvm.org 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 ~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}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-# 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).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-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() {
-	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-18.0.0_pre20231104.ebuild b/sys-devel/clang/clang-18.0.0_pre20231104.ebuild
deleted file mode 100644
index d99da1e592c9..000000000000
--- a/sys-devel/clang/clang-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm llvm.org 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}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-# 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).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-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() {
-	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-18.0.0_pre20231111.ebuild b/sys-devel/clang/clang-18.0.0_pre20231111.ebuild
deleted file mode 100644
index d99da1e592c9..000000000000
--- a/sys-devel/clang/clang-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm llvm.org 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}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-# 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).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-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() {
-	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 82b4e0d7930b..3e4cdbbca1b9 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
 EBUILD lld-16.0.6.ebuild 2257 BLAKE2B 2e373b90d8ae4ed4131b05eaea51c909705e1132acdab1e21ad2152e66fb18b3caaaa83e9bb64b47f34fdd1ddacc7df622c6e5397c38765d9a2535db59071eba SHA512 a3d75597522d6790257b04fedf41512ab5193f78303efce2d74f03d91910ecb56d60142baa42f27e42759f7e5756c2bfaf394b79c563eb2757b6b23705b9d791
-EBUILD lld-17.0.4.ebuild 2206 BLAKE2B 6eb2452e36c55a5b5224981b85a4788a05a14821279399c466673b530ebd34b52dab499dd631be8813d9f6f67538a248335709b6ac3ca1a49acc970db253b39c SHA512 340f6b4fee7d077fb47618fe0047a47453cb521752a35d1ea801fc0f3bb88bdc79c0b6fe02393874ba3ae3b69a9c8a468ad2b2713f3f4648d47f598403b67349
 EBUILD lld-17.0.5.ebuild 2206 BLAKE2B 6eb2452e36c55a5b5224981b85a4788a05a14821279399c466673b530ebd34b52dab499dd631be8813d9f6f67538a248335709b6ac3ca1a49acc970db253b39c SHA512 340f6b4fee7d077fb47618fe0047a47453cb521752a35d1ea801fc0f3bb88bdc79c0b6fe02393874ba3ae3b69a9c8a468ad2b2713f3f4648d47f598403b67349
 EBUILD lld-18.0.0.9999.ebuild 2146 BLAKE2B df574f3c72fcfaa28051e3ba25a12b614f327bace8ae6828888fa94fdb973a3af3bf537bc5db45107fd52554a45d925292109a7dc9977df1a289dfdeb0ad4ac3 SHA512 8755b02d8f28f24efdadeea29ce97e5e3a71b62e04316f2389767eb0743b33b649206a58586b5f7cdde675cff6323829c7aaca5987f8d573bd353964b4ac10c5
-EBUILD lld-18.0.0_pre20231104.ebuild 2146 BLAKE2B df574f3c72fcfaa28051e3ba25a12b614f327bace8ae6828888fa94fdb973a3af3bf537bc5db45107fd52554a45d925292109a7dc9977df1a289dfdeb0ad4ac3 SHA512 8755b02d8f28f24efdadeea29ce97e5e3a71b62e04316f2389767eb0743b33b649206a58586b5f7cdde675cff6323829c7aaca5987f8d573bd353964b4ac10c5
-EBUILD lld-18.0.0_pre20231111.ebuild 2146 BLAKE2B df574f3c72fcfaa28051e3ba25a12b614f327bace8ae6828888fa94fdb973a3af3bf537bc5db45107fd52554a45d925292109a7dc9977df1a289dfdeb0ad4ac3 SHA512 8755b02d8f28f24efdadeea29ce97e5e3a71b62e04316f2389767eb0743b33b649206a58586b5f7cdde675cff6323829c7aaca5987f8d573bd353964b4ac10c5
 EBUILD lld-18.0.0_pre20231119.ebuild 2146 BLAKE2B df574f3c72fcfaa28051e3ba25a12b614f327bace8ae6828888fa94fdb973a3af3bf537bc5db45107fd52554a45d925292109a7dc9977df1a289dfdeb0ad4ac3 SHA512 8755b02d8f28f24efdadeea29ce97e5e3a71b62e04316f2389767eb0743b33b649206a58586b5f7cdde675cff6323829c7aaca5987f8d573bd353964b4ac10c5
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-17.0.4.ebuild b/sys-devel/lld/lld-17.0.4.ebuild
deleted file mode 100644
index 7289e547c49a..000000000000
--- a/sys-devel/lld/lld-17.0.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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 ~x86"
-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? (
-		>=dev-util/cmake-3.16
-		$(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() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_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_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)
-	)
-
-	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-18.0.0_pre20231104.ebuild b/sys-devel/lld/lld-18.0.0_pre20231104.ebuild
deleted file mode 100644
index c99759356a66..000000000000
--- a/sys-devel/lld/lld-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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? (
-		>=dev-util/cmake-3.16
-		$(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() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_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_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)
-	)
-
-	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-18.0.0_pre20231111.ebuild b/sys-devel/lld/lld-18.0.0_pre20231111.ebuild
deleted file mode 100644
index c99759356a66..000000000000
--- a/sys-devel/lld/lld-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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? (
-		>=dev-util/cmake-3.16
-		$(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() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_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_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)
-	)
-
-	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 0b8b3359baad..dfe93d9a9a77 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD llvm-common-14.0.6.ebuild 1015 BLAKE2B b7d52fa0ab83b5c9bf23d397074f4db30926ad3d13bdf0d2082a23f384c3889a7c356ba220b78970d117a8b46793e3d175d0a794859bb6148c4d6e1bc1c9e82e SHA512 b89e5a11a04a66cf2929354ce65d80c201d85ee1aaa55c197b3671904e126ec941ad7110277734563b376ebc7fecec463c270f8cad8609664f025916d3f39bac
 EBUILD llvm-common-15.0.7.ebuild 1014 BLAKE2B da3b7ec6cd3c1e57758312fb9ea25e693305e1ef72b350eea85fbde5a1e636269d84bd491b6f528aee8a9cb8229f6304b371f99e6ac416c661c6519706b83b61 SHA512 68b9d672372fe71e39f2b8f9d80eb1dcb5138b8b9b961f56a4eeb81b3fc4054448a51a46b3a62547ebb6262425512f39bc146e5f2c3703de10ab520f1594e7a4
 EBUILD llvm-common-16.0.6.ebuild 1021 BLAKE2B 635a5e329ec238346e1bfe715ed088484a33f517a294dd86f822dbc7d225a296f61d72b73be28767c6629516c6237cf1b377320a38c2092796e6d292ece12977 SHA512 64df7235d2bbf73792c6169931b3f5cb90feac9012590bb391b3d2aed67fbe518d08f46fffaf706f478e528b5837178f2e440557b906d6cce832ecaea021dbba
-EBUILD llvm-common-17.0.4.ebuild 1028 BLAKE2B 17b090a472e770e1f63129c30b736d37f1020e7ce498345919724a412b1221fb6512cd6b88261d6760fde413f391264ac903df6a1e45a5a48cf0bdd5371b370c SHA512 472d118c870970130a42a7c632a968406c44fc1161be1a7a0ef76f5344d98c08e56dac7b20fa2972dc162b5e094b22df9e58a74aac355d3e7d034c2aaef64a4b
 EBUILD llvm-common-17.0.5.ebuild 1028 BLAKE2B 17b090a472e770e1f63129c30b736d37f1020e7ce498345919724a412b1221fb6512cd6b88261d6760fde413f391264ac903df6a1e45a5a48cf0bdd5371b370c SHA512 472d118c870970130a42a7c632a968406c44fc1161be1a7a0ef76f5344d98c08e56dac7b20fa2972dc162b5e094b22df9e58a74aac355d3e7d034c2aaef64a4b
 EBUILD llvm-common-18.0.0.9999.ebuild 925 BLAKE2B 6c17c6fa9b0e8713243f77a3ac6079e7bcbcd0cadef14b22a856944e0515a9722d1b843cbcb784c11dd76b4c882c30737932be700bb71389753761e455823a9f SHA512 2a476421a4c6acc172de2016fd96f3c90c0277565ccb84dad5e61f233c947ad9545acb5ac6aef7b139dce9004b70bba10a0a5eb482641a30d6a2ddc6adc74415
-EBUILD llvm-common-18.0.0_pre20231104.ebuild 925 BLAKE2B 6c17c6fa9b0e8713243f77a3ac6079e7bcbcd0cadef14b22a856944e0515a9722d1b843cbcb784c11dd76b4c882c30737932be700bb71389753761e455823a9f SHA512 2a476421a4c6acc172de2016fd96f3c90c0277565ccb84dad5e61f233c947ad9545acb5ac6aef7b139dce9004b70bba10a0a5eb482641a30d6a2ddc6adc74415
-EBUILD llvm-common-18.0.0_pre20231111.ebuild 925 BLAKE2B 6c17c6fa9b0e8713243f77a3ac6079e7bcbcd0cadef14b22a856944e0515a9722d1b843cbcb784c11dd76b4c882c30737932be700bb71389753761e455823a9f SHA512 2a476421a4c6acc172de2016fd96f3c90c0277565ccb84dad5e61f233c947ad9545acb5ac6aef7b139dce9004b70bba10a0a5eb482641a30d6a2ddc6adc74415
 EBUILD llvm-common-18.0.0_pre20231119.ebuild 925 BLAKE2B 6c17c6fa9b0e8713243f77a3ac6079e7bcbcd0cadef14b22a856944e0515a9722d1b843cbcb784c11dd76b4c882c30737932be700bb71389753761e455823a9f SHA512 2a476421a4c6acc172de2016fd96f3c90c0277565ccb84dad5e61f233c947ad9545acb5ac6aef7b139dce9004b70bba10a0a5eb482641a30d6a2ddc6adc74415
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-17.0.4.ebuild b/sys-devel/llvm-common/llvm-common-17.0.4.ebuild
deleted file mode 100644
index b90c15d2e3e5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 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 ~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-18.0.0_pre20231104.ebuild b/sys-devel/llvm-common/llvm-common-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 007885b7ac81..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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-18.0.0_pre20231111.ebuild b/sys-devel/llvm-common/llvm-common-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 007885b7ac81..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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 32f2cfa7533c..470a78275e4e 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -12,20 +12,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD llvm-14.0.6-r4.ebuild 12313 BLAKE2B fc192cd5a0ce4392b3aae13e068522dcac0925cd67afae7c230b150e8ddab3a302dd3dbf5b9eb9ea0092ca8d5464e43f4a37d6e615998fc8259a2fbd669deb44 SHA512 839388316772e70d13ac1b6f72d93171dc698659a79766057a7dc16b191f5f417c919398c9ff09430fb128654452a01fa1dcfce27c60ac29aa11edb5eed3be0b
 EBUILD llvm-15.0.7-r3.ebuild 12486 BLAKE2B 1c62b4a9f7493b3cf9bd2ca388d9c09da2077a5be4b19dba2628352e0524e37df1e3481cc3e0658d3ce8eeb81fe7b4e379be7d5ba9e20a60376616e5a38f6264 SHA512 d6eea0d3330e29a4a27bb758cb5abec08b35f5b0d6a9bacfeddcaf031b0c125ba9454d4eb77a65fe6dd5b379654dd895d603e0a01008b57476502be82ffb392c
 EBUILD llvm-16.0.6.ebuild 12812 BLAKE2B 1063af92819795e6867db4ef9c7f31826df93560b99a56fdc33f315319cc916dde824f2282c74b54430da11a5a9e5428de6552ee57ef0f4bdd4b3c69d3ee230f SHA512 d23327496b4a9d58aa8bae415d85fda284bfc499c3552a272b160bb6f6f85d1300f0e5d536d24c97e58def556e1743ebeae9dc7d718bf6a0a994a63e07054969
-EBUILD llvm-17.0.4.ebuild 13080 BLAKE2B 40b706c98bbe0a3be6b3c68f8a863f93b263f2a11228bd180cc7f25120fe3f9fdbd45a621200f471c17b0384fe2eb9a0847b6462903af4106c032a42cae51199 SHA512 dbd372ab87de2a4c27d471261d13f64cdbc34aa0a901457788e239dfa22b9168914cba80ec17f4f6d3aab95f130f7e81a3f2f789fdb0427ae2eeac229e8ae565
 EBUILD llvm-17.0.5.ebuild 13100 BLAKE2B 054b13ea90105c70a9b40cef1cdee3157515bca2350b5fcf69ea8d81a45fb259c523f70e2306f101b6078e367143c1798acc3d7c5e5391a9c6e15c5053f11768 SHA512 6a1973ec5a0045c65e45e53c8f18230098831c5ba4893c908cdf22f4747f03702e19627cabe1d1c7407ab988d52c74ee83a287f96dccaf1e6af8caaa45585d68
 EBUILD llvm-18.0.0.9999.ebuild 12834 BLAKE2B ac3482d8d907e8416d87ece1c2e34dac0427daab18dcfc5b475fb3ec59713d725495740e3a0bfd9c37cef006993d4add504c29ee0118879c30cb9a0479cbcfa5 SHA512 eac78f66e7b2781c7b15817186e6ac7b2cee696974e7a4946260cb14281f2655cf119f73f3ab30e77e2a324ddc0dae50d028d14311cb02f2dc4fd39b28a4f91f
-EBUILD llvm-18.0.0_pre20231104.ebuild 12834 BLAKE2B ac3482d8d907e8416d87ece1c2e34dac0427daab18dcfc5b475fb3ec59713d725495740e3a0bfd9c37cef006993d4add504c29ee0118879c30cb9a0479cbcfa5 SHA512 eac78f66e7b2781c7b15817186e6ac7b2cee696974e7a4946260cb14281f2655cf119f73f3ab30e77e2a324ddc0dae50d028d14311cb02f2dc4fd39b28a4f91f
-EBUILD llvm-18.0.0_pre20231111.ebuild 12834 BLAKE2B ac3482d8d907e8416d87ece1c2e34dac0427daab18dcfc5b475fb3ec59713d725495740e3a0bfd9c37cef006993d4add504c29ee0118879c30cb9a0479cbcfa5 SHA512 eac78f66e7b2781c7b15817186e6ac7b2cee696974e7a4946260cb14281f2655cf119f73f3ab30e77e2a324ddc0dae50d028d14311cb02f2dc4fd39b28a4f91f
 EBUILD llvm-18.0.0_pre20231119.ebuild 12834 BLAKE2B ac3482d8d907e8416d87ece1c2e34dac0427daab18dcfc5b475fb3ec59713d725495740e3a0bfd9c37cef006993d4add504c29ee0118879c30cb9a0479cbcfa5 SHA512 eac78f66e7b2781c7b15817186e6ac7b2cee696974e7a4946260cb14281f2655cf119f73f3ab30e77e2a324ddc0dae50d028d14311cb02f2dc4fd39b28a4f91f
 MISC metadata.xml 2782 BLAKE2B 4bd546287f630462c3f5d98cbd15a59a4cdef4023f86a5f4fe64fc5f10256cae7014d18823bd0909f4af4e42f299b6e7983c9c3c569cfab1ad38b0160f1eae40 SHA512 6bf1dc4f71f50e1eecc55cbb8366d8ed82a3dd328871acf1d808fc5e3ee4d203d623f81d9968bda45a87c72a2f20ed69b735b0a289b0052b048175cf6502e124
diff --git a/sys-devel/llvm/llvm-17.0.4.ebuild b/sys-devel/llvm/llvm-17.0.4.ebuild
deleted file mode 100644
index a7a24bb390c2..000000000000
--- a/sys-devel/llvm/llvm-17.0.4.ebuild
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake 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 ~ppc-macos ~x64-macos"
-IUSE="
-	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
-	ncurses test xar 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}] )
-	xar? ( app-arch/xar )
-	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
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${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)
-						;;
-					# 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+=(
-			# 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-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			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() {
-	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_ZSTD=$(usex zstd)
-		-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}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-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
-
-	# 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
-	use kernel_Darwin && mycmakeargs+=(
-		-DTerminfo_LIBRARIES=-lncurses
-	)
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	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
-
-	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-18.0.0_pre20231104.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 0fe2c5be8d56..000000000000
--- a/sys-devel/llvm/llvm-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake 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
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-python_check_deps() {
-	use doc || 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)
-						;;
-					# 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+=(
-			# 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() {
-	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_ZSTD=$(usex zstd)
-		-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
-
-	# 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
-	use kernel_Darwin && mycmakeargs+=(
-		-DTerminfo_LIBRARIES=-lncurses
-	)
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	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
-
-	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-18.0.0_pre20231111.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 0fe2c5be8d56..000000000000
--- a/sys-devel/llvm/llvm-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake 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
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	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
-
-python_check_deps() {
-	use doc || 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)
-						;;
-					# 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+=(
-			# 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() {
-	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_ZSTD=$(usex zstd)
-		-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
-
-	# 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
-	use kernel_Darwin && mycmakeargs+=(
-		-DTerminfo_LIBRARIES=-lncurses
-	)
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	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
-
-	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-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index e45575f1fc49..2750bc013fbb 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/firmware-imx/Manifest b/sys-firmware/firmware-imx/Manifest
index 56a76589a060..f8a5f2a28ada 100644
--- a/sys-firmware/firmware-imx/Manifest
+++ b/sys-firmware/firmware-imx/Manifest
@@ -1,5 +1,3 @@
-DIST firmware-imx-5.4.bin 429744 BLAKE2B a573f14d2c7cb35a1129bf5b1ebc31126ebb23b4a5d4ba407ddb432148d34f27e94990ca2b8dbe6083905f3504ca3db19966283b33657e2a2b0b5ed4cd8c0c79 SHA512 0c9d6e80a67d15518212573dbfe8addd6c7c5c8065f077bb58f6904c6d288c718d0b3dc4ed4735941d22bc9116a4986fb268327e2c1adcc6523ff84fa93c6b64
-DIST firmware-imx-8.17.bin 1460231 BLAKE2B 17d790052015675aa972d312f4b8d8dab2d167f48cdd880b31b7bf52f79882bbb1bdfb8fcf49d0b6f41f3cd7c5b88963ea7034ed45e35f9c8db16873fc90ed23 SHA512 88c0866354175bb7b54b15ef58e41e3c51e63ea9eeb1cef1c91cdf180a52e97fb755428180df84bee2e9f0dce9633fb663d4f68caa6c327fb2a3fe508dc4cdf9
-EBUILD firmware-imx-5.4.ebuild 650 BLAKE2B 27a44f6539f6fbc0fce83ed7c4591df1672890ee187558c4c34efa6d9e47acad37675d5592675d6dba3b07b74d05e8c407d7d3bb77f0a3d4ff46c560b9fb800d SHA512 48680e7d94dd4e29f0eed4430d91c770e90c59acd6845ff6862b03bcbbeabaf085f879d0ee88b4f689096453ad0b1e36d6b645aa6d92e2e1bb360441af39e906
-EBUILD firmware-imx-8.17.ebuild 582 BLAKE2B 29d7537b7837c8d4890310c4fa2dddbfc2c7a417fada0eddf0f891e0f5c26632a7ce5f8d173de5e63925d854a5477400757afe965fb99f89e0b45b068a6da067 SHA512 36b6221329de699f1135ca989cba129a7ad5f46c77538bd3317d4e53b90752ab64316b362749872f66551ebcf2de17fcd63d1c38f53c54da723ad2f1fff941f0
+DIST firmware-imx-8.18.bin 1513050 BLAKE2B ce4a8939f11a6580859d208164b225f7ce6bdd225f8488514727bb82360f6edb426a20f61e374cd7e72c32282284a1688368abff683a2907f0dbc12b7ca9379c SHA512 e0b0a73f53e3d97035fadc64f84ba8c3dc73a58db66107cfffc0f9938fa1ad4eb4e1d96a8f23f44ba9711305d5b4dbdf25a9333cce99c6d37aea492d65ae913a
+EBUILD firmware-imx-8.18.ebuild 571 BLAKE2B bf429ebf989f97ab8b8d452f29f5efd8dd3b9495b41afe5deec7f26fd3ea4859644e3e2aec5f539283b3816273f4eefc5e4d875296634061ae0ea9ad3a0d6a89 SHA512 962a972b170ff0f8bd7434fced239f076511a1f645385f8501611b7bd93f7484ebbeaa9653bdbcdd8a0341fd35dc86fc07f8bc27bd940aa9e08481b79afc9f50
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild b/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
deleted file mode 100644
index 106878d131a0..000000000000
--- a/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="NXP i.MX firmware"
-HOMEPAGE="https://www.timesys.com/"
-SRC_URI="http://repository.timesys.com/buildsources/${PN:0:1}/${PN}/${P}/${P}.bin"
-LICENSE="LA_OPT_BASE_LICENSE"
-SLOT="0"
-KEYWORDS="~arm"
-
-S="${WORKDIR}/${P}/firmware"
-
-src_unpack() {
-	eval local $(grep -a -m1 "^filesizes=" "${DISTDIR}/${A}")
-	tail -c"${filesizes}" "${DISTDIR}/${A}" > "${P}.tar.bz2" || die
-	unpack "./${P}.tar.bz2"
-}
-
-src_prepare() {
-	default
-	find -name "*.mk" | xargs rm -v || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r epdc sdma vpu
-}
diff --git a/sys-firmware/firmware-imx/firmware-imx-8.17.ebuild b/sys-firmware/firmware-imx/firmware-imx-8.18.ebuild
index 30bb93a7b840..1ca9ce550781 100644
--- a/sys-firmware/firmware-imx/firmware-imx-8.17.ebuild
+++ b/sys-firmware/firmware-imx/firmware-imx-8.18.ebuild
@@ -20,5 +20,5 @@ src_unpack() {
 
 src_install() {
 	insinto /lib/firmware
-	doins -r epdc sdma vpu
+	doins -r */
 }
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 565520337a08..29d947da2956 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 5f4d77e4fdb7..acdd691624bf 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,20 +6,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6526 BLAKE2B 371b7d7bfbcacce1c04cf039b15f49bf5c8fb7de0352c4f477b92d1efe0c70442770ec0c6b60572cf5877b5c14492328cf727b2aa5c1dea761eb909aa1e1df6c SHA512 ee1f054abb9954eedd5b098afb1eb741cd2d7b1b329ef66ed3f25f8ed050227a31925852e3d893b0a9913e2ef2ac34efe89c66c19b562c586f7c0352a10a5814
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6578 BLAKE2B 79b9477f9f426c7e5ffc07fe9e2abc86ee568d8e081ac5e5e3da3e3e169920fe8c0ce34f9a8ac03a4389f27ecb0b0ff7f5cf91622d614e03300f17ea97d20859 SHA512 9d23f6974edbe69e5d9fa53a3885e8e44741b5e5d90b0e72c6d191b70827d1e590a7c5a3373bc4fb4945a50db0eea5e119baeaeea956c6d92bb087410ce919b0
 EBUILD compiler-rt-sanitizers-16.0.6.ebuild 6546 BLAKE2B a57ff221344f88afa92722a883c5c5eec064b2a9691f2262e633914a75df013c295352b1b1fad83b7fc7579c7d59d6e0f04bc63e1f27556e950438f5f2e72fe7 SHA512 32641d64f2a370bd4b907ff05ebf975d3e149e9bc6372cd60e46ef04463f374984a62002cab76e58acee31f4fcbd0138749bab5c5aa1afd29a8713083b90a402
-EBUILD compiler-rt-sanitizers-17.0.4.ebuild 6328 BLAKE2B 8e81c1a3994b6bb8e5915ccb9b18a91cff3fbf33ee5ae26c6d8e5fce69e67acd4f3aea0f9399fa7b0d9e63537d03ead407c7501478bfc614c9b9ead8074d6d48 SHA512 699bfe7ea1cdfa9fdfe9a17f51f4f86ac73a4c41538bc353f34fd1041c4230c8cbd2cc2e2db12fb9c159174f73d5a4f8a0c32f29a20f2b62728e498bcceb78b9
 EBUILD compiler-rt-sanitizers-17.0.5.ebuild 6328 BLAKE2B 8e81c1a3994b6bb8e5915ccb9b18a91cff3fbf33ee5ae26c6d8e5fce69e67acd4f3aea0f9399fa7b0d9e63537d03ead407c7501478bfc614c9b9ead8074d6d48 SHA512 699bfe7ea1cdfa9fdfe9a17f51f4f86ac73a4c41538bc353f34fd1041c4230c8cbd2cc2e2db12fb9c159174f73d5a4f8a0c32f29a20f2b62728e498bcceb78b9
 EBUILD compiler-rt-sanitizers-18.0.0.9999.ebuild 6238 BLAKE2B 49947c45c94553c2bfd2d0926180422c3485558dcd4d73ad9155eae53757e7ebbb74ad11155a8e3a4a230bd2bd796943ed1f962aa1286391b70d43e6dd56d35f SHA512 51f803a8510300b0771d885f77e86c8d364cac4dad901a4cccf6b0e428798dd7c8135617a09775fe6eeb888e5e4c68be9bcb9c57f4ae0b3b4e0b046f5b337012
-EBUILD compiler-rt-sanitizers-18.0.0_pre20231104.ebuild 6238 BLAKE2B 49947c45c94553c2bfd2d0926180422c3485558dcd4d73ad9155eae53757e7ebbb74ad11155a8e3a4a230bd2bd796943ed1f962aa1286391b70d43e6dd56d35f SHA512 51f803a8510300b0771d885f77e86c8d364cac4dad901a4cccf6b0e428798dd7c8135617a09775fe6eeb888e5e4c68be9bcb9c57f4ae0b3b4e0b046f5b337012
-EBUILD compiler-rt-sanitizers-18.0.0_pre20231111.ebuild 6238 BLAKE2B 49947c45c94553c2bfd2d0926180422c3485558dcd4d73ad9155eae53757e7ebbb74ad11155a8e3a4a230bd2bd796943ed1f962aa1286391b70d43e6dd56d35f SHA512 51f803a8510300b0771d885f77e86c8d364cac4dad901a4cccf6b0e428798dd7c8135617a09775fe6eeb888e5e4c68be9bcb9c57f4ae0b3b4e0b046f5b337012
 EBUILD compiler-rt-sanitizers-18.0.0_pre20231119.ebuild 6238 BLAKE2B 49947c45c94553c2bfd2d0926180422c3485558dcd4d73ad9155eae53757e7ebbb74ad11155a8e3a4a230bd2bd796943ed1f962aa1286391b70d43e6dd56d35f SHA512 51f803a8510300b0771d885f77e86c8d364cac4dad901a4cccf6b0e428798dd7c8135617a09775fe6eeb888e5e4c68be9bcb9c57f4ae0b3b4e0b046f5b337012
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.4.ebuild
deleted file mode 100644
index dde9db9d3f77..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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="
-	>=dev-util/cmake-3.16
-	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
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	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
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# 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-18.0.0_pre20231104.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 74286022a3b1..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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="
-	>=dev-util/cmake-3.16
-	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
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	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
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# 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-18.0.0_pre20231111.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 74286022a3b1..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2023 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 llvm.org 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="
-	>=dev-util/cmake-3.16
-	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
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	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
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# 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 f15289782b48..f3b254c98ce9 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -8,21 +8,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 56b00f1c57cdaf1cd6dd7f15e13c714461001c0c2fb25e565c1677745e3fe6e61714e2f037814fef3eb32ef6866d517c391cb5f63c852ed132d74b1b5b7ef393 SHA512 31cd40fe6c58a6a653d36e99586230c7686ccb2bcdfa1c8ead4331dec2fd8dc53afc2a1e9bdf165dc5b4f7580c8cd25bc7a68acfa9c881fd775187bd82e28f11
 EBUILD compiler-rt-15.0.7.ebuild 4260 BLAKE2B ae8a86217b480bab08dc99d4c5a648bf99a0ef91fb41233956b4a5d1b10d5ed6b3c14d9c02c43e2c0b11dd19f4773ca995c113e48b14475b95b7ee7b821a72d1 SHA512 79da724a1d2483af0dbcc792d008fe994c4fe075db31c7dfcc64192005427137f0157e81345a4027e5a8ba9104f662bc51bf492bca96e1b46c35a44a1849ab84
 EBUILD compiler-rt-16.0.6-r4.ebuild 5236 BLAKE2B 4a3d56946ebefab29b915a864b78d0f8caf8f358fd1929961d76282c34eb9b90bf8a58eeb976637aa918c9bfea9c58144cac0f56ee3fb478e38c6991810f9f0c SHA512 99cf91b7d1de3795d2a85b6d2edb71730ec58a1d69871c1f11ca5ae84ce52a8c59f565866f2296314a5b35e574efb74ad83b07b5c319e325cffe895f59fbc3f2
 EBUILD compiler-rt-16.0.6.ebuild 5208 BLAKE2B afc59515558ee4dcc0f7e0eebe8b281e43c7d6cef68d7301d690dabf3abee2cfb8a47f092cf8f5300c99dba5a9dea307625e960d5c64c5b30a0c25a5eadd1e43 SHA512 0b37254f0b2847adfdc983b1f7394f7ad73d7500e4ca4a333983be4d8e02cd5727244bc7a331c40ddba18196af7b8ec243390c1933c0a1aff18e927d591373d8
-EBUILD compiler-rt-17.0.4.ebuild 5213 BLAKE2B 9823f6b0c4bb686a0c1a4df480d77932d52f63e53af0fd4c2387cc2d8eb8a131949513bbc19df6edd5aa5017bd01e12fafc944f15e602e23019083fa29e17343 SHA512 78961bed6b0a057718ee22dbc537675e384069fe971723c701b12ed4bfd5095b6eb528f08009742a2406a51904a211756045fb0bc63a158c8025ccf2c734d170
 EBUILD compiler-rt-17.0.5-r1.ebuild 5236 BLAKE2B 91bbc05839c3b7422338cd4682fc7ef9b58f35c897ec7abf86a049ac4052967c7c39cd214d3130ff833e900c8e4f02671215e5cc0042be5c4204d0fd33e3d780 SHA512 18d05529953e4f69f23b7739ddcb275e373b4669b2a6d1d3450ae7ddb2edc8cc0e8401945bca73fc231bbe8588a2ca00c63767103ba742aeaa3ac9e9cb43de42
 EBUILD compiler-rt-18.0.0.9999.ebuild 5123 BLAKE2B 34e2efe7cd03de9a7bce246735d016e44eb5b41a4b084bff55ea1fad9048bb9fef6f310f1f113975dc54fd16f8828157a3a3e0e630eadd27dd48edc8c036ae7a SHA512 465d0c7b3b8c15e193c7b122d1feb993a13d02dc450aa652c80f4fa31b53c9c3cd257003c98910e1a0a2448cbe68939d179466d6b16c5a0e7a5302feda255662
-EBUILD compiler-rt-18.0.0_pre20231104.ebuild 5123 BLAKE2B 34e2efe7cd03de9a7bce246735d016e44eb5b41a4b084bff55ea1fad9048bb9fef6f310f1f113975dc54fd16f8828157a3a3e0e630eadd27dd48edc8c036ae7a SHA512 465d0c7b3b8c15e193c7b122d1feb993a13d02dc450aa652c80f4fa31b53c9c3cd257003c98910e1a0a2448cbe68939d179466d6b16c5a0e7a5302feda255662
-EBUILD compiler-rt-18.0.0_pre20231111.ebuild 5123 BLAKE2B 34e2efe7cd03de9a7bce246735d016e44eb5b41a4b084bff55ea1fad9048bb9fef6f310f1f113975dc54fd16f8828157a3a3e0e630eadd27dd48edc8c036ae7a SHA512 465d0c7b3b8c15e193c7b122d1feb993a13d02dc450aa652c80f4fa31b53c9c3cd257003c98910e1a0a2448cbe68939d179466d6b16c5a0e7a5302feda255662
 EBUILD compiler-rt-18.0.0_pre20231119.ebuild 5123 BLAKE2B 34e2efe7cd03de9a7bce246735d016e44eb5b41a4b084bff55ea1fad9048bb9fef6f310f1f113975dc54fd16f8828157a3a3e0e630eadd27dd48edc8c036ae7a SHA512 465d0c7b3b8c15e193c7b122d1feb993a13d02dc450aa652c80f4fa31b53c9c3cd257003c98910e1a0a2448cbe68939d179466d6b16c5a0e7a5302feda255662
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.4.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.4.ebuild
deleted file mode 100644
index 0caa7f0324de..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 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 ~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="
-	>=dev-util/cmake-3.16
-	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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-
-	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_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-18.0.0_pre20231104.ebuild b/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 9c46e6737daa..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 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="
-	>=dev-util/cmake-3.16
-	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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-
-	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_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-18.0.0_pre20231111.ebuild b/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 9c46e6737daa..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 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="
-	>=dev-util/cmake-3.16
-	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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-
-	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_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 255aab3d78e1..fc1d46060991 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,21 +7,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD libcxx-14.0.6.ebuild 6950 BLAKE2B f4f8068f1b9dd1a8c22abd4acb4206da1dd7bb4eb029723a2edfe8c5db3a6ed74a677ba00c508ff54806a33b60b131ffd4b9729ed0d6d0bf5296a1e53e2ababf SHA512 a602e45046d931f28d2656bd733823d3289a993acd7399c5cd29915e65eb9ae0cb601f2774dad34534299366ecd9c038488e037b13af8b732f254e561f56c592
 EBUILD libcxx-15.0.7-r1.ebuild 5308 BLAKE2B aeeee8aab5d3aa09f6165186eafe5bd2802105f763295d4160d81563779999fa03aca891474cd8eae9755ee43ec73bfb7ae3d9fa6d32c7c01040cc46f85858af SHA512 7780ac83f357ffc9d4fc72d2649b2996b7ba5f9473d75ab56e04ccff99a8811c4d14f69de4024fe6472794dc0ed267ee2f34b9430f4d8ed054c65b018abd1778
 EBUILD libcxx-15.0.7.ebuild 5283 BLAKE2B 09c43241bab7e5015d3dae5466e49fb24337b87a6925116056d4ad9baa048c3f23c61a5e93403addfa97676f733a04ef33cc9238fbed9a4abcf985ad8d939965 SHA512 d90583d3fe5724ed15a91c70241457e9120d848e9cbcce2bfb3f3932d9d36ef726830d76601af530e2e28e552d7ad2049dd74713eb54f6eca55206cb4f35f8e2
 EBUILD libcxx-16.0.6.ebuild 5311 BLAKE2B 6ce4c5d11f98384867feb1832a13f790f5e7a447c7d2cbd0d80ac415744fd880b4812ae29f23e9359223a67632e4f6a49f084a429eb53d324afd18d2fb10992f SHA512 c9a9ec7632986467001614271e6d721d08e6a4edd433284900f65f209a053911f669dfe7c5a7d86ba6210d7daf9fad5b10fbc858317393826aece8956c6b652f
-EBUILD libcxx-17.0.4.ebuild 5296 BLAKE2B f6f2b7f309b6ca1441cf39df6409dcbd0eb4b21732aecb457c39f75ea4488da02fe0327f65f9d3444cb0ef0affd9044edf475089611c8674ae54c974fee15df9 SHA512 58ef159a46db7ddcb3fd4bdffcc9938a7ecea7a961ec047938219519f99924fb703d66aa9dcc1a0bb45940d897b3eeb8d18fb223181c6534c9535081dada4377
 EBUILD libcxx-17.0.5.ebuild 5296 BLAKE2B f6f2b7f309b6ca1441cf39df6409dcbd0eb4b21732aecb457c39f75ea4488da02fe0327f65f9d3444cb0ef0affd9044edf475089611c8674ae54c974fee15df9 SHA512 58ef159a46db7ddcb3fd4bdffcc9938a7ecea7a961ec047938219519f99924fb703d66aa9dcc1a0bb45940d897b3eeb8d18fb223181c6534c9535081dada4377
 EBUILD libcxx-18.0.0.9999.ebuild 5229 BLAKE2B 414044942632b1b9f0d0953c2e7a2f337a55a91b5510453040fcd769178fcfa073d64a2ce19eb0f75fd8a3b80fe1bd6cdb8054663781095768e017a675de93f7 SHA512 edd51b15343497111fd96b0e3b838982e0351debf15966b014b66a58d7b76c79fd76ca621f5c1ef8beccc5e697f2b7cd7e74a5a6da5b65d23c2cd54d9dce879b
-EBUILD libcxx-18.0.0_pre20231104.ebuild 5229 BLAKE2B 414044942632b1b9f0d0953c2e7a2f337a55a91b5510453040fcd769178fcfa073d64a2ce19eb0f75fd8a3b80fe1bd6cdb8054663781095768e017a675de93f7 SHA512 edd51b15343497111fd96b0e3b838982e0351debf15966b014b66a58d7b76c79fd76ca621f5c1ef8beccc5e697f2b7cd7e74a5a6da5b65d23c2cd54d9dce879b
-EBUILD libcxx-18.0.0_pre20231111.ebuild 5229 BLAKE2B 414044942632b1b9f0d0953c2e7a2f337a55a91b5510453040fcd769178fcfa073d64a2ce19eb0f75fd8a3b80fe1bd6cdb8054663781095768e017a675de93f7 SHA512 edd51b15343497111fd96b0e3b838982e0351debf15966b014b66a58d7b76c79fd76ca621f5c1ef8beccc5e697f2b7cd7e74a5a6da5b65d23c2cd54d9dce879b
 EBUILD libcxx-18.0.0_pre20231119.ebuild 5229 BLAKE2B 414044942632b1b9f0d0953c2e7a2f337a55a91b5510453040fcd769178fcfa073d64a2ce19eb0f75fd8a3b80fe1bd6cdb8054663781095768e017a675de93f7 SHA512 edd51b15343497111fd96b0e3b838982e0351debf15966b014b66a58d7b76c79fd76ca621f5c1ef8beccc5e697f2b7cd7e74a5a6da5b65d23c2cd54d9dce879b
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-17.0.4.ebuild b/sys-libs/libcxx/libcxx-17.0.4.ebuild
deleted file mode 100644
index 61280232d24e..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.4.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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 ~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-util/cmake-3.16
-		sys-devel/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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	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
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# 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}
-	)
-
-	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-18.0.0_pre20231104.ebuild b/sys-libs/libcxx/libcxx-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 7c12f38c8f48..000000000000
--- a/sys-libs/libcxx/libcxx-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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-util/cmake-3.16
-		sys-devel/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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	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
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# 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}
-	)
-
-	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-18.0.0_pre20231111.ebuild b/sys-libs/libcxx/libcxx-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 7c12f38c8f48..000000000000
--- a/sys-libs/libcxx/libcxx-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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-util/cmake-3.16
-		sys-devel/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() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	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
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# 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}
-	)
-
-	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 7f686e6920f3..54489311afcc 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD libcxxabi-14.0.6.ebuild 3386 BLAKE2B 25c436f437060cdc323ff18e34d8694f558f100f81b990077ed584b7cacabb54fcaa74e67c07179d84dbd8e184f51d157b2bc8d2f48efc607985234b716840f2 SHA512 481c84912363d33b8582b61ed655be3dad86038de100c9ecf072f8bb11d850e25aa587fd43bd19dd84c280a968d2950360115f414f61748d726224aade36da6e
 EBUILD libcxxabi-15.0.7.ebuild 2911 BLAKE2B 5f2004d2f68fe4eddb0b22be82d28fcca7954d0e3ad9a5510744adc4d0dfd7a1ab9fd928404adcd3eeecc58703f51117d0a80e5895b53e0ae7b71621ad5a435c SHA512 5b8e2c6abdec785649aa41b7f05ab86ecab30ff0631d6078c9b1052b406c320c5847b8f16ffa6d9e62ba4a6bca5959b18770810924d6e6da264fb08d6ff738d0
 EBUILD libcxxabi-16.0.6.ebuild 2919 BLAKE2B e281e229f747de5d8f976852b5e4f27126d220f65c9f6a380968a5f0f1957405cd36a2f01211af46c3962a09a8258a03e0a06af63733b0f46663048207034f03 SHA512 debe5dd103de3b600fbd8e58e464e4d11e48e762711ae64406c64d05e6258e5c025ff1bac9f3d10f4cef49abd0058e86696a658f8f82f4000ef749108eb760f2
-EBUILD libcxxabi-17.0.4.ebuild 2924 BLAKE2B b01fff2ad49c475e67e2b83059e1e13001b967f465645b1cc9efb426d171c8f764b98d96f5a102c66fd04802959c7c8700cc67d0830002b458d27401de0efc7b SHA512 e92251295d68ec3424f10d5cbb0ff38260ff44d94e334f59ccd38029909a4efef1fca10066cd2da5df71769781376bd3cf089bb16a7d7c851777b04e0e16bd65
 EBUILD libcxxabi-17.0.5.ebuild 2924 BLAKE2B b01fff2ad49c475e67e2b83059e1e13001b967f465645b1cc9efb426d171c8f764b98d96f5a102c66fd04802959c7c8700cc67d0830002b458d27401de0efc7b SHA512 e92251295d68ec3424f10d5cbb0ff38260ff44d94e334f59ccd38029909a4efef1fca10066cd2da5df71769781376bd3cf089bb16a7d7c851777b04e0e16bd65
 EBUILD libcxxabi-18.0.0.9999.ebuild 2857 BLAKE2B 5514676dd71b90112833a05b424c5d79d70d18cfc1e173eb0dbd80bd32f02ec31ce689bb30fc3aa7e6da22c8ff3b2011769539943f6087a0547fedb48100b9da SHA512 87692a0e19cc9937171167c0d0ecbe46424b0bcbff19f0cb9496387170d9b4eb2c9f1ae767792a61b146e0c8af5a437d7b9ede288d52a1ec3824517f2181a45d
-EBUILD libcxxabi-18.0.0_pre20231104.ebuild 2857 BLAKE2B 5514676dd71b90112833a05b424c5d79d70d18cfc1e173eb0dbd80bd32f02ec31ce689bb30fc3aa7e6da22c8ff3b2011769539943f6087a0547fedb48100b9da SHA512 87692a0e19cc9937171167c0d0ecbe46424b0bcbff19f0cb9496387170d9b4eb2c9f1ae767792a61b146e0c8af5a437d7b9ede288d52a1ec3824517f2181a45d
-EBUILD libcxxabi-18.0.0_pre20231111.ebuild 2857 BLAKE2B 5514676dd71b90112833a05b424c5d79d70d18cfc1e173eb0dbd80bd32f02ec31ce689bb30fc3aa7e6da22c8ff3b2011769539943f6087a0547fedb48100b9da SHA512 87692a0e19cc9937171167c0d0ecbe46424b0bcbff19f0cb9496387170d9b4eb2c9f1ae767792a61b146e0c8af5a437d7b9ede288d52a1ec3824517f2181a45d
 EBUILD libcxxabi-18.0.0_pre20231119.ebuild 2857 BLAKE2B 5514676dd71b90112833a05b424c5d79d70d18cfc1e173eb0dbd80bd32f02ec31ce689bb30fc3aa7e6da22c8ff3b2011769539943f6087a0547fedb48100b9da SHA512 87692a0e19cc9937171167c0d0ecbe46424b0bcbff19f0cb9496387170d9b4eb2c9f1ae767792a61b146e0c8af5a437d7b9ede288d52a1ec3824517f2181a45d
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.4.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.4.ebuild
deleted file mode 100644
index ebcd22d2291b..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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 ~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}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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
-
-	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
-
-		-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-18.0.0_pre20231104.ebuild b/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 7b2c36768873..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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
-
-	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
-
-		-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-18.0.0_pre20231111.ebuild b/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 7b2c36768873..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-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
-
-	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
-
-		-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 374b4b66fc1d..8ba77c0e3689 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,21 +7,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.7-r2.ebuild 3474 BLAKE2B c75fddce61b7e8fe837b4c5bc1b7dacfbe4bc1572537dd7c44c23f894d05b104e8946d896b3b19d78de32a87d866d5911a0f3a8f81796469bba2753d051b2105 SHA512 7dc7c5fd7cd370acadfdf6e15ed09cde0798312ed3c72e770596aecb5817a4ec1477cc1092e3c159d1988bba4200808259705206f80d8fd0019fe07c34f4455d
 EBUILD libomp-15.0.7-r6.ebuild 3480 BLAKE2B 89d638d156dba3a56ad23baef8b14084f1d890ad31980427700a0b04f7199894d24a60df5c40d40815f469ca1e8ac726e0914538bad52ea94702e179cb5bd85d SHA512 005b5f4be5b2433c9c16c483235500ebb22a56e6df70cc53e62ac73aed14cd8c65e2dbcf1457f3cad1d0cb6ca68a7d98e8543803fccf32cd5457f92c0db27df8
 EBUILD libomp-16.0.6.ebuild 3988 BLAKE2B 31eee2f5b764917a62cb307fab6dd0744594dc0ebdc04c359a85eb6372421a42431dd9de792671e1f0d326d798df1bbae5949529a22d7f2a99cae02d6734a37b SHA512 4e62220e10ab0aa1b64ae9557055b1ac6ecc145ae81cbe94445a335ad4e0d7e541dd13db4ffcffaaf80a50e2f13136982828d4d0211e5dc925a0b6ef2a2825a7
-EBUILD libomp-17.0.4.ebuild 3994 BLAKE2B 9dcb5843a7ef3f28c4b174b264b53b7b4e0638d350065fdfa3c4f31249ee393f4ee85fc713760bb968c0af5bc73627b262b196c1007f60d5efe057a50ec57b2c SHA512 d2b8c36bed31960fa4ac18f16e8e9d0653f0f96aba0da306e02ae45da8dbfcf8c92d175696ffbf1a2c580fe8e0ad719a3c6a377f2526baf7be1ba85dbf06fa8f
 EBUILD libomp-17.0.5.ebuild 3994 BLAKE2B 9dcb5843a7ef3f28c4b174b264b53b7b4e0638d350065fdfa3c4f31249ee393f4ee85fc713760bb968c0af5bc73627b262b196c1007f60d5efe057a50ec57b2c SHA512 d2b8c36bed31960fa4ac18f16e8e9d0653f0f96aba0da306e02ae45da8dbfcf8c92d175696ffbf1a2c580fe8e0ad719a3c6a377f2526baf7be1ba85dbf06fa8f
 EBUILD libomp-18.0.0.9999.ebuild 3910 BLAKE2B 9104678d4e75d56a9dcd6f7b1f032130534e49d78d5a99194fe93a064ae1bb734b865fec73da45598c9d91b479b16cc327c577bfb98c17cd061d83b228b3baac SHA512 30343370384efe4791fb91df02f465a64c67a98ad480f5a8e8d3a4d16d7b8a4c5fc564936b8c6b4facbe1443bd34542c76d344a7f7b745ca9b85622917d1c486
-EBUILD libomp-18.0.0_pre20231104.ebuild 3910 BLAKE2B 9104678d4e75d56a9dcd6f7b1f032130534e49d78d5a99194fe93a064ae1bb734b865fec73da45598c9d91b479b16cc327c577bfb98c17cd061d83b228b3baac SHA512 30343370384efe4791fb91df02f465a64c67a98ad480f5a8e8d3a4d16d7b8a4c5fc564936b8c6b4facbe1443bd34542c76d344a7f7b745ca9b85622917d1c486
-EBUILD libomp-18.0.0_pre20231111.ebuild 3910 BLAKE2B 9104678d4e75d56a9dcd6f7b1f032130534e49d78d5a99194fe93a064ae1bb734b865fec73da45598c9d91b479b16cc327c577bfb98c17cd061d83b228b3baac SHA512 30343370384efe4791fb91df02f465a64c67a98ad480f5a8e8d3a4d16d7b8a4c5fc564936b8c6b4facbe1443bd34542c76d344a7f7b745ca9b85622917d1c486
 EBUILD libomp-18.0.0_pre20231119.ebuild 3910 BLAKE2B 9104678d4e75d56a9dcd6f7b1f032130534e49d78d5a99194fe93a064ae1bb734b865fec73da45598c9d91b479b16cc327c577bfb98c17cd061d83b228b3baac SHA512 30343370384efe4791fb91df02f465a64c67a98ad480f5a8e8d3a4d16d7b8a4c5fc564936b8c6b4facbe1443bd34542c76d344a7f7b745ca9b85622917d1c486
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-17.0.4.ebuild b/sys-libs/libomp/libomp-17.0.4.ebuild
deleted file mode 100644
index 8bb70d304c34..000000000000
--- a/sys-libs/libomp/libomp-17.0.4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2023 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 llvm.org
-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() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# 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
-		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-18.0.0_pre20231104.ebuild b/sys-libs/libomp/libomp-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 960f9ce8087f..000000000000
--- a/sys-libs/libomp/libomp-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 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 llvm.org
-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() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# 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
-		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-18.0.0_pre20231111.ebuild b/sys-libs/libomp/libomp-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 960f9ce8087f..000000000000
--- a/sys-libs/libomp/libomp-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 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 llvm.org
-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() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# 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
-		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/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 9732b3b0aafe..f0e07a5cf140 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.6-r1.ebuild 3427 BLAKE2B 64039b2f0476a6b93aba54cca4ef3ad7310a240a4e8b10c6d625eb40a45b8c60cf37eca4391344872ceeed22db0c33d6af5d60b5c3246ff9d395ccc8def87d53 SHA512 77f71992f3749b4e85f8426e073aae6d829aaa5705a7ff5545063823dc7eb12fb70c5ec1c2b691422bcb3a4396c44ef2ba535ada2cf47e15ae825cc894b3726d
-EBUILD llvm-libunwind-17.0.4.ebuild 3433 BLAKE2B 9c688e473a6d03d02c199632e387d7fcf389d9df45d4373bc7a9eb9af9a34d6cb5730578851ce71bb3c55766a024574569b2c0367c7eded9e2461e4b5c07e539 SHA512 c7b771c248e9a47e9ecf81f38ca73eab6cd361413eb829ddbabf1a63842d98a3d10ae3084fc404d18bb36289a42c164c7fb91cf258cb1e3a1d0ff9228a3fb547
 EBUILD llvm-libunwind-17.0.5.ebuild 3433 BLAKE2B 9c688e473a6d03d02c199632e387d7fcf389d9df45d4373bc7a9eb9af9a34d6cb5730578851ce71bb3c55766a024574569b2c0367c7eded9e2461e4b5c07e539 SHA512 c7b771c248e9a47e9ecf81f38ca73eab6cd361413eb829ddbabf1a63842d98a3d10ae3084fc404d18bb36289a42c164c7fb91cf258cb1e3a1d0ff9228a3fb547
 EBUILD llvm-libunwind-18.0.0.9999.ebuild 3355 BLAKE2B ed26a365a02c8fd7c5432b0386240e447dfb719cbb688d3d88cb47f8054c927aca29004a8719bc279cf7ea6b033d8ccb73ccfe6f4c508486f85c622360a5d247 SHA512 33ae579cfc54e35fdf777b760800f5b048395887973a157ee17ddc37fd60a844f09c5dbc550fca3a90bc887eceb72535fbab9a950cab252fe117b034f9b143a3
-EBUILD llvm-libunwind-18.0.0_pre20231104.ebuild 3355 BLAKE2B ed26a365a02c8fd7c5432b0386240e447dfb719cbb688d3d88cb47f8054c927aca29004a8719bc279cf7ea6b033d8ccb73ccfe6f4c508486f85c622360a5d247 SHA512 33ae579cfc54e35fdf777b760800f5b048395887973a157ee17ddc37fd60a844f09c5dbc550fca3a90bc887eceb72535fbab9a950cab252fe117b034f9b143a3
-EBUILD llvm-libunwind-18.0.0_pre20231111.ebuild 3355 BLAKE2B ed26a365a02c8fd7c5432b0386240e447dfb719cbb688d3d88cb47f8054c927aca29004a8719bc279cf7ea6b033d8ccb73ccfe6f4c508486f85c622360a5d247 SHA512 33ae579cfc54e35fdf777b760800f5b048395887973a157ee17ddc37fd60a844f09c5dbc550fca3a90bc887eceb72535fbab9a950cab252fe117b034f9b143a3
 EBUILD llvm-libunwind-18.0.0_pre20231119.ebuild 3355 BLAKE2B ed26a365a02c8fd7c5432b0386240e447dfb719cbb688d3d88cb47f8054c927aca29004a8719bc279cf7ea6b033d8ccb73ccfe6f4c508486f85c622360a5d247 SHA512 33ae579cfc54e35fdf777b760800f5b048395887973a157ee17ddc37fd60a844f09c5dbc550fca3a90bc887eceb72535fbab9a950cab252fe117b034f9b143a3
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.4.ebuild
deleted file mode 100644
index b91c683ce070..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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 ~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}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	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-18.0.0_pre20231104.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20231104.ebuild
deleted file mode 100644
index 8f54197f0751..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	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-18.0.0_pre20231111.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 8f54197f0751..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 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 llvm.org python-any-r1 \
-	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}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	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 04da033e73cb..03391ae20da4 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index f24263f15d8c..465a20db93e1 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -8,5 +8,5 @@ AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
 DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4
 EBUILD procps-3.3.17-r2.ebuild 2587 BLAKE2B a2f0c26b0f1da996566b2798b44789a0e7c9ed6baf7fc248a318036092e180af55da5ff6bb4fd39a907bf3aeeaf66a612350b4f695d4e85355f9e4eaf8a9da91 SHA512 d2f052ab6f3da4cbaa286c63af409c8e6de6aab304249580eb4b243f7b4f2cd6dbb31d6b0ebef2001eabb540d6933d520ec0a6244bbddc036c7e421b417cb317
-EBUILD procps-4.0.4.ebuild 2862 BLAKE2B 339faafc7aa52a32ffbe3889e6eda55626ebd8f075d7463880efa2d6d1a1901966b42db3147895b850159515662ca3a95f1cedb817ac49e1ff13b4e077650c21 SHA512 73c310b6da0b2831ed8c036ead6ac59884de9384f261970780370013672692db0c63f5c7fee110ef3d031303327c40ec78aae7cbb063bc35e33baafccd93aa5c
+EBUILD procps-4.0.4.ebuild 2861 BLAKE2B 83b8f773e670d07e4074c9a16360f65d8a6b30fd3c0f9ae26fdde0dfde7605e1b96cd4dbcf9f53cba27500154371f75ea9b9c888c3c328bd2eb6b41420e31895 SHA512 8c8e6e298e0069eb654cd61c51a4afdf4f23d827b5af31b3baa4d7c10dccdb8557191700b07334bb7e4d88dd390ef6d0bebe55db5601c550710e53ebabf950f9
 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd
diff --git a/sys-process/procps/procps-4.0.4.ebuild b/sys-process/procps/procps-4.0.4.ebuild
index de35e92d943b..2ddcefdad321 100644
--- a/sys-process/procps/procps-4.0.4.ebuild
+++ b/sys-process/procps/procps-4.0.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 # See bug #913210
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/0-ng"
-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="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 REQUIRED_USE="unicode? ( ncurses )"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ed3bb9712ca9..3df90bf9ffc4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 70e324fc93c5..eddb9f5855c6 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbcommon-1.5.0.tar.xz 472700 BLAKE2B 5dcfb514c297f71629f20b444cb29c5d26ce9def1c1173a125fb0c0c259d76194fcef7a407d8efda2d2d87c9b90abac34e2fc1742cfd6053df511a3ef205c8ef SHA512 bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c
 DIST libxkbcommon-1.6.0.tar.xz 510456 BLAKE2B ffd373161f12ea6448a9206f57710355ab65b81ebab5dce74e4dfcee1bdc9175406fc434560648f5933b83cac163099c8564c3add6f51d34856def39ab077850 SHA512 4f93225eada1c5d0806bbc01f72d82d72729f4580ade963ff6a386711c9b2232aae5213c8488abf01c3b81f0e1fdb7f4d8a4d3786113ccc134251ff164c4be5c
 EBUILD libxkbcommon-1.5.0.ebuild 1689 BLAKE2B be1dc727a392d7237ec09380ce2e799cb07abcae3a771460144ca94dd5f5ff753dd23e5550fa1c0a03eeb78c171d3534d5e5f24558e4583ec2a66d2e525f4fdc SHA512 34951734cd4ada20070c688b89fd9f78855fa8d0e104c6302399d6749a1194cd0fe0f3e63fbba4c1125771c3d94edd1184598184995b21e7cb2aae772a1764fa
-EBUILD libxkbcommon-1.6.0.ebuild 1789 BLAKE2B 43b3aaccb8e10076b94579e400dda80f17e4a39385e78fcf061de2d0009ecb275a3013175ee26b367bf6303505115c70603f864d23047f5eaf0a3326eb924460 SHA512 098da4b864dfff14cf0574b6235b134e835733fca6f6ea1bd65576a0df218c08dfc3aa90a60628b74479ff717778d4f11e4f654d4ad07a66241a876b13f64aef
+EBUILD libxkbcommon-1.6.0.ebuild 1788 BLAKE2B c568586b11db7035ab6284833870167d6461debbf8bd72fb6fe10a9bccc0d6541062846f6fe5b8c13655b775d479a511270b3df651c040edd57dc7b646b8cdb8 SHA512 26a9e58add17a0ac7e93d10b5ad7e266aedce62e9e147e94b5ce4b75d82bc16d98c4e03d808340081d056ab93beb63b7c7b77df907b0dca923c944c9aca11350
 MISC metadata.xml 470 BLAKE2B 4edc4923d3888c12474fb659cf1fb1177c600fba9e8fd34fd6be284c979313bb3282d0fa9084c0aee29d9413e68947dd0ee2d241af4e78b2eb06887d2d684f6b SHA512 e19a6e154a79578d5641dfdbef8e963794b14ef0b0f63450dba2d24044e83b517991a72d81598420567978dcecb9d4e4f0eb9e4cf63e0b562d3e41aa80b39a87
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild
index 0aa80fe72f53..3a7244c0b66f 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{10..12} )
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 3da1aca75b15..7ab26b4eb43b 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index b19a6617fbb7..17bcdf400d2e 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,7 @@
 DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b9608113035fdce89a2cb08a674f773f42edc0e1d05a27e89de7df71f7d53f400b794a2a79888cf51570c3ab060db8b SHA512 cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e
+DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
 DIST xfdesktop-4.19.1.tar.bz2 2523196 BLAKE2B fb499192d1c5fbbc78d3e5d9c38aa5a7bc5f19058946be21aafbd5ffe2dc31bb197a4822d92094d914ab01a416409612c39a2478bacfd12e6f2bf98a5ad262c3 SHA512 f07cdcedf8eb47bf14688a88251075ac84a876294f95cf49845f206374f15355d0b641099f402a3a0295c6b737a3d865315c00bb1fec6b0558027faa31f6e19f
 EBUILD xfdesktop-4.18.1.ebuild 1229 BLAKE2B 691a6a3de2235466ef91f577852e84aa7d3504130f5eebc6e2ff2b73ef4c5a009fcea17f3c17a98b4c72592de2823618798c7693d509200be2bd54056db59804 SHA512 e99a10ce8659b2db3841d7cec656900351ec6b5750b015e0060c64bdf2c0c96a76053c41ef0c8e55253540727b2682da081f57a10f92972adb9f43a75449ce51
+EBUILD xfdesktop-4.19.0.ebuild 1392 BLAKE2B 4cf80ea04f7f5d0ae10644c6050f6b8838d96f42fa43d213a6d519d823748c46a978a5f0915d2ed3101a3e765a428f280f29d74bb528dd1c93b2406f865a8388 SHA512 379150ef9c6606f25fdc71758f640163d5c4159776b13171479f21f896ab2fef64df8563afb4438f8eef441ea03f24363ba25054e6ac3d5da98e059b4544cd38
 EBUILD xfdesktop-4.19.1.ebuild 1417 BLAKE2B 7b5b9340edd0754f4a9108e58cd72d8e2632abe1b6eae728ead7d45c7967d2f453f03ef18402864574305435b2c6711f983769a24d352ccde00ba1614842afea SHA512 85600731b7668f2979375911e69848824cea6b172bf33c168979ea5590200db585cece7451aec4efd5450bb61f9a12be15292162928c6865f95e68dd0a6c1927
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
new file mode 100644
index 000000000000..9a65e0082db2
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfdesktop/start
+	https://gitlab.xfce.org/xfce/xfdesktop/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="libnotify +thunar wayland X"
+REQUIRED_USE="|| ( wayland X )"
+
+DEPEND="
+	>=x11-libs/cairo-1.16
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
+	x11-libs/libX11
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/garcon-0.6:=
+	>=xfce-base/libxfce4ui-4.13:=
+	>=xfce-base/libxfce4util-4.13:=
+	>=xfce-base/libxfce4windowing-4.19.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	thunar? ( >=xfce-base/thunar-4.17.10:= )
+	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable wayland gtk-layer-shell)
+		$(use_enable X x11)
+		$(use_enable thunar file-icons)
+		$(use_enable thunar thunarx)
+		$(use_enable libnotify notifications)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-11-25 16:31:33 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-11-25 16:31:33 +0000
commit	8cd3c41aa0ccead302235680b9e2fa9903d7548e (patch)
tree	b6f2658c42bd34d0f1dc8b5f572aa5f5886c3d5d
parent	2900e684ae4bdce1f20652587728095cd01a30a1 (diff)