gentoo auto-resync : 29:08:2023 - 10:04:54

author: V3n3RiX <venerix@koprulu.sector> 2023-08-29 10:04:55 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-08-29 10:04:55 +0100
commit: 20325cfc3bd40d48d3c7034afaac4f5193d9c704 (patch)
tree: b8e6ff7fc02271595e20f956b32cef56c41dafca
parent: 14a6858a7d8bc085420a1430b3a3f67885019f27 (diff)
392 files changed, 2698 insertions, 16382 deletions
diff --git a/Manifest b/Manifest
index 71e2b83ec274..a83a2c6e90d9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29271 BLAKE2B c53f93fafda3f9ddcfff6571c047ee741caf4ccaf0229c2e025930de70f09a9df2486f0ebb9cb11815123354be1bee72b1c752c2bec7ba5449caaedd40bf7817 SHA512 a45ac8976f4a05423d9aa98c10e1d0670cd3905b5214b7c1d36ea960b77a9bc85554ba26589a9661dc1d8ac62d0ee0d11c570ec5ff6cfc88d445ced4e0573946
-TIMESTAMP 2023-08-29T02:39:59Z
+MANIFEST Manifest.files.gz 29300 BLAKE2B fccf88a487eebce15cea524e04c8c704eeba63b14610d1fa50c5bd183b9a1489915dceee52837d9108ce6c4c735463a71c016d62a1c8fa5db0d6d3b8d31e9256 SHA512 d35747d3b22f44e6ccd734d7779cd55986e4f251871c0053e19e7221efc8a46ae5eff0b4e098b92bcf6fa827be78dd54f6d73527978cd50eab211b943d9c42c8
+TIMESTAMP 2023-08-29T08:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtWn9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtruBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB1Ag//U/+svsJg+x91uqAYdJpr7TGAS01dFKNXZh1lqFYknyp1QOME5b4sQpOD
-FXGkzzwFlwXmCIa5aJdjkTiHGjvcPRjuG3GeEzeXLBFxTxKFVtXNCE3l5mxEAf1U
-FuVAGNvXGIOR9ID9MFudwkn3cyaNVfQYBSRpYuAXlQyReg1GMvOY82OqbJ5sWac1
-KDx60wTvJe1ABod2GS1VMt6w+p5iKdbT5B2B9BKer6HcmmeoJZ286AYd9shl5260
-MzjY+SVpc1FdIS2eFaWRY6WYzpXLA+kbcQ/FM0pcOq0hSVp7Wlqsk/NRvPAO3TKp
-rwvkVgZkAc4MxG5OtQWJRNHOnPYDrsM71+/EEOEPmL1wUJ0T0nwnW8LH3LSKvyk9
-8/k5KFFyxjEJQOWdR/6TfkewVs1mgc9ZSmUSjX7MU2lk406tdOkOdiVeH1Yqbfla
-SnuuMmr14AAdmWSJ9VfhRjL8PpmWSeYPuXDPVn+OfnvREC/h20kJo8S9ftpiYq0n
-k5liXKfthSxGH5g16lnFnXZ2/dcWG4hWFZKkrn6jdC6sLFSqAUj4mMgfE76XJLCW
-kgIYCu5N+9yq+oZ494eDqoJ/iU4PlXmFcwdjuHRLZ4MabZxXdy6uwbXHRryVm1FP
-Cbc4evRAQLo/IDxFdsmnNsJOW9ixdBQOGUgU6hK7VlcYLhlijPw=
-=Fyet
+klDwsxAAilkz9QZo6jNIQ3B4pJX2u58rNmPJ9AL/e6tzNrxPl5GnfH6gOi0/ZUhw
+k+o7dJm39crXkiYhbrWy0Z3WzEbcobgUJ5sp54r6b5YUakG/IE/rZFiHN6Tz3DPQ
+Qv2L+1wupy3CFhsINLDmYEYunxbRrxyiOReEsm7b68OLFDQEutRrhHKlWfzljLaE
+xMNMko47uuTA/5wcxssYFtdwGZtxtZpV6wupC7Vv25/46yLK2p5k+JpaiSVkgpVQ
+gZARqswVtopwBIoSg5hXrPlypCyedwF1vFv11lDwrgAtlgeGaeSItQDo3gdoVxQ9
+LWRV72cMWR+LH0yynNY14tEKpS/B+tQZLWwwViVt4iU2PlEoBpTGrX6dnjewoGm5
+7bLm6YVBAr16aty63tW3lw0U+PYY/n1EkyqwUYitvAJi1HL16dJfZhsGEVCWlQSm
+W+bXyO2kvtDRQXK1Pqj5TTrI/mcFc6b84Sxx9f4/3nrAt09HoLqcXylo0ZnR2VDd
+d1nAjbf9h1/vP8lBuxKufQa70hMpoKwxW6/WnlRVyVdEDiwBSWOkGJH2hhX/O1+Z
+QOkGlmCbAFW4VEN58EAF8N4RQvq/aadeofYvVeel4ZJBTinM0J+piM+duzH+QV5y
+s3NnFO63yUcmyDyAf9TFNaZAhR4QI/O3rJg4J3xJWNCEBYjiEI0=
+=smgL
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4e594ac3904e..0d9f07a73f72 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 52694ba8ab82..925255339054 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7ab9692ce7c9..c25c2b8e7435 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -11,6 +11,7 @@ DIST aws-cli-1.29.32.gh.tar.gz 2510913 BLAKE2B bd22cc1fc38963f97a51c6c881986a48d
 DIST aws-cli-1.29.33.gh.tar.gz 2511146 BLAKE2B bd719f8789fd0861ecab4d2ac7def020c90d3f990e8465ce910904ea21f174fef764467374e98537f102658bc3e79b383b8cc12b595874bfa3331cae10880788 SHA512 3d0d55507c9b2cf6a0e088b0338d1a32d3f5377c24833db6001ddc6e0c92d91b5849a66038dd82238a9a98b2d20f8da78daa08ca82c475fa9f0a5190d89e0b60
 DIST aws-cli-1.29.34.gh.tar.gz 2513018 BLAKE2B 74eaa3b94f28d995f8a789421d5a0e8be3dc21359aaf70c932c610239c941361aa62ff0fb43dc4a848a225f42d8d6d88a0a17df793f600ed7db95dfe81f5b917 SHA512 115f82078770c27e1a2e5754505f1712cce7a8ebd83e87e7a3f7fbeac7f552005e7c5a0471914fa584ff4bf6f8394dc9df0779270d162abc4c1a9464d06d9c31
 DIST aws-cli-1.29.35.gh.tar.gz 2513024 BLAKE2B 7802c0eda498235938c5f409076b7706fd3e20e5f337d81366a25bacff9564326acb3edd0d8b1fd36518623a1e6d48d7ee2ee897c8669a3c1b41b8ff202fe9ba SHA512 63a4c20c494dd935dc8f52ddc1d610dfd9fb513f0d262acdb0c85265558d103962c42c757e1e4fd18a70af725186fda7b3caececef574ffa71e89f4c7164d01b
+DIST aws-cli-1.29.36.gh.tar.gz 2513729 BLAKE2B 570f1adaffce44e45006133d6fd6e3ac3a370af0869f59d4123624370d00534e1ee8232916ecf49d50293ba539da3302eab18121006f26bda206725d843a5a06 SHA512 fabfa2e682944cbe7ebf49a9de0779c51543aea9a19f7eb94de6e4b6392a12ade02394d608884dc735eefa536ecfdc37f7699be3a66760932de18b043ee06896
 EBUILD awscli-1.29.15.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.29.20.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.25.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
@@ -24,4 +25,5 @@ EBUILD awscli-1.29.32.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24
 EBUILD awscli-1.29.33.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.34.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.36.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.36.ebuild b/app-admin/awscli/awscli-1.29.36.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.36.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 17788ee073a1..3ccd040e3c6c 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 04dadcbf7d93..d262563a3358 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -3,7 +3,6 @@ AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d7
 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306
 AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672
 AUX clamav-0.103.8-c-std.patch 8067 BLAKE2B a947309c705ed7812e907ababf8533485bf21a5a823aefbf942369e5c0297a46c4c03ebdb0b1c2b7569aa356ac802c3ef7a2b00f87eebbeefa6725a96e17113b SHA512 5b40b1307e8f6cf15bb5aff94ffd709d00e6d5e98ae6a0c31502968d3009b6f0cad9652fc5425525992cd25924f94c64022d8c8e1fb6dcf3f7724d458c53c376
-AUX clamav-1.0.1-select-python.patch 1648 BLAKE2B d43eef80ad607a6cba9cc9f5fe01e1372e5a59b8e9ff55132bc931c021a8ed959fe9170ee93012f726c3d53223aaac745fa35ef69c06d049513f274b25bcf3e5 SHA512 525d471aba58796a92cc3304d2efc37644b0358f1c51fa26619e70c4e4f30e82af1935313491aad39aa24cf6af15f4c606f2914fc0eb8f254f88d503980121cd
 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
 AUX clamav-milter.initd 1164 BLAKE2B 190dee3476f8763dc2498e2099e6afa83c36642298618ad959940771e73c07456e30e6319d649291c82fec49e3712e500a65b167fe91b12bd2758f79f040e1c3 SHA512 d21c60e7d3ee5eee65da18831eed905858a1c7ab4ec02de1c16fa36179d9c1cf517eca8402b872f3d995fa1d59a9b2e79994655ca4570370b40dc810af5e0a3d
 AUX clamav-milter.logrotate-r1 1103 BLAKE2B b506a07f6ebdf697f87060424368ce4e4085564c3fa8e8cc4780ba786f2f543ae51a6e0f9d04db9ea9eb5554c1e395592453235db5abcc243fd2523cb44adec2 SHA512 890744086dcd8d6f7eba0f49df0941c643c6d730ea27a660ecaaab50c51c931489fa25079ad1aa9e307f919ac98a4e5d6b2e952cc46dcea8322b3253c6ba07b1
diff --git a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch b/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch
deleted file mode 100644
index 70bedc029399..000000000000
--- a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch enables us to tell CMake to find a particular python
-impl on a multi-impl system.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,20 +223,26 @@ if(ENABLE_TESTS)
-     find_package(Libcheck REQUIRED)
- 
-     # Used to generate the test files and for the application feature test framework
--    find_package(Python3 REQUIRED)
-+    # In distros that support multiple implementations of python it is helpful to specify the impl to use
-+    if(DEFINED PYTHON_FIND_VERSION)
-+        find_package(Python3 EXACT ${PYTHON_FIND_VERSION} REQUIRED)
-+    else()
-+        find_package(Python3 REQUIRED)
-+        # Not requesting a specific python impl; try using pytest from the PATH
-+        execute_process(
-+            COMMAND pytest --version
-+            RESULT_VARIABLE PYTEST_EXIT_CODE
-+            ERROR_QUIET OUTPUT_QUIET
-+        )
- 
--    # First try using pytest from the PATH
--    execute_process(
--        COMMAND pytest --version
--        RESULT_VARIABLE PYTEST_EXIT_CODE
--        ERROR_QUIET OUTPUT_QUIET
--    )
-+        if(${PYTEST_EXIT_CODE} EQUAL 0)
-+            # pytest found in the path.
-+            set(PythonTest_COMMAND "pytest;-v")
-+        endif()
-+    endif()
- 
--    if(${PYTEST_EXIT_CODE} EQUAL 0)
--        # pytest found in the path.
--        set(PythonTest_COMMAND "pytest;-v")
--    else()
--        # Not in the path, try using: python3 -m pytest
-+    if("${PythonTest_COMMAND}" STREQUAL "")
-+        # Not in the path or specified a python impl; try using: python3 -m pytest
-         execute_process(
-             COMMAND ${Python3_EXECUTABLE} -m pytest --version
-             RESULT_VARIABLE PYTEST_MODULE_EXIT_CODE
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 2139ea8563db..464cd0746cc8 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 0f011c150aa9..b000ffe0eb85 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,13 +1,4 @@
-DIST fzf-0.39.0-deps.tar.xz 16890324 BLAKE2B ddf650dabbefcad339b677ae9196714c81533a338ffe35240acd44db1afdc83d2912fec339ccc90276795b2a7047ec569404483308a9f1ac8050debac3e4e49b SHA512 1944a5088f448d6d69ff567bc77f5a15af1a7df51aae97c4fa53145734c9bfe5ed6c04bf34d6233488247f0e32674a17d8caa7753b04ddb5d77274df6e738609
-DIST fzf-0.39.0.tar.gz 235093 BLAKE2B 4db2877a6c7cc5418b643b572d17350f16794d6e417dd90da5684676ce04a341ce3a7fd3f2e7f6c5d740c9dabfc9c3faca2da2c5b9030e69403d847399f9db1b SHA512 0e8ccb460aeed5b5ccb04bba663b28565666c50a7c974fd0818ab6d6e4a7cd7958f285a47023f632a22417eee2130a670076180590c81f87d67081f39d566e5d
-DIST fzf-0.40.0-deps.tar.xz 16914048 BLAKE2B c095faee297e2226d595f961bd1362c41e1b516eae225df4a25c28e9d0f4a4d65bbcb38db77d19d806cd3944dbbe42385566c3f7d59486fb3bafc3e0f2565073 SHA512 87b4ffa2f87c9d35cde56d6217beceadce94d72d7d8e5cf5a94c0873486ff954ea2e2d70e376a873d7f500af0e154b5e05af1ce745823ce96bd563697fd4ee01
-DIST fzf-0.40.0.tar.gz 236930 BLAKE2B bbdf8d62c5b9f2e1a85c54e55e42d7a93366ff7f25104d1eb3b28dc49933c10bbe9a8bda68a80597f2734ed6888da744000db5b359a9523b40007f04ede06252 SHA512 03a9aae215b06cd2d0c318e7fb13c6e39012091e9773f00cba702323c5fe3b2b0161f48fe552188689be307e2d308c47afed53e1046a7a767bcd49c98c1dbf60
-DIST fzf-0.41.1-deps.tar.xz 16902176 BLAKE2B 96f888a2b00d8156b3423b9074915934b8034183be652cfe0f251cd93b5a44358360a55012c85b07325b193b51dcb266ecb1ec03f966385dfb2d474c7b2065a7 SHA512 0049d82220db6e9fd20d885b3706d6a13dd341d6d6953a7e403d035360612fc594dcc147a01d875302cffeacb977461f385d31ca3020a45cbcb7033f1b661020
-DIST fzf-0.41.1.tar.gz 238333 BLAKE2B 3716cfa9d4001902e0901b837a7389c14a8ebb50c602f07cc6be1f345e085fa5a4bf5a6688cb1d15e927881b2eaa5565a49f700ee72d1abb96204e030c7c43e5 SHA512 2c9bf4f0e9b2772f2f911f5d2cb88715ce63b6029ad1a1eb066bdc670c05cf46a387ff8c019065b043858e82fb0234cce071b01f003f0c3f3f1c7720f1c6aa89
 DIST fzf-0.42.0-deps.tar.xz 16860372 BLAKE2B e2ba9a7deca036587e0f4ff40eabb849f834ca5429261ea365efa87b83eb4c8b62e4c24e27a35d29941c09cf7165fa6f408769132d9583527278fc7029e473c5 SHA512 43b09726e5c5d7d987e6bb905f077dfd2e355b7bbb65eb13f86dc1c586711c1331396ae3c8437990a6facab72aad0ba4aff99fe3f2b293554bbb6942799440d8
 DIST fzf-0.42.0.tar.gz 239469 BLAKE2B cdeb40d08345edaecc20082e5c9d487791260ae18dc824e585f522fdcb004dc645a9a59f8d26c01ffaaffffcee6ea9b7030b5e3a79d22098b3fad55e7ff2f9e7 SHA512 9587b8c9d37abcf1ae85b12d5cf3a1179f57241e3932db6801dee9bb952f83621b780d713c1793ccb4c5c36921b9078e156fe989b3e13664201ed729ea03d414
-EBUILD fzf-0.39.0.ebuild 1982 BLAKE2B 089b1801f24a2792a635aa5a1e5822f43bc4330d6a58024a003b7a0cff3d9446b44e3bc60d7c09373ab3de8555d3ac9130d5d93a6f00cf57a174949cda9ceaaf SHA512 b81e4265912111d6400b2c4889259ffd08b9f5b42d3a6354d24b91bb3f09f9adfaeae299b1ce35667d08b76743a9b17f9d397190b53c8fb3ab2d9de3325e3660
-EBUILD fzf-0.40.0.ebuild 1984 BLAKE2B 20b3d46829789f781a5e102cb79509ceffc4972e1df0a7d58bf5a1735ced5670fd179cc1e29ab4c8aad7bce5c4df80e9b304e57f7bececf42e8dd422330a303a SHA512 60fbc90e97e3bc116d073fd44b732e00ddbba9f0326ec211bdd9876f68fd43546bee8143535aed5d7820135553731aaba710a84c1588e9ba9fbe17a32fc1d88b
-EBUILD fzf-0.41.1.ebuild 1984 BLAKE2B b731a12f4cf64d7dfb4e37d8cffe50361fb46004f8dc2da1ae05243bbf0c4b67971f8441e05651eedaf3c596e78954c8baf7890fffb75f2c58915087030b0af2 SHA512 04e3e1017aec3629d003a675468416cef086ebe7553e9639ae140e7cc7e22cfd7407b764568a2ba09f51d327f3317178ff9667b16700487cca5749564d6871f2
 EBUILD fzf-0.42.0.ebuild 1982 BLAKE2B 33281814ae65706a1b7b398fecf8cf1548d25460e598a7fe2ad6b9bc39fc393ebd9e0f29a012c5c8b77809434e0d15294a0f2dce191c165d9bb18a574895d832 SHA512 d4d7fd0f77f2ff0cde61c291b376c3ce8a5a40c8f717b1008c04d2c028d0f038e44cb35765ddae964f34f31b451455bef72ac952ee5a7257c0984c77734f246f
 MISC metadata.xml 469 BLAKE2B 3d6dcce756d040b715bbf17f33faea2c0ddd810857cb38289f59cab134a5b049d21db71c9c3844497643e1728ecd09a924a51ba273f736712543307f2b806d1a SHA512 21f3fef809b276da7f7ad33dbafefc2ebfa86b9ce9aa0dea664724c399a6743923a8a1825cffbd06d885181dc7b305d351e7ab77bd133abb98f601a84783f52f
diff --git a/app-shells/fzf/fzf-0.39.0.ebuild b/app-shells/fzf/fzf-0.39.0.ebuild
deleted file mode 100644
index 4437c4b0aaac..000000000000
--- a/app-shells/fzf/fzf-0.39.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=20230402d087858ca9a93aa8fe53d289f29c1836
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}
diff --git a/app-shells/fzf/fzf-0.40.0.ebuild b/app-shells/fzf/fzf-0.40.0.ebuild
deleted file mode 100644
index dd5bdcb470a2..000000000000
--- a/app-shells/fzf/fzf-0.40.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=fb76893e18fd567ac45a516f708832ae0f2ad37c
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}
diff --git a/app-shells/fzf/fzf-0.41.1.ebuild b/app-shells/fzf/fzf-0.41.1.ebuild
deleted file mode 100644
index d78ddad4562f..000000000000
--- a/app-shells/fzf/fzf-0.41.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=6eb1874c5a919b63bfebeb9b41f6f004a03df0d7
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug #795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 2ef0e68110f7..b00dffd21fd8 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 33717b87f7d0..b9a1e5a401c4 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -3,5 +3,5 @@ DIST asio-1.26.0.tar.bz2 3201833 BLAKE2B a42297b448423984143ff8e6a1dcc965f0ef058
 DIST asio-1.28.0.tar.bz2 3387977 BLAKE2B dc0431a6710f58ce037d6e6e1cf81606b6f8be3ac9fdf6f7a69a7998fadb4f3c9dace2aa99606a9570166f9637ca7f4b9ab6964599c78027a9f32a9d243d5684 SHA512 b3fa23caa4cbf1e374fade97102adb22a32c68bd4b050474987c065b516fdf042d46842c41ac94e71458f402fae2d05bc8f617ee523ffb6a74ef33d214e9acd5
 EBUILD asio-1.24.0.ebuild 1251 BLAKE2B 90792c9116e9d7833904e9038eb808bf1d8cda71740cacea4a628434fd518ed5959acdc7b46a739c13789b2ce87edc4b8c141a8f3d300c95dd6e60bde7557034 SHA512 c718366902f530001d13d4cf7c7c8b5ba98a26bdd351ea90ea0de54a357a48db9ba725c16907632aa4e5aef060cef8f9605a9e0f971c6261ee7ef6a5260dd13e
 EBUILD asio-1.26.0.ebuild 1251 BLAKE2B f59c8e474e3ddf0e2d44a1fd6adab7d55c610dba0c0857019e3c809e2f105eb207c0675dcc0ef73271c7e3ef40c5e82cae9ffb5369dde133aea758e4eb7be52c SHA512 0887b15e4beca96120572d185a94a6e72a7b754e2ef19869be0910353e032fe9b39dd4c52611f6e0c704022efa3ecdf0f4a637d4297e3b8a75b3c02f76e502e1
-EBUILD asio-1.28.0.ebuild 1280 BLAKE2B 5d3f93f557a7daec6915218feba76be0243e3bec950362a0b6620ad9529780bcef40260a1bca73d0c85c4088ae192b58f24a4172447c878b5ad24b780496c360 SHA512 be57ea35ea53bf8f831696060612d40988c997ae63314689d18a501509a3dba6cc859f5a26614a73a3c7fd9dbe96772fdd1d6d8e47376e396c56466c723e3852
+EBUILD asio-1.28.0.ebuild 1279 BLAKE2B bbe160c5c744ec37fed90f24d7952075b84289bf03846cf846412366b4513e2a3b81ac8806ad97b1543a45d8901ae6d519412bcb375221ccdab4e8d6c105c03d SHA512 dadd93bfa4b3c23a6db00c332feef6c90171e8991877fd68a8d75785125f2b7ff19a07881b856f6b216dbd006c14213d87eff2c77346bef3770be0a5325afdfe
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.28.0.ebuild b/dev-cpp/asio/asio-1.28.0.ebuild
index 0324be315433..527c5fbc08cc 100644
--- a/dev-cpp/asio/asio-1.28.0.ebuild
+++ b/dev-cpp/asio/asio-1.28.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9648d14c6038..599995dd68d6 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c09b241b5b8b..2b410fd2abf3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,3 @@
-AUX mariadb-10.5.17-gcc-13.patch 739 BLAKE2B 9cf3443c3ee69ac057b99928e66e3e1e465bedd450291d346202f786a640e1fd9d8190cad5d0d67a3c4dfaf392ac5f2c7b9ea843ee5d756817a57eb0d3a2b3a5 SHA512 161f8760511a6b480ad9e6d58acc14f4349a70a43443881e066147788367a83265d038150be209d30263043f65ba15dc16dc0560c303e59d3449d0b09378f7fc
-AUX mariadb-10.6.11-configure-clang16.patch 980 BLAKE2B 27589cde3514b5d7c3a4f0a7d0e414d313b08d9780b39eb64f55bcad6be04655d93916b0452c32f8d2e4577b0f26799ce38827df0c4ea62bd3489697de8ab860 SHA512 05d2663e11904e17405e69a0794c6c08b2486602d3a261bc329a7eb267511bc87e4e905b7dc21b4f4111f1f4ab0757193195a87a9660ac80fbe7bb831819a3de
 AUX mariadb-10.6.11-gcc-13.patch 2093 BLAKE2B a61c373848b63123af5760e07c03f919c0dabe2cf2225ef5a1e6de38fc814b597ac8db35dd9cfeaa0425cd2d3fb43b79ba11839e852cb074fe12612868afec1e SHA512 257fdaa306e2fc52174dcf36472383482116e2957f834f9228ad250837e86e8b57fd892153cf0c94b1fb0fd42d6ef6da69402089cf9795835d8a82fffa9b5496
 AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162
 AUX mariadb-10.6.11-include.patch 2044 BLAKE2B 050729672c228818658f45b02ef5a70a8153eb43b7729569edcd7b0c9420a5b16a57359f153862232c634a817a21d0d6a20028104ef5cfdc53f3de25e7e63425 SHA512 cb8150274538fd2e3c26f9fde8fdbf0e8c31c2c26efe9e99ca97d984ae17fe967aabf315c7aee4d2659c3c477eaac604afc948f44de7475ee248cd502dac0fa5
diff --git a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
deleted file mode 100644
index c474028e7e06..000000000000
--- a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/895698
-https://github.com/MariaDB/server/commit/75bbf645a66db797be2abd3a348dce32eb753acc
-
-From 75bbf645a66db797be2abd3a348dce32eb753acc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 24 Jan 2023 21:40:43 -0800
-Subject: [PATCH] Add missing include <cstdio>
-
-This is needed with GCC 13 and newer [1]
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/tpool/aio_linux.cc
-+++ b/tpool/aio_linux.cc
-@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
- #ifdef LINUX_NATIVE_AIO
- # include <thread>
- # include <atomic>
-+# include <cstdio>
- # include <libaio.h>
- # include <sys/syscall.h>
- 
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch b/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
deleted file mode 100644
index cc97319f4bc1..000000000000
--- a/dev-db/mariadb/files/mariadb-10.6.11-configure-clang16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/MariaDB/server/pull/2593
-
-From 50c034d6de4fa508186cb8f75cb6073f5d0ced2f Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 11 Apr 2023 09:39:40 +0200
-Subject: [PATCH] rocksdb: Define _GNU_SOURCE during fallocate CMake probe
-
-The glibc headers declare fallocate only if _GNU_SOURCE is defined.
-Without this change, the probe fails with C compilers which do not
-support implicit function declarations even if the system does in
-fact support the fallocate function.
-
-Upstream rocksdb does not need this because the probe is run with the
-C++ compiler, and current g++ versions define _GNU_SOURCE
-automatically.
---- a/storage/rocksdb/build_rocksdb.cmake
-+++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -134,6 +134,7 @@ option(WITH_FALLOCATE "build with fallocate" ON)
- if(WITH_FALLOCATE AND UNIX)
-   include(CheckCSourceCompiles)
-   CHECK_C_SOURCE_COMPILES("
-+#define _GNU_SOURCE
- #include <fcntl.h>
- #include <linux/falloc.h>
- int main() {
-
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8b304c297671..73f21872601d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index f11f9d5e71b6..f1793d15a16e 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,4 @@
 AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee
-AUX perl-5.34.0-fallback-getcwd-pwd.patch 8158 BLAKE2B a6870b26dbfadb54c5ea4f075a4a5caad8d789853aade84ff434e5d994e9fdd82cdef6314a576b8cdb3a9948aa73aa650c1ff4656e9c8bca4fb58384396332b1 SHA512 fe778c2348da48006927b179d02d33489790f41afa079fabe6350853b2b2d8c168d0db7b81f1b6c988e3ac46d733326aab4aa4423a04d6380acf74eed91cfc5c
 AUX perl-5.36.0-clang16.patch 3850 BLAKE2B f691e7e23b18c5fe32b4f17fc0c786082fb1474fc3c06a46d6ef3b8609f10537b797308f403d4ca394a2666d752421fe2e7c0c224994c5271dd9211ba5d56652 SHA512 17d022d3a5909ecdf5e2c896d9c36caba006c4b3d0ed466a2c679b874210e7f84e0efcbc0ab5eea41e3eda0344fd869af46639ac94a0b943e961fb4044ced966
 AUX perl-5.36.1-http-tiny.patch 3707 BLAKE2B 8fcbf0e1df773ee2ff06fdb3242b007a271c240f019b1bc95c19cc81fcc1756f79b7cf61e70b50eb8e295ab8afaaa5cb361682bacbf8c21e6ff7067c0eba59df SHA512 a9b25496e606c6035781448bc067282a2c38a20fd6418cf91034f730361a9d0ae7c96ace98310a93c6f652a71b8a8b331b85fbdf9bd2c3b6fe82efc25dd27de5
 DIST perl-5.36.0-patches-1.tar.xz 20352 BLAKE2B f5413c75c5bbced230ad7fa692998caef8e4041f3394ae5212dc2aaee465de619b56cf07551be1bb36f2e06b9ed7d0ddda31ad4a7ec81d5c0c64b698ddd80379 SHA512 ab24577b6d71a13d9ccf272efa0881b29933b6a39532ca0d71d4c9a134f451bbe5f3d87c6c851f26114702ac3f92af5c5a72129a458ebee31e372106955eb157
diff --git a/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch b/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch
deleted file mode 100644
index 849a09a39a05..000000000000
--- a/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-https://github.com/Perl/perl5/pull/18791
-https://github.com/Perl/perl5/issues/18703
-https://bugs.gentoo.org/818172
-
-From: Tony Cook <tony@develop-help.com>
-Date: Tue, 4 May 2021 14:55:50 +1000
-Subject: [PATCH 1/4] remove code that assuming finding pwd on the path is
- reasonable
-
-We deliberately clear PATH when invoking pwd, so this search is
-useless.
----
- dist/PathTools/Cwd.pm | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index 6a1d2f17ee57..49c12885b32e 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -213,20 +213,6 @@ sub _backtick_pwd {
- # we take care not to override an existing definition for cwd().
- 
- unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) {
--    # The pwd command is not available in some chroot(2)'ed environments
--    my $sep = $Config::Config{path_sep} || ':';
--    my $os = $^O;  # Protect $^O from tainting
--
--
--    # Try again to find a pwd, this time searching the whole PATH.
--    if (defined $ENV{PATH} and $os ne 'MSWin32') {  # no pwd on Windows
--	my @candidates = split($sep, $ENV{PATH});
--	while (!$found_pwd_cmd and @candidates) {
--	    my $candidate = shift @candidates;
--	    $found_pwd_cmd = 1 if -x "$candidate/pwd";
--	}
--    }
--
-     if( $found_pwd_cmd )
-     {
- 	*cwd = \&_backtick_pwd;
-
-From e5378ea37c6c4910107975d8099c1d552af0c7b3 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 5 May 2021 10:12:31 +1000
-Subject: [PATCH 2/4] don't fallback to simple pwd
-
-When _backtick_pwd invokes $pwd_cmd it first clears the PATH, and since
-the command has no shell metacharacters, it perl won't invoke the
-shell, so it will always fail.
-
-An alternative here might be to use "/bin/sh -c pwd" but there's no
-guarantee that pwd is available as a shell builtin.
----
- dist/PathTools/Cwd.pm | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index 49c12885b32e..fbe683e20b8a 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -181,12 +181,6 @@ if ($^O =~ /android/) {
- }
- 
- my $found_pwd_cmd = defined($pwd_cmd);
--unless ($pwd_cmd) {
--    # Isn't this wrong?  _backtick_pwd() will fail if someone has
--    # pwd in their path but it is not /bin/pwd or /usr/bin/pwd?
--    # See [perl #16774]. --jhi
--    $pwd_cmd = 'pwd';
--}
- 
- # Lazy-load Carp
- sub _carp  { require Carp; Carp::carp(@_)  }
-
-From e14ffd3c21efe708a5fb5e25f29d61ccb6ee0a0a Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Tue, 4 May 2021 15:04:25 +1000
-Subject: [PATCH 3/4] avoid a prototype warning assigning \&getcwd to *cwd
-
-This would produce a warning if we fallback to using getcwd() where
-getcwd() has a prototype.
----
- dist/PathTools/Cwd.pm | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index fbe683e20b8a..b6dc0b798e8c 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -212,7 +212,8 @@ unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) {
- 	*cwd = \&_backtick_pwd;
-     }
-     else {
--	*cwd = \&getcwd;
-+        # getcwd() might have an empty prototype
-+	*cwd = sub { getcwd(); };
-     }
- }
- 
-
-From e725e6ced4d2bbb6a5866992509c2ac3e995c228 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 12 May 2021 12:24:59 +1000
-Subject: [PATCH 4/4] bump PathTools to 3.81
-
----
- dist/PathTools/Cwd.pm                     | 2 +-
- dist/PathTools/lib/File/Spec.pm           | 2 +-
- dist/PathTools/lib/File/Spec/AmigaOS.pm   | 2 +-
- dist/PathTools/lib/File/Spec/Cygwin.pm    | 2 +-
- dist/PathTools/lib/File/Spec/Epoc.pm      | 2 +-
- dist/PathTools/lib/File/Spec/Functions.pm | 2 +-
- dist/PathTools/lib/File/Spec/Mac.pm       | 2 +-
- dist/PathTools/lib/File/Spec/OS2.pm       | 2 +-
- dist/PathTools/lib/File/Spec/Unix.pm      | 2 +-
- dist/PathTools/lib/File/Spec/VMS.pm       | 2 +-
- dist/PathTools/lib/File/Spec/Win32.pm     | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index b6dc0b798e8c..4a9c786c1c3c 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -3,7 +3,7 @@ use strict;
- use Exporter;
- 
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- my $xs_version = $VERSION;
- $VERSION =~ tr/_//d;
- 
-diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
-index 30d883b61b3e..fe738acf58bd 100644
---- a/dist/PathTools/lib/File/Spec.pm
-+++ b/dist/PathTools/lib/File/Spec.pm
-@@ -2,7 +2,7 @@ package File::Spec;
- 
- use strict;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- my %module = (
-diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm b/dist/PathTools/lib/File/Spec/AmigaOS.pm
-index fd9da81cdf5a..1398379ca57c 100644
---- a/dist/PathTools/lib/File/Spec/AmigaOS.pm
-+++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm
-@@ -3,7 +3,7 @@ package File::Spec::AmigaOS;
- use strict;
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
-index 953c23361a10..55d551ce0663 100644
---- a/dist/PathTools/lib/File/Spec/Cygwin.pm
-+++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
-@@ -3,7 +3,7 @@ package File::Spec::Cygwin;
- use strict;
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
-index fcb9e894e33c..4cde744231aa 100644
---- a/dist/PathTools/lib/File/Spec/Epoc.pm
-+++ b/dist/PathTools/lib/File/Spec/Epoc.pm
-@@ -2,7 +2,7 @@ package File::Spec::Epoc;
- 
- use strict;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- require File::Spec::Unix;
-diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
-index e14ad2f74538..4b3d7bbde130 100644
---- a/dist/PathTools/lib/File/Spec/Functions.pm
-+++ b/dist/PathTools/lib/File/Spec/Functions.pm
-@@ -3,7 +3,7 @@ package File::Spec::Functions;
- use File::Spec;
- use strict;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- require Exporter;
-diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
-index 8026edcb1261..51d00a01f6f7 100644
---- a/dist/PathTools/lib/File/Spec/Mac.pm
-+++ b/dist/PathTools/lib/File/Spec/Mac.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
-index 3c35ba99b48a..57d67ba01e93 100644
---- a/dist/PathTools/lib/File/Spec/OS2.pm
-+++ b/dist/PathTools/lib/File/Spec/OS2.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
-index c06d18f46819..df98f580c3ea 100644
---- a/dist/PathTools/lib/File/Spec/Unix.pm
-+++ b/dist/PathTools/lib/File/Spec/Unix.pm
-@@ -3,7 +3,7 @@ package File::Spec::Unix;
- use strict;
- use Cwd ();
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- =head1 NAME
-diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
-index 9b78c8b4bc6e..bbff3ad7d807 100644
---- a/dist/PathTools/lib/File/Spec/VMS.pm
-+++ b/dist/PathTools/lib/File/Spec/VMS.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
-index 153744202338..b38419cdf1a6 100644
---- a/dist/PathTools/lib/File/Spec/Win32.pm
-+++ b/dist/PathTools/lib/File/Spec/Win32.pm
-@@ -5,7 +5,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
- 
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
- 
- our @ISA = qw(File::Spec::Unix);
-
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e2a565631826..532d674d165b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 33d559c9c5ad..49e201d2b50a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,6 +1,7 @@
 AUX elfutils-0.189-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.189-clang16-tests.patch 822 BLAKE2B a1a70176f22d59ec3ad608f48087aa149584bc86066efe16aabfe718a693c6e98557efb706628db780b3f63a7156e4a5b5c1901c9c07b34a5a23af7dea3caea4 SHA512 b74b12a4e0b12444afd320839e09b67d991513dcc66e5ff91b47caa2b729457a5545d0bb5c345c0d4d3e8f4676c227c13a16e48f8c0d53cd1fa1c7d32c80c28d
 AUX elfutils-0.189-configure-bashisms.patch 2086 BLAKE2B 4ecebe40ee2c628bdbd26fce6bfd487517ee8f9590cd2d565f4be34cf9afe67b59fd9cb225039ae911f9cf939783cef0cb623d7264fff07255abe89aed9c509f SHA512 0db8aaafd625cb57b9a7a16c841685b44beaff4b18d9ea15e5adf2e0a7bf14340be7c17ebda9278f1f88ec14e5457b720c4fc4e7e7b81e861fc83059b93b8e3f
+AUX elfutils-0.189-lld-17.patch 941 BLAKE2B 80b9e0376e24aeeceb44db52c908a09b731d33d65247cb65ee377fc77cd9bd9390d5a097f619beffa3609c97b205fd177a24b4cc696348d1a86408e7b71fb815 SHA512 a4ba7f6c0977f8ddfb8b30d1467533200a52f177e0bd6ea0ad5bfd097bfa9b3a1368454987325c4cbdebb81c542980897f31e673406ace7843ec44ca41f135ed
 AUX elfutils-0.189-musl-aarch64-regs.patch 1865 BLAKE2B c177254f31b214d39dc18a9591fca672537475bc8318b3dac6fecea11659f75e89c9c1eaa61b605bce5802ab910fe542645d214c825a28182b26d8d7620208bd SHA512 1eb5975bed830dc83e9375f526176276a5254dd9351853dc4c2c4be66246ea74bb65ae5352ea9f3d7fdf70f8af2b9d953e921dbce7cf94a906cd22272db6adab
 AUX elfutils-0.189-musl-macros.patch 2421 BLAKE2B 23c214481ee441b4f3b66bb5cfd8a5321328136e743ad6b48533b2943d6cc896726d49d0b7493b5b57f0dbdec5bda9dcacf8fef485b0fb58bc24f732920a6e4e SHA512 86b249a14ed5a352acb16115559163d0f762ff718a23ff2989974e28f16f64c7554f3dcf5f6d5557bce524c3142e0e61ba315f1c20ec4106074b4d5901379fb6
 AUX elfutils-0.189-skip-DT_RELR-failing-tests.patch 1184 BLAKE2B c2de6d91ac92e2a5ae956a654a36462f0c2e719f9463d569aceee8f119a7201023f29e5ec68b477fceac31b5b8ece6be24314f856fe49c2b0699df6d4bb1f5c0 SHA512 a6cea47c2010df688b5020ad7b0f9143de0ad4d3202a147271b97b0df816a0c60f494e4ef8907e2fca79f8d59a72d8e049e4a9fa41eb2d2b2d269652a00814bb
@@ -13,4 +14,5 @@ DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb
 EBUILD elfutils-0.188.ebuild 3243 BLAKE2B dc1cb10cb7f1f98d83712f65bcf1805a214f9842073ce577d13eaf93ca40d35835e40b43e141de34582dbcf42ced380e96a9519c87cf3ba7b47dc127e99f7aac SHA512 85a2bf12f568d137c9ab45deb6e08a64f8973b3794008a37deac569d6546d7a567ca80c9d670647b3c7878d21bba06ddfa0a371e32708d0eba6a8a5997fe92a3
 EBUILD elfutils-0.189-r1.ebuild 3422 BLAKE2B c65f89dc0b7c14731a41ded7422ba7b9cca8a7621c6a326ae1c5ef6ac1cc3dea7749daa515cc5fe55d02b91ebc99eb53d885aa4d287287a7addf4b72e5c6a14d SHA512 376f07d803fc63654ee9191dabff410dd78831e000d42dac0f5f8ce80c6206f7610fef20ed7afaf215e0c84aba59bed1a8da8340c42140aa5c68979c93c3eb3d
 EBUILD elfutils-0.189-r3.ebuild 3488 BLAKE2B 1f80612e59b219ec678f3d78bfcc386852a9e99c90b0b70af4009c2296b18d6d6649334a8d98817f33fd9fb3e21e455b570c1af329206dad29db0bdaf49eccef SHA512 cf35e8536c9f8091a384c490a6556d50b851252fa828bae0c59877dbbbea13a3b8e78c8a127bdc9adb3e47c9d58fc93de8d455b89ce1941b92f97abeaa27d4bc
+EBUILD elfutils-0.189-r4.ebuild 3514 BLAKE2B 4ca1c32c33c93dc6bf3b108ecc3b57be0e781b0d9bfb6be9bb2ada57f94e37e96d4f5194eaeaa0533687ac14c4f8bb6e6b86f055d9fcf3db34df9acfdb032535 SHA512 5da846089516db6f0ba708157383befa6c41f4b5c3eb2ffe2866e9d95349b82b6baf52aa312544faf69cd8507557c33e9fb967dd667feb7d210998565ccc8f99
 MISC metadata.xml 680 BLAKE2B f5f2ad88e2f5f7823ea466403cb44888cea12ded4c1364e4c941be9f0e620ff9214973459bd4f70c43540e8f2a5d915c7d6e65ff3b2758c6660af928deb648b3 SHA512 403b91d41f6ff564c66445492c45d41ed4513709e557ac68d447e583b6bc4e22ccafe67f8e998660dfe47e75120c902107fccba90db06d99bd4c72f024bd881c
diff --git a/dev-libs/elfutils/elfutils-0.189-r4.ebuild b/dev-libs/elfutils/elfutils-0.189-r4.ebuild
new file mode 100644
index 000000000000..432483942cf2
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.189-r4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2003-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
+inherit autotools flag-o-matic multilib-minimal verify-sig
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-libs/libelf
+	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	debuginfod? (
+		app-arch/libarchive:=
+		dev-db/sqlite:3=
+		net-libs/libmicrohttpd:=
+
+		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
+	)
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	elibc_musl? (
+		dev-libs/libbsd
+		sys-libs/argp-standalone
+		sys-libs/fts-standalone
+		sys-libs/obstack-standalone
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-elfutils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.189-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.189-skip-DT_RELR-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch
+	"${FILESDIR}"/${PN}-0.189-musl-macros.patch
+	"${FILESDIR}"/${P}-configure-bashisms.patch
+	"${FILESDIR}"/${P}-clang16-tests.patch
+	"${FILESDIR}"/${P}-tests-run-lfs-symbols.sh-needs-gawk.patch
+	"${FILESDIR}"/${P}-lld-17.patch
+)
+
+src_prepare() {
+	default
+
+	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
+	eautoreconf
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	# bug #407135
+	use test && append-flags -g
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(multilib_native_use_enable debuginfod)
+		$(use_enable debuginfod libdebuginfod)
+
+		# explicitly disable thread safety, it's not recommended by upstream
+		# doesn't build either on musl.
+		--disable-thread-safety
+
+		# Valgrind option is just for running tests under it; dodgy under sandbox
+		# and indeed even w/ glibc with newer instructions.
+		--disable-valgrind
+		--program-prefix="eu-"
+		--with-zlib
+		$(use_with bzip2 bzlib)
+		$(use_with lzma)
+		$(use_with zstd)
+	)
+
+	# Needed because sets alignment macro
+	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
+	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	dodoc NOTES
+
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch b/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch
new file mode 100644
index 000000000000..3143bc078d77
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.189-lld-17.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/913112
+https://sourceware.org/PR30729
+https://sourceware.org/git/?p=elfutils.git;a=commit;h=09e61a65953ed814d9e970f7f9ffb9c2d8cda477
+
+From 09e61a65953ed814d9e970f7f9ffb9c2d8cda477 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Mon, 28 Aug 2023 20:23:41 +0200
+Subject: [PATCH] libelf: Remove elf_scncnt from libelf.map
+
+elf_scncnt was never implemented. It was probably an old name for
+elf_getshnum (which was the deprecated name of the elf_getshdrnum
+alias). Just remove it from the map file
+
+	* libelf/libelf.map (ELFUTILS_1.0): Remove elf_scncnt.
+
+https://sourceware.org/PR30729
+
+Reported-by: Kostadin Shishmanov <kocelfc@tutanota.com>
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+--- a/libelf/libelf.map
++++ b/libelf/libelf.map
+@@ -50,7 +50,6 @@ ELFUTILS_1.0 {
+     elf_rand;
+     elf_rawdata;
+     elf_rawfile;
+-    elf_scncnt;
+     elf_strptr;
+     elf_update;
+     elf_version;
+-- 
+2.39.3
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d3dae877b97a..ac88221c5d17 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-17.0.0_rc1.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-17.0.0_rc2.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-17.0.0_rc3.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-18.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-18.0.0_pre20230803.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-18.0.0_pre20230810.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-18.0.0_pre20230820.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-18.0.0_pre20230825.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-17.0.0_rc1.ebuild b/dev-libs/libclc/libclc-17.0.0_rc1.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/dev-libs/libclc/libclc-17.0.0_rc2.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-18.0.0_pre20230820.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=""
-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 2a8c48ee3895..1c907edde5a3 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 534cd00c4f87..1fc7f31d46c1 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-17.0.0_rc1.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-17.0.0_rc2.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-17.0.0_rc3.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-18.0.0_pre20230803.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-18.0.0_pre20230810.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-18.0.0_pre20230820.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0_pre20230825.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_rc1.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_rc2.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230820.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=""
-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-perl/Image-Info/Image-Info-1.440.0.ebuild b/dev-perl/Image-Info/Image-Info-1.440.0.ebuild
new file mode 100644
index 000000000000..49abf4ffc425
--- /dev/null
+++ b/dev-perl/Image-Info/Image-Info-1.440.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SREZIC
+DIST_VERSION=1.44
+DIST_EXAMPLES=("exifdump" "imgdump")
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/IO-stringy-1.01
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+"
+BDEPEND="${RDEPEND}"
+
+PERL_RM_FILES=( "t/pod_cov.t" "t/pod.t" )
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index f5fb8c6373c0..8800e1c40db3 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,5 +1,7 @@
 DIST Image-Info-1.42.tar.gz 321727 BLAKE2B f0d79ea7c4087ab32332a8a6e252e1f358e0ef0d20d73e8fb501724fe51b91d2965dbfd7396ebd8a4c569653efdadb953d77434a73b07686fa82d7b4b5d19070 SHA512 7b17c3510328e062f93f1882c93a4ed24afb6f636d23e9ff1f478e452c9e1cc532c06b639991446442f200696afc63ddde1259afbe4362c3179b515046286133
 DIST Image-Info-1.43.tar.gz 322216 BLAKE2B f0910ed83051aa83c8ddf1f2ad2b70adde3433d486096da50a9ef0eaeb80310f142c2d373b1011733c93cf29bd9db7ec2fecef06356e9305f49843f7c33ee71f SHA512 9e019e807c2ae35d679a54edcd24c240e3f9386bf1a3fa7970ccec22f74a0643cd8f5d348fdb5dc0600ab5259adbd40a32b373d635b1e746d81f02b4d0fd6d39
+DIST Image-Info-1.44.tar.gz 334092 BLAKE2B 9571eee52eade14bd24d06d2618221359b7c1bee56d872dbd5b30171455b84acb5ec4f28bd88a73108bec68967325eaebb4775d4dc1b367747db2b6c1d7248c7 SHA512 893304f4b6ced6752a5588e458eea90ac2e843637eb35379beaed389772bfd5fc2611f4d4a7726454c1c8ad34c75cc6cd696303182ac83597c322619093fe1cc
 EBUILD Image-Info-1.420.0.ebuild 462 BLAKE2B 10ee0bac756256467cd5b9a626324fc68d9969c77a9e38f3021d177b57b9d2e67ad3dcb3ed3267a97ab09e3a3e359f8fd6133323631af92416af04586be161c8 SHA512 35df8fee953325358494c1f18a8f13cc6df3cdeb3bfb4549d1dc7885a1ad88884a4724dfb3a4f0575c12d78f0d854511ef36152e788ef1ba15080146c85c0108
 EBUILD Image-Info-1.430.0.ebuild 462 BLAKE2B 87ee35441425c83ba6198ed45a0d3a8e81376f35ebdd698f537633f110f92536229b807a6e3714e8278897f801815b565098b30ca839be547e399582fa589804 SHA512 c5ad03653b05a62dd02fe28d1b9c483cd7553f1e75b550ac6898d69cb848e69bfab18eb0178d56929ea4fa2088e6089e9841be717959937f62bd25ced8f739d0
+EBUILD Image-Info-1.440.0.ebuild 459 BLAKE2B 8a67b4886a17144ccae37e0b14942228b65a0900d84c50285210b009dad88054c12437678566accf21a3caca7ab36b2921d380b6709e1fd39dc38ba8ea11743a SHA512 708a9f43e492d64016dcb4f18336ab9375b0f23cdda42893b4064ec0e442c148c72049ec4d0143e0d1c87a2c93a3aa733945f55ff44a412d632f18b4232d1e8e
 MISC metadata.xml 1797 BLAKE2B 9b8c363a3167ed925d998d06f95f1afebc61446ce37d63d8f3b197878b50ad555b5a75f020a96ab2a94029603d688228b1d1f3b839ddbef67f7d8e0e42781241 SHA512 15903df8ec47c3f4a4666f5a22555e50cfa35a077779a75658ba2e22d99d022632113f737785b1d1670adf05dee308510894194da69cb34514abc7c8fbd305f3
diff --git a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.6.0.ebuild b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.6.0.ebuild
new file mode 100644
index 000000000000..e4212ce8b7c6
--- /dev/null
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=3.006
+DIST_TEST="do" # parallel tests fail
+inherit perl-module
+
+DESCRIPTION="Mail::Box connector via POP3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	>=dev-perl/Mail-Message-3
+	>=dev-perl/Mail-Box-3
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	!!<dev-perl/Mail-Box-3
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Mail-Box-POP3/Manifest b/dev-perl/Mail-Box-POP3/Manifest
index e4400d83bb13..b5b9749b072f 100644
--- a/dev-perl/Mail-Box-POP3/Manifest
+++ b/dev-perl/Mail-Box-POP3/Manifest
@@ -1,3 +1,5 @@
 DIST Mail-Box-POP3-3.005.tar.gz 31804 BLAKE2B e0ef2d6ed0b19de2f51497af0268bcc5fd78ab6c3027bbcd134edaf942728e4494f11eab8066151d088c933104011af7015383ef408ae6a8ae45367df03d8131 SHA512 cbcda3c9df08d8cf5d279e1b8308885213b75b0af56a3be7c0a5fc769ff60a6c9e6f2cd5ab4ab19532e388e14ceb6b4b62042dea4bb512c31384823004137079
+DIST Mail-Box-POP3-3.006.tar.gz 32679 BLAKE2B e2c91374e5c7472deb955bf36b1393903575f43d59d01453b86ed0c8cd0e654e1071c2cec783b70a657ed1641cb6937b338b112d5b9b48a4c06e83011bdd8cac SHA512 01897da20b53d6078f0f43c0442a0b93a8067cb704c040fb398b4772286c8bba3a97c5aaee2729baeab58575533f3e4a84d7761dc9d9c2173aa7f57ca1c9bcbe
 EBUILD Mail-Box-POP3-3.5.0.ebuild 632 BLAKE2B 8fe1db4c897903fec36efa0807b4fe362fd36e0164ce641f37c087c7fb5986629bbe0bbea49ffe58309aba9c6e538278c1a1235b4d18a2224db79cd9cac715e7 SHA512 70d986ace3504e47e5022ff747da71cb3829d0a8d7a1772ded2114a82e417832015228218c0fb6763dba1627c086bd685825c55bbe8c5fdb7ab50107f2c5e6e1
+EBUILD Mail-Box-POP3-3.6.0.ebuild 638 BLAKE2B 73ff6967bb931b8085a4333a6ad8df4a4ac7827bd4db7a0e4801b97a7345d107e4490c7d078a1a997ae992bce619298ac4fcec6925f207ce1cbeb67cd68be552 SHA512 653b6834e73a8db742c159a9790efd29e942eedd28eaea1d4feaace5282c3b710f7ebec5da5a2d92ce4c2d5c0102371f57404b9ccbc16d010ec313853cf74b54
 MISC metadata.xml 670 BLAKE2B 5316f51c94b20938c4434083094f8ed74d84e9901705eaf33f07c8fc244f4fdf6d2813f785d45abc5160aaf9c92c38beec41996639097c50bbd0d0818ea5420d SHA512 c02a64225c65f6d4f16ffeba52095329e035e4f7a1e584fed9667b0c0de06b4b099b642cf97d649419dddcb8f4a9f095d9fcc1672f577d1bc7d9a0c0c00421e6
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index b044a06fa382..734f55917fc2 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Perl-Strip/Manifest b/dev-perl/Perl-Strip/Manifest
index 8b3f8dbf80c9..e84f2beb498a 100644
--- a/dev-perl/Perl-Strip/Manifest
+++ b/dev-perl/Perl-Strip/Manifest
@@ -1,3 +1,5 @@
 DIST Perl-Strip-1.1.tar.gz 10990 BLAKE2B d11a8f093359368f5b7d9da280390daea1907523bf903e2e2fa172100479c68c6a064178cc459aed1f6785b3400fe9a7e412e617a3d8db47502e5a2080b89799 SHA512 c43ec9afdb6b54eaced8e18bf0b5ed0444ef7f07116c2e798f945500d6fee02e95dfed721b8bda777121494cc1f78a4610a2c3674eb54320c0e035fb23cd1220
+DIST Perl-Strip-1.2.tar.gz 11160 BLAKE2B 7011f9b406c18ca31db80f788d43ac6f9ed8d02ea6a14d8b873af673993da7426d547daa0a73e50ab40c1869636eaba2f9b53d8d8aa383d139bef910f543a398 SHA512 785343db5706a4b1866a63369fa795350c83f94e80aee8f81acd8654085737aae788421cbe8c9653291fcf6caf172612b5de0451de61d41501d3da476dfd5bed
 EBUILD Perl-Strip-1.100.0.ebuild 431 BLAKE2B 90d89222f02eaede27f87010951f96217399207a0f3b862f23cc3d00ce8469cddd8a1f83a9adba2e2de286e8acab739bcc955634bf18eba0457f4d61b5b4d694 SHA512 d0beb19e2f942743898cf7e0795cbe31713c0502d2a6a169593df759052ba12b8b3a709a213399dd1dd588ce6a7eab61698c042266405c5aca5fa083dbff8e54
+EBUILD Perl-Strip-1.200.0.ebuild 438 BLAKE2B 53bcd7b2a87812026888f10782093476de9a7d5fbcf400a4450565b42ede131aa59f7df7db92667c2b7f04b95b9007c95f70fb7f6c7d18bcac0a221b547d3f4f SHA512 21da6f01eba26264a8cc486a98ad25558037980c951324032ff222f462a7b5f8d4baf9df33bb495236d0bb4904028dff9e0b2232524c6df9f002773865f7627c
 MISC metadata.xml 393 BLAKE2B 468a476ee150f0fdd31c82d378cbd0a758a632ce70e609a3460fbc7a57548b52c5725f0f489d1cdf41823f5036b54554d08c75ea8673b71d64336e6f565988e4 SHA512 32769c41b05c0c079c39a0113694b4556973e8bc4d52b0d0f041c7988cf0c8bfede0ee814472b58abdb3b6d6f51f0eb61d09a9f3f003210afba2a90c10b90d24
diff --git a/dev-perl/Perl-Strip/Perl-Strip-1.200.0.ebuild b/dev-perl/Perl-Strip/Perl-Strip-1.200.0.ebuild
new file mode 100644
index 000000000000..51a432700f3a
--- /dev/null
+++ b/dev-perl/Perl-Strip/Perl-Strip-1.200.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.2
+inherit perl-module
+
+DESCRIPTION="reduce file size by stripping whitespace, comments, pod etc"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Digest-MD5-2.0.0
+	>=dev-perl/PPI-1.213.0
+	>=dev-perl/common-sense-3.300.0
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 29d5a8de2fcd..1e430871c29e 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,3 +1,5 @@
 DIST Glib-1.3293.tar.gz 302831 BLAKE2B f2554db363d4966e90f34439c2b014a30ec1fd13add587ac4d72558c2601796e53d8b89de052daea2d5e2a900d2b7928b9005fb9e197e167767b2fe1ff4c4dbf SHA512 139033e207ba9b12eb8701ea9e6e363f6d36e68320cb1a8b4d5943722fe80330594e42fd6d8061794d97dbdb06fdcdd48efea480a254a1e8981ea70e933346d4
+DIST Glib-1.3294.tar.gz 302994 BLAKE2B 26056e26b36399af05cd9af70b8ff9bd47ef5c030a3cd5208e0157266ec6ff157fbef0b15a845c0fad9d1020e9ea8a6f850cb2c94dc4ff9f2c588f4059095dd4 SHA512 f02560fe6de2d98f2b391ed37a60d231cbfdde1cddfcbf614883c61d666dda1264c215220748985cc4cbbe06dbd1b5df35d21c2ce259b46d468a16bffdfd2dae
 EBUILD glib-perl-1.329.300.ebuild 859 BLAKE2B 3d64d3be58218f26dcb1bbbf3fadee8685d8e616045a99a8e3bc24106cba446fab1f977aff9f2abb824edaf29bd5278be7b60d51956ff7f867184dcf803b1214 SHA512 805fe1404d5b518c8c9070512380f0f85c592fb8f3f98e92d3130943c20e84b032dd95ce2aa9b247546b86f6de8ca9c3fd4bc11427e7c7a88212eba69c58c54c
-MISC metadata.xml 1366 BLAKE2B 22fe9a69112a56332288747a0fb9dba65038e2962b691447b9ba4aa25451791355dcd189f6c88099ddab3935e0a1b2a2d199398b9bbf49dee4653cb0bb9931bf SHA512 db6b4c9fb4bf0ccbf6e04d9a1d4a2e8b5fe4b321d57e8282deb6c3bc2185fe5335e09ffe8b92312c89f388e2d335774074a3f281ed924e75a734ea6a0eef2015
+EBUILD glib-perl-1.329.400.ebuild 906 BLAKE2B 181ffbc81089e85f13129626ffe1a1f88fd29a9defbf14f92a4d62fd028a18535e1ed8ab8d4bfd1d7221de7311b16fe8e79a8da8e4a21fdf3740fd782efbfcf8 SHA512 db95530211b66aeb743f5611f095b906b064d2d224ec5e636e65906a314d035aa44be5153c244a9e1eab108173d908bdb0488826e0119e7f861b0ca6d93811c5
+MISC metadata.xml 1429 BLAKE2B 090a36c702673f0e29b5ad9d47d60b11631cf2916b1b42a9f4c86b6d7282719878a41987744fd6be00296abb88f247c4fa1677fd7ba5b825f8464204e1759275 SHA512 20cd72cc646519f15f426591dab6a036b1ff43b43b1f3a764d43b7d34ee2e7aaf39261291e9ce2d3d5e9eed6641cdfb26230b39d11c83b7d67781d4f6931e9b7
diff --git a/dev-perl/glib-perl/glib-perl-1.329.400.ebuild b/dev-perl/glib-perl/glib-perl-1.329.400.ebuild
new file mode 100644
index 000000000000..903c00625ca1
--- /dev/null
+++ b/dev-perl/glib-perl/glib-perl-1.329.400.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=Glib
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.3294
+inherit perl-module
+
+DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
+HOMEPAGE="https://gtk2-perl.sf.net/ https://metacpan.org/release/Glib https://gitlab.gnome.org/GNOME/perl-glib"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2
+"
+DEPEND="${RDEPEND}"
+# Log::Agent optional by Storable but has caused unexplained segv's
+# from build/doc.pl: https://bugs.gentoo.org/529080
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.0.0
+	virtual/pkgconfig
+	dev-perl/Log-Agent
+"
diff --git a/dev-perl/glib-perl/metadata.xml b/dev-perl/glib-perl/metadata.xml
index ede83cf2a4cb..31c038069fff 100644
--- a/dev-perl/glib-perl/metadata.xml
+++ b/dev-perl/glib-perl/metadata.xml
@@ -23,5 +23,6 @@
     <remote-id type="cpan-module">Glib::Object::_LazyLoader</remote-id>
     <remote-id type="cpan-module">Glib::ParseXSDoc</remote-id>
     <remote-id type="cpan-module">Glib::Variant</remote-id>
+    <remote-id type="gnome-gitlab">GNOME/perl-glib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index b28d3120d4d7..a265338b56fa 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 98adb0ec4680..1a29c31df14a 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,3 +1,3 @@
 DIST adodb-5.22.2.tar.gz 443988 BLAKE2B 1166c7b53a5ff39afe8d0a77cf56d2682e7f68d8f52f12ed9bf2519f4a15c626e26b590c7df3066f65bf6bbb7458be502d5a9e9b1ed2663286c51761fd58784c SHA512 50c2784f92e9ac372b34ed32d41efe82341dad09f269603359c50a30c9c301b7e65b2dfa75ae02cc7f12437ef57d8a9575e5a36e68d5b6e225fa1073ead3e339
-EBUILD adodb-5.22.2.ebuild 1453 BLAKE2B 7c8e7820764c54eece5961560c68969c61a449573919cfe6d3e32cb52c1719d7214e695d143f355d4a1cc1cce1e2eeb48015227300bc1071a10d20e8da0b2170 SHA512 ffce664c1d66369046af0e71681a10196a71f28b4b05e56a6d185e5e0534e693110154d1c4f5bece61497e2b468ed1e2d6b552ce308f6066d13e2f69f3de0530
+EBUILD adodb-5.22.2.ebuild 1457 BLAKE2B 1c84ad8d1b2f452ff0727d8c50befaf7a33fb34bf14371dc876bbe672c26ba10e39cbf3a35eaa3cde7811e40f96dcc931b703b156daaf6809fe50ed9ce7026a8 SHA512 4c5de2fcd939a6e2c740b27dad6544eb53f7c4c3f03130c560450f7033928185944f482baf1317921342ca7983be2ec5ff85f2a8309c95e1abfe5bbdbf066309
 MISC metadata.xml 491 BLAKE2B 179eac488892488692b56a5dfc6e8cf081da6bf9bb4c450d872e27bf39bae408e14529b5706005be8e6c3128996278a11c8793eba3ce23562e8783d3e907fb07 SHA512 0bf91e5c93e9dbeef2752d84f3a6860c48e8ff84246c98330623aa4d3e453fd29c560c3a1115e2a1906a255d04a81b79917ace2fa1c426dce1b574a2861a9cd9
diff --git a/dev-php/adodb/adodb-5.22.2.ebuild b/dev-php/adodb/adodb-5.22.2.ebuild
index df7382d87356..0ffad569d070 100644
--- a/dev-php/adodb/adodb-5.22.2.ebuild
+++ b/dev-php/adodb/adodb-5.22.2.ebuild
@@ -31,8 +31,8 @@ src_install() {
 	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
 	DOCS+=" pear/readme.Auth.txt"
 
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
+	dodoc ${DOCS}
+	rm -f ${DOCS} || die "failed to remove docs before installation"
 
 	insinto "/usr/share/php/${PN}"
 	doins *.php
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 876244b9ca26..01a0569006b6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 0a13aeead816..d3a12016390a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -11,6 +11,7 @@ DIST boto3-1.28.32.gh.tar.gz 690385 BLAKE2B 2d5ff74dc8f27d43329796910c6810257f99
 DIST boto3-1.28.33.gh.tar.gz 690686 BLAKE2B 572f5aa0b9a71e39a62fccdce84fa359e0b96d196d983965d335de2299e734239586bfde43c5f48463afddace7d7a91139cabc2737a5b4f3b40684c13112f267 SHA512 2bb4375f5c3d85283a10ff9325b8688ab1e2aceb7be8cd255bc2d054c75eda54df320a85eb4910e0119633e8977158f216df2fdb373c9bb5df8eb7cb4389a4fd
 DIST boto3-1.28.34.gh.tar.gz 692262 BLAKE2B e6382326f74f05c045a3ecacedbef2917dc297343637a70d4947b20b37a33e303bbf751b1f55d7deae581788a0ac2a627b3fdd58629b3ad961030e6095c1eb90 SHA512 340352632d1058d7ed50ce011d2697ed01680d6ee0443fe6fa08813924deffc642d6ec0b076bf9669a98e926fb5467a546ff3c4febe43eec602ab1f2cd51e8d3
 DIST boto3-1.28.35.gh.tar.gz 692481 BLAKE2B fe5c5906598be2aaef8524a0333751bc2368aa33a3c212d45d95b1010f15d228b4b617ad7e855d668f38b9278c32bafc7c5da4395582a053ae3350d4c5453c7b SHA512 790fcb6a0aac9ae37d3d04c707b05d44249b7e265e47ad8fd9195ec338f70297b018f4d3ef34cd704fc3d82564794ea7fb4e5e9057cbae4a969d220eb911981f
+DIST boto3-1.28.36.gh.tar.gz 693285 BLAKE2B 9d25f49ecb213c8f273fff908a125373d6558244dbf03cf716bf871a565ec0a71aa7330af0f64111f4a6191654cacb1c2c60566fb9fd2540aa8df3e4c442e0b9 SHA512 b2ee0a647d9863d251dc613550d10a83f60b0513407d7507b4ef4c9db0aa13e6feb9a24c4f93200553b61d756fb3cef417f43203cb71f3839ed66aae6183af91
 EBUILD boto3-1.28.15.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.28.20.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.28.25.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
@@ -24,5 +25,6 @@ EBUILD boto3-1.28.32.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5ae
 EBUILD boto3-1.28.33.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.34.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.35.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
+EBUILD boto3-1.28.36.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-9999.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.28.36.ebuild b/dev-python/boto3/boto3-1.28.36.ebuild
new file mode 100644
index 000000000000..ec9fc93bf23a
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.36.ebuild
@@ -0,0 +1,66 @@
+# 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.6.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() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 66b573be72ea..c96d761e252c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -11,6 +11,7 @@ DIST botocore-1.31.32.gh.tar.gz 11878306 BLAKE2B 19292e0456f66e4d2b60efb6a6b176f
 DIST botocore-1.31.33.gh.tar.gz 11877895 BLAKE2B feec0dc8b6d7db2630ee381a41e74434baa18c86ef966fc70db2fc8c1edd6d42eb48aeb952cdd1aabd929235747da4ea845dfc8379f9b9841bf5daef9932bc82 SHA512 bb44a0ecc907594f899e64ff04feab3f1ac603902d3ba49ac36100f8cd2e7befe9845c6fabfe2571b32d36d4c370e6f46e164ba5355e0a1fe3d6e249d24b2724
 DIST botocore-1.31.34.gh.tar.gz 11877457 BLAKE2B 1d92e2b3cbddad824d78e374bec5625b946bb3eb2c262a7eff79ed25e40066bdb17408d9f659ecc8923d544583c21335d8f4032f893eddf4c653064c1bc8c0b3 SHA512 b9fbfb0234cd7fcfd196c1bfa07a01b8583bdf0af425c9f4f27d1bdcc1ca0323c9b78444957f839b6d9c3597c1c60dcb3f32c9263598e555375dd1871d734b8c
 DIST botocore-1.31.35.gh.tar.gz 11877715 BLAKE2B 64c90cb764ab47fdf9f644b4819c9fc1486c07ea2b72b8f2b35fc8adbead5efa7fb43140a2008ca21b63e0981017b366588c6f77e8cb5f5e4acef359f0b0e959 SHA512 63f044f7ac2419d2682a838a35a17d9a1a6a56fa7321e181e959923dbeaf41b5396c96a02eaace7421775c25e4ab63822a5fd57e02d618d4644ecbece72286c2
+DIST botocore-1.31.36.gh.tar.gz 11879082 BLAKE2B 61f41aef704321e77a7670a4580a1bb18527a953018c87150826990e557658a4d05d47aca4b464a556dd5866cb6cb8a43c033f87a6cb99812ce3cc3dffad2fbd SHA512 b8bf028993c63026b015cbf5248df25055b5d8a52ff153d16c24bddcf957f3abc1c83610da61e5664fe74cf2e7108193a6038339c8b4beb2bacb4686f806aa8c
 EBUILD botocore-1.31.15.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.31.20.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.31.25.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
@@ -24,5 +25,6 @@ EBUILD botocore-1.31.32.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c
 EBUILD botocore-1.31.33.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.34.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.35.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
+EBUILD botocore-1.31.36.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-9999.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.36.ebuild b/dev-python/botocore/botocore-1.31.36.ebuild
new file mode 100644
index 000000000000..5894fd995097
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.36.ebuild
@@ -0,0 +1,72 @@
+# 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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f6a0aeba3597..02dde64a48e1 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-17.0.0_rc1.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-17.0.0_rc2.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-17.0.0_rc3.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-18.0.0.9999.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-18.0.0_pre20230803.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-18.0.0_pre20230810.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-18.0.0_pre20230820.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-18.0.0_pre20230825.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-17.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-17.0.0_rc1.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-17.0.0_rc2.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20230820.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=""
-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/httpbin/Manifest b/dev-python/httpbin/Manifest
index ac64c4104358..693f24a0cdd2 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -3,7 +3,9 @@ AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b873
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 AUX httpbin-0.7.0-werkzeug-2.1.patch 1158 BLAKE2B 7343f4dbe9886fd54fc8187bc48ed8bd016c03057c4e5de81a46c2389b8d9fdd381f687855dc8ded1d8133a47fb8f09f4ec6c8eae739ca1c157945af97a633c5 SHA512 3d9ed7ab76dc0a33d69cf973e16be7358daa0af0a48d5ac24e0ad6ea8d73a68a796b4c8526ad764c0ed09997448f744f205b909261c32405ff166b359be1fb8b
 DIST httpbin-0.10.0.tar.gz 103729 BLAKE2B 1daff5bd9eba62c224d4fd6030e3c3378f849365d0e94f04e890fe555537580841bb4bc6868d04c0b64599aa09bf697f331b091f6a4c0450f23bf047fd0da887 SHA512 4fae4fe22cb1870acd31f51c25c1bbe946cfe9be88a63f0ba8d7078d2c48089d794726e86290fc41fa38dcf72f8573f054286cb47ab7518e953b7aafa4518215
+DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.10.0.ebuild 942 BLAKE2B e8c39c88fa05c542a18b0524e663d978355792d509a7e0be24e7a15b8392cb9d540f4eb5cb5e58801831352aeec894969523df693e2bfaa20416d0a77a640d22 SHA512 c2f759e92e9ff1ac093f27ffd8f916990b6ec38e80bd63bb0522af03fc6cd8365b0ad6ee942052e38e01eede9f072d869540bb4de813716e360ca421b19089d2
+EBUILD httpbin-0.10.1.ebuild 802 BLAKE2B f2545115ccba0844aa084d1193ebdbe308377e3455dbed061b73b2d69f65cb16c76ab7434007017f89df33c9e04cb0393e7a67bf0cb7a1583785691428ab82d1 SHA512 8c77edcbc318a4baeddffd57984f44aa4a75c850c0dcb2befc18124307e36bb89597c810ffeaddc29420bca2a8ff7cbc85d7419e0f723dc50d71faed95c76f17
 EBUILD httpbin-0.7.0-r5.ebuild 1609 BLAKE2B c5fd5012488a88bcd5a31dfc74a8c776b18e125c957bbad894b42f61d11fb7309f3a80c16a0fb434232884759c05750e5d07549bf0f737ae5bb3f877c9ecaced SHA512 740d37a2f314e8233d492b1cc472a5a2be90a48c80b9197d7056d9928fa03637a5a40b920f82d380684ec1ae8b2f6393bba5e8451992843d29c436fbdf2b0988
 MISC metadata.xml 445 BLAKE2B c577334830bc0d51f9df221e224c231c254b3db9129e4028d53cbd96a4481728e3b721b44f569c243deeecfb38e8dc81a7566a0b7ccd665d51b1a69a3687eb18 SHA512 fcdbd0c24e12d91df89af24befa6c9600f28083c3fe38e88ebec9856f4fb5c4c137c3b85f2271422c513bbd7c31a457f8290ebc2dd755d9117d57aa42883eec8
diff --git a/dev-python/httpbin/httpbin-0.10.1.ebuild b/dev-python/httpbin/httpbin-0.10.1.ebuild
new file mode 100644
index 000000000000..9a3e1438b72c
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.10.1.ebuild
@@ -0,0 +1,32 @@
+# 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="HTTP Request and Response Service"
+HOMEPAGE="
+	https://github.com/psf/httpbin/
+	https://pypi.org/project/httpbin/
+"
+
+LICENSE="|| ( MIT ISC )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~riscv ~s390 ~sparc"
+
+RDEPEND="
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flasgger[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e7ef58ed0995..debd747a1e5d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-6.82.3.gh.tar.gz 9378981 BLAKE2B bb73131f9982e8df71e24a5f329a2f3
 DIST hypothesis-6.82.4.gh.tar.gz 9379010 BLAKE2B 0da8b3ff53f6f2019019ade9a8b42ef62eb90993ca1835b89938d0a36387958e4b32bc6c7ac6345f465682c5fd4d549befa30d083d81fa4af611d16c3df07007 SHA512 22d186203b23409e315bf7341bd51e084785c833318cb32a88c81123cdefb1ae757c89bb025209d36adf720e2a407fe28fabf1d3fb2ae0d2e4363cf69adfe72e
 DIST hypothesis-6.82.5.gh.tar.gz 9378852 BLAKE2B b40cd8cce2c84f535be7f73e91b354fe2688f3bfb8d70f9765de437b8547a77a720ade4263a067e61ee9204ab998cd798917795ea4e7e47c07b897d8bc932434 SHA512 2934c05cb387aff8151a13b03c5a04b07aa54d82a6a41c7e33a2b823f4bb17c534ebaf36672a76392dba7b109ccaf4d808fe7005146ef76f30a1b66e0b7a76c1
 DIST hypothesis-6.82.6.gh.tar.gz 9379121 BLAKE2B f6f6803e07fa10663f9f3ad60915f179acc14dee57f373e36772bb60bf74dcdf1ea20bb251f67394fadeca47cddc33fc8b8950fddd1def1a84c97616d9888331 SHA512 507656462a88a436a1b250cd348770f8e3f359cd9988ea9c97dd98e6f82bf05a827b6cff394da6b7102ddf31b17443d25df31ee2efaf814f08a174617d3e59c0
+DIST hypothesis-6.82.7.gh.tar.gz 9379221 BLAKE2B ccb35d84bd9fe6b68f396575ed7f55ad4a615870bcfd881e60a6d9813b5713f573d947aaaa594c553bd408c9d8709502f5323382a77662a26238114c414feb3d SHA512 b26d459a1b7c5f363830b20d4787f3e7bbac647eb82b94d8d02be3337f77707c6c4de1676b5fb0fabb049b0becab1a73191967ee435cbc096f797fca8cfb0a01
 EBUILD hypothesis-6.81.2.ebuild 2505 BLAKE2B 3300ad59224b47e57e712fe267ffb203a8133ea8a4034475ca10ba245d7601d4eff5f04ed65033fb71277e5a068ceb1a0eaf9f51d8ca7133967d0eb3b2b677ad SHA512 c8b4e2846301c52b8b8f1a7a610051b9ed1b268b806ec6442a0bed45382203e98796a02992f3edcecd1db6dcdc0799a9d6af70c9f58df119388a0898c45bc611
 EBUILD hypothesis-6.82.3.ebuild 2502 BLAKE2B b16e9f92ad6000402fa02a5eb4d1e1367c5359c0b92a213508ced51afc1c93efc34a3eaffe9843eddb66b871ec2cdc009ce6a5990da2ab391b4026386f31387f SHA512 ae1722ba72d73ec70bae25ba9fa00a489ff029b8030e26e6b6d4168043ac7c7ac005db91488b9ea68f015dae929ea0ffd1e18739f7204d36fd3d97bd81b02781
 EBUILD hypothesis-6.82.4.ebuild 2502 BLAKE2B b16e9f92ad6000402fa02a5eb4d1e1367c5359c0b92a213508ced51afc1c93efc34a3eaffe9843eddb66b871ec2cdc009ce6a5990da2ab391b4026386f31387f SHA512 ae1722ba72d73ec70bae25ba9fa00a489ff029b8030e26e6b6d4168043ac7c7ac005db91488b9ea68f015dae929ea0ffd1e18739f7204d36fd3d97bd81b02781
 EBUILD hypothesis-6.82.5.ebuild 2502 BLAKE2B b16e9f92ad6000402fa02a5eb4d1e1367c5359c0b92a213508ced51afc1c93efc34a3eaffe9843eddb66b871ec2cdc009ce6a5990da2ab391b4026386f31387f SHA512 ae1722ba72d73ec70bae25ba9fa00a489ff029b8030e26e6b6d4168043ac7c7ac005db91488b9ea68f015dae929ea0ffd1e18739f7204d36fd3d97bd81b02781
 EBUILD hypothesis-6.82.6.ebuild 2502 BLAKE2B b16e9f92ad6000402fa02a5eb4d1e1367c5359c0b92a213508ced51afc1c93efc34a3eaffe9843eddb66b871ec2cdc009ce6a5990da2ab391b4026386f31387f SHA512 ae1722ba72d73ec70bae25ba9fa00a489ff029b8030e26e6b6d4168043ac7c7ac005db91488b9ea68f015dae929ea0ffd1e18739f7204d36fd3d97bd81b02781
+EBUILD hypothesis-6.82.7.ebuild 2502 BLAKE2B b16e9f92ad6000402fa02a5eb4d1e1367c5359c0b92a213508ced51afc1c93efc34a3eaffe9843eddb66b871ec2cdc009ce6a5990da2ab391b4026386f31387f SHA512 ae1722ba72d73ec70bae25ba9fa00a489ff029b8030e26e6b6d4168043ac7c7ac005db91488b9ea68f015dae929ea0ffd1e18739f7204d36fd3d97bd81b02781
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.82.7.ebuild b/dev-python/hypothesis/hypothesis-6.82.7.ebuild
new file mode 100644
index 000000000000..ed1f0cbc8e14
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.82.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index 6d3529a8ee46..fd3e7ce886d3 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,4 +1,6 @@
 AUX krb5-0.5.0-cython-3.patch 800 BLAKE2B 215b97c42aedbeb321cff89c912e6e071f35989ccadcac4990e495d09907a448d01bdd112ac471074e4b6da96d14e643ca8a77c9224cc728b5a9fa5832bc13e8 SHA512 cd2cd8cba18f677a879ce41ae47bbd8812526ed211d96112df2bdad6f8ff9c4ba3c446b30d4bd98f45a8d70c5c24fc13ec9a106d6a484f17aaae9eeae8d73a04
 DIST krb5-0.5.0.tar.gz 220969 BLAKE2B e492220906afff138a35e0545a9fec4d802e37e17d776fa5448361f1d62a93500063f783e638bbf903165a1998f9d2eaa1444d3bf5ce8446b781c69596c53080 SHA512 a5e8dc16026602373a00aae9188256b586a9f02cee7a413b7bc8ff0525660c416256179b56795cb9a69ca9dab0afff258f803a810220472e086c1c497d044567
+DIST krb5-0.5.1.tar.gz 221059 BLAKE2B ca7bff0caa192af0493b58e5254bcc45f43aece32ae2d57950d6293506ff8261a53d5990905d4d3a974c9843f6435dd6526c3d3210b9ebe8cda76d640410f213 SHA512 474484d2ffcf94e9855b017a7f8ca29894c4e3c1f4c0d872952bb1b7c1772b319b7a358c5e44cb3be036ea707a58fc1c526f8abb2c3d1d9b8af8525bb769923f
 EBUILD krb5-0.5.0.ebuild 669 BLAKE2B 88ac7f97d73e549000585abb99a6edef20c0f91c39a1474292c6f4f8f22d9b2f235f786662d45101ea4c38a5a9e45b6496f8d97c206d427373f862bad5a69725 SHA512 cfc82e1e693e700b305f4635a450f97f17361fdcb585019bc45d4c7141f38a92aad800fa97989334d0715e9d56fdc57b2bc6b86fd8f976e50449d2b5ffb2e8ae
+EBUILD krb5-0.5.1.ebuild 577 BLAKE2B 505c18b62c1b6049a945176c61b14c38fc5d09f266a230bbd206f4ccd11028fa8c84445c339482e71e5ee08a2d3fa6df61a7242440554991ec59f8f346b6cf5b SHA512 ed45142a98c29376cc28a1a1251e08004f4492063a4f051afe58cf7551a8185b3dfb57bebae8faa02af25a9c3126345337d2d00ae1feaebc9a9bac1886e1e2d2
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.5.1.ebuild b/dev-python/krb5/krb5-0.5.1.ebuild
new file mode 100644
index 000000000000..82ce2069a68b
--- /dev/null
+++ b/dev-python/krb5/krb5-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Kerberos API bindings for Python"
+HOMEPAGE="
+	https://github.com/jborean93/pykrb5/
+	https://pypi.org/project/krb5/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index ec98c28633f1..cdc8751c21ca 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-17.0.0_rc1.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-17.0.0_rc2.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-17.0.0_rc3.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-18.0.0.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-18.0.0_pre20230803.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-18.0.0_pre20230810.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-18.0.0_pre20230820.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-18.0.0_pre20230825.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-17.0.0_rc1.ebuild b/dev-python/lit/lit-17.0.0_rc1.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/dev-python/lit/lit-17.0.0_rc2.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/dev-python/lit/lit-18.0.0_pre20230803.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/dev-python/lit/lit-18.0.0_pre20230810.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/dev-python/lit/lit-18.0.0_pre20230820.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20230820.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=""
-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/pandas/Manifest b/dev-python/pandas/Manifest
index 1a31d1b11803..d91882db80bd 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -11,5 +11,5 @@ EBUILD pandas-1.5.3.ebuild 7192 BLAKE2B f6e499aa65fa3e4005b99428f82c7ff26958f087
 EBUILD pandas-2.0.0.ebuild 7485 BLAKE2B f8e46eb256077d91844b5c158aed257f4072e57df6f2cde7a9311e168fb80ef762d78b0679e2c06c9402df5cd3f6bc04d03df3295a1d0f1333f9cbd13026d33b SHA512 cc8821469cd3f348ee8f827d3d4c1f0441930a8b899f446dc4cc2c847014036ff09bcf59405be87e88f471c4aba495c3f0a9b1bd17fae9fb00e5320d00dd319b
 EBUILD pandas-2.0.1.ebuild 7523 BLAKE2B 06f0c8337b31b89535745057efe19d192f6fcd4cb5d1e0eda8b3f3bc809533618cad487885159a04b8475b413e87640be62b376bac3364a2fbee83f49a91691f SHA512 9d7aa683cf0bae4f847d1e28eaf5b1100bfffad292b8a95d5a857e21307a82a95058c13957d3452730c88f31d1cb2aa28990d10457e1b28a779cf567ee03a1f4
 EBUILD pandas-2.0.2.ebuild 7601 BLAKE2B 806c707327c80b0e914e4a6e804aab5f24f7ca1fd79fe3ac15dbc1cba63ca65d8b7df97b2d78722f8526e3a32c07b8f31bb8ea418d886387fb711a6090453cb9 SHA512 98960556415b55c48f9123006791066e22cb8ac199c5571926b03ac709057036fefab6c9c4f3361b2cd0adaba59d51caa8a327d98327feda9fff79f2c78c2351
-EBUILD pandas-2.0.3-r1.ebuild 9660 BLAKE2B 883d1a8f9a180ec5fea9c7f5b20218d3c5058063507ac351b5818a886a0bcadfc0d70792e38608d8d7b01ce8b7abb031107c671a5008d242195e55ff9b6d9a39 SHA512 2655cda749c8372bd7379b4084c5e0f11791a2d10878be999f707ac20a2dfad15fbd29fb5f8d4bfb161935ae099d434703badc7a5fa2d5a37cb1836cdb73156f
+EBUILD pandas-2.0.3-r1.ebuild 10112 BLAKE2B 46ee9d87dec04e79937dafc79104bbca11fc45d7ea2e45e985cd4bf90f355def967060d22dd807b90d968b359a9d63c80c965cacb148da1310d074a905cf22d1 SHA512 090f1a1fc78d920b9d5b38e932c285100b01607b6ab54d2839d70db9954f5bf12c3d1beba74f05feac13f11b132f4af2ae6e297a54fc785e63fa6cf55feda7b9
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-2.0.3-r1.ebuild b/dev-python/pandas/pandas-2.0.3-r1.ebuild
index 961cd1e3b860..00c31b35d92b 100644
--- a/dev-python/pandas/pandas-2.0.3-r1.ebuild
+++ b/dev-python/pandas/pandas-2.0.3-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${P/_/}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
@@ -211,6 +211,15 @@ python_test() {
 		'pandas/tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-LastWeekOfMonth]'
 		'pandas/tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-WeekOfMonth]'
 		'pandas/tests/tseries/offsets/test_common.py::test_apply_out_of_range[tzlocal()-Week]'
+
+		# alignment issues: bug #911660 (fixed upstream but not yet in a release)
+		# https://github.com/pandas-dev/pandas/issues/54391
+		pandas/tests/io/sas/test_byteswap.py::test_float_byteswap
+
+		# hdf / pytables have alignment problems: bug #911660
+		# https://github.com/pandas-dev/pandas/issues/54396
+		pandas/tests/io/pytables/test_append.py::test_append_frame_column_oriented
+		pandas/tests/io/pytables/test_store.py::test_select_filter_corner
 	)
 
 	local -x LC_ALL=C.UTF-8
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 3dc52004bf85..aafe2852eaee 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST pymdown_extensions-10.1.tar.gz 783894 BLAKE2B debe9415329ac5eb663924697529f456fddbc2870188864741003a5f9a3e6c44741188c90db5147d65fe8570f8a2acfc70ef8e12cf7ecfce7f3f051f25ac8c02 SHA512 c7692c7688b7d9764460b274a5cf609c3638a171f8ebb10d265a0e78d1f3b7b418f9712e6d7597e091181caa82e7fca9120e388f2ee80bd9299e9b70492084af
+DIST pymdown_extensions-10.2.tar.gz 784781 BLAKE2B eb91408b0005ae417bdb781a82f2611569a5a33452eee03baf1ce22af45c502b45c3c3d034c6ba4d9b56c330fee38742ea5f08f4d1b584e6a4dcf447c719252a SHA512 37798e0d5df8c06be3f9a9d523af50f252eaf90b21332ed0c73641af5e41a4794c643ffc181513aa783544a227eaec3cb3f2d8face3a7d3dba8122de0ac9d436
 EBUILD pymdown-extensions-10.1.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
+EBUILD pymdown-extensions-10.2.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild
new file mode 100644
index 000000000000..4ed08497d644
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.2.ebuild
@@ -0,0 +1,32 @@
+# 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="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index a64715e5dbe0..74176dfe8cc5 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.9.1.tar.gz 233824 BLAKE2B c36d2ee697ed9dcb7a3c7d3a3ec2bc58b88ac6ba5a020c852b4ba7d0a01d3dd4a3801d91a9456f3f4710684df16a3a4c7d449cfa58e141ae5085bef0f0fe6f21 SHA512 6c516cae43bff523ec19b6ef52e7691a688bada027a183b98e0121bdd4f44f887a5fa87f3ab173dff1e18d84a7886a2a04de80dbd6873cc1dafb1d7369a9d932
+DIST pyspnego-0.9.2.tar.gz 233819 BLAKE2B e4fc4b8cd760210c2e4dd188a651725fa6579fe429ca227e8a5cc1f46111e3e8e6cb07bc4256f60560d86bcd0a2b2e621efbd0dc193d3f67f66a1fdb79ef8f9e SHA512 6775efa12b1f93addf9257145d020e5fcb5139edf8ffcbdca03cd55de7ee992b47af5278206de85e50a824abbf0a037a50dc7e47ca5b6f79b2f4e854d926a8f3
 EBUILD pyspnego-0.9.1.ebuild 914 BLAKE2B f23a5faeae4b1c5d6103b1160c59c115d83660a69c1af73326a557b453c43942b3a89711a5c55636c3d1ba8cd0bff8ffa435925510ddfd23502763675089a0ec SHA512 32e6f6e5a43a16c981fc3d2a129619a424ce35b52819a50abbc838a04b5be440834adc5d3663400b3c9018d7adff13b87c51d250e71443510f680d13844ad045
+EBUILD pyspnego-0.9.2.ebuild 917 BLAKE2B 18123ad603638f00f9cc2238b73368a4b3877999e98ea7ec0822e589e3f6c6b3841b2702e892affa337b10f88b24dd8455f3c70ac60419a7dc3419b43b8f67b6 SHA512 dbeab118664219364f95d2e97958731ffeb0428088a7ec0a58870514b42374aab277bf62befaa899aa171b661f8c64e40bc71b1d0534b2bb968f0283880bec57
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.9.2.ebuild b/dev-python/pyspnego/pyspnego-0.9.2.ebuild
new file mode 100644
index 000000000000..814c28e01ada
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.9.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-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 optfeature pypi
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 38644c26499c..b0e16d1942d4 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -7,6 +7,7 @@ DIST sqlglot-17.14.2.tar.gz 8498185 BLAKE2B c556387a77aa2d5a52ce2f0ac630253ea68b
 DIST sqlglot-17.15.0.tar.gz 8505061 BLAKE2B 60ab18f09a5540d1442b03b6eae104f01642808ab0081df5e387eaa9a8c188b21cc1574e0c63d3d0eeddef023c2d3d0008a0e6f0e7e5ce8cdadde51b40e8641e SHA512 efca36e7fffcaff3379a870266e6978452a06a502d179d5bb1ba3dbf6f2d84bd9ef8f7967f82d6512ab6d420b755d3ea2c3bd243a4f7c5e8baccd4dcd183d390
 DIST sqlglot-17.15.1.tar.gz 8536088 BLAKE2B 6b3e0663a4707bc5c94749765919f9e0a76e4d38b62777923407c360474e9b8671be7d2be3b7e3b7b37c95de9b51cb4aa4bfa161b2fbc7e218a6d20184804979 SHA512 bab2b32ab119e820067dd60b336e96797c2fddfa5cbbe619c12b0c27e19ab8fa8d3106cdc4956036f87b810bd1dab3a5f7a01b690d72b3c1e9ec9f10399bb95e
 DIST sqlglot-17.16.1.tar.gz 8561327 BLAKE2B fce3362e91e91f92624337964ddd72ab198ecd368f77abce89ee7090aeb23efb79aecd93f76d7f8cd896c23d8cd99f0e068bdbc14906174eab6bd015e809f903 SHA512 c97bd12c1f889f77c279b10b5869806ac170301602020dcf7073ba70547702e1732a3354141694f7c4db8528bc1fd4e8bfe006f2ad81c4bf63153c148878b5e1
+DIST sqlglot-17.16.2.tar.gz 8562390 BLAKE2B f985f74765438c9b57a1df9ff1ad9cf43b7e81bf8c89cb328d39d0127661f5fd4153dccc6ec1fb73a8167d4e67e8a971c4f06cba7cab5796bda7726129bcf6f0 SHA512 2487f566078cf7ac84a8e3f3a70760c5f2d5b565e1479390883551531e53a69ec0ca581585b006a44529c39a21a70867082047746ec20939f2a1e1f2408aae34
 EBUILD sqlglot-17.10.1.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-17.10.2.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-17.11.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
@@ -16,4 +17,5 @@ EBUILD sqlglot-17.14.2.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb727
 EBUILD sqlglot-17.15.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-17.15.1.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-17.16.1.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
+EBUILD sqlglot-17.16.2.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 MISC metadata.xml 635 BLAKE2B fb154da2feeea6d590b4f3edb8d8d90d316feee1b8faababc022db026254bd24674d8419b74074b089d4d8930bab642cdc5fa7694bfa9e033cb5ef4ad4988562 SHA512 dd5ed7212dc2eac6a4d84bb2e3639db1ffe163598d911073d7100a8ebfeceb85842ea2e6a597d1036d5b1388d18954b95a782af7b3a84479bf3b59ef9e9b6bf8
diff --git a/dev-python/sqlglot/sqlglot-17.16.2.ebuild b/dev-python/sqlglot/sqlglot-17.16.2.ebuild
new file mode 100644
index 000000000000..368b77416b42
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-17.16.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+EPYTEST_IGNORE=(
+	# Tests require pyspark or duckdb which aren't in the tree.
+	# Pandas would be a requirement normally, but it gets ignored by proxy.
+	"tests/dataframe/integration/test_dataframe.py"
+	"tests/dataframe/integration/test_grouped_data.py"
+	"tests/dataframe/integration/test_session.py"
+	"tests/test_executor.py"
+	"tests/test_optimizer.py"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
index 242b2e832db8..d6fadc078633 100644
--- a/dev-python/thriftpy2/Manifest
+++ b/dev-python/thriftpy2/Manifest
@@ -1,3 +1,5 @@
+AUX thriftpy2-0.4.16-cython3.patch 877 BLAKE2B a7bba9f41318a41112cbdbe71a8fb27c3c56d03285d82eec495f0517da11e93e009d43ab1998f5fa3ab50d8e10a0a152d7caba2c4b0d415dbc1b8775622f7e89 SHA512 5bb012fa9b5f6d517cb05f30692bf2a2188cbde7af51618c3aff4663b5717cd65a7ec8cd1a39fe3d8317688265b473a6719a2f7cddddb43f2f0bd970d2a86505
 DIST thriftpy2-0.4.16.gh.tar.gz 146991 BLAKE2B 7547ea85106d0929d3e6ee771ff10ad2cd047f4e779c668e4a30ee936ac04d470e16d8321a2771db4404f57e1be41438b4a302bc04b8e4698db03de35dbfa5e9 SHA512 c00b21eb7db3fe91843a5129d16e7af2a29331489e7d8394bcf78eb5c4b8054162b9c5a024eec8080708dbffc491db7922258ecd895477cda49dcc7d56297ecf
+EBUILD thriftpy2-0.4.16-r1.ebuild 1024 BLAKE2B 82a5acee40fc38efc8f514ee8451686d617eabfd52360f15db9752d347ddf0f85ba729df2eea670390096889fdd8e6f5fb578018eee1fa997f1d81e2bec0c787 SHA512 1b3b80e887189bbf86145576c90cc34ad0a649087154c04d5196aae793c30ebf5b164241cb256b1c0bfd52c8404475f036acd619dc402d281bc515349305111b
 EBUILD thriftpy2-0.4.16.ebuild 1024 BLAKE2B 1a318ee9c1e2dbfa6021c6daf1661c1582010ea2dc71bcb75cf09ccacd1c2642b979a7a77ec8fb42c2a30854775f55b5423f9caf68388ac30c73c641617215c4 SHA512 21bf48b8f9ab885323f1c56b8a083fdf8341f1c0e5cd07fc632481663002a4f48bdfe1dce3429d796a59bd14807d670e82505c0c2f138fcbbf6f2921c4c375f3
 MISC metadata.xml 380 BLAKE2B 570746c7985eab098e590e49d267c406ce02cbf612dda6bf2a60439aee62cbf6eefebac14af29bf5fa52c8b5fd4846b2872beb7034364abb722f706978b55987 SHA512 d20d8641eea699cfa6d1930b8c5a9a8edfe76b5ef837551c52105d2fe8d70d481862c5d5cdbe389971588b3bdf62e9fb7e1cec2e89d635650cbabed7f7f53070
diff --git a/dev-python/thriftpy2/files/thriftpy2-0.4.16-cython3.patch b/dev-python/thriftpy2/files/thriftpy2-0.4.16-cython3.patch
new file mode 100644
index 000000000000..8e186d719d1e
--- /dev/null
+++ b/dev-python/thriftpy2/files/thriftpy2-0.4.16-cython3.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/898722
+https://github.com/Thriftpy/thriftpy2/commit/202ed5ef7b91399b86f8b3b76108a14612b38dbc
+
+From 202ed5ef7b91399b86f8b3b76108a14612b38dbc Mon Sep 17 00:00:00 2001
+From: AN Long <aisk1988@gmail.com>
+Date: Mon, 7 Aug 2023 17:11:51 +0800
+Subject: [PATCH] fix: compatible with cython3
+
+---
+ thriftpy2/transport/cybase.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thriftpy2/transport/cybase.pyx b/thriftpy2/transport/cybase.pyx
+index c05560f8..d0fc3696 100644
+--- a/thriftpy2/transport/cybase.pyx
++++ b/thriftpy2/transport/cybase.pyx
+@@ -87,7 +87,7 @@ cdef class TCyBuffer(object):
+         if min_size <= self.buf_size:
+             return 0
+ 
+-        cdef int multiples = min_size / self.buf_size
++        cdef int multiples = min_size // self.buf_size
+         if min_size % self.buf_size != 0:
+             multiples += 1
+ 
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.16-r1.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.16-r1.ebuild
new file mode 100644
index 000000000000..c7e8bd364392
--- /dev/null
+++ b/dev-python/thriftpy2/thriftpy2-0.4.16-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-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
+
+DESCRIPTION="Pure python approach of Apache Thrift"
+HOMEPAGE="
+	https://github.com/Thriftpy/thriftpy2/
+	https://pypi.org/project/thriftpy2/
+"
+SRC_URI="
+	https://github.com/Thriftpy/thriftpy2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cython3.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/test_tornado.py::TornadoRPCTestCase::test_asynchronous_exception
+		tests/test_tornado.py::TornadoRPCTestCase::test_asynchronous_result
+	)
+
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 1254bb6973a2..431145d58d29 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -5,9 +5,11 @@ AUX twisted-22.10.0-python3.11-tests.patch 4144 BLAKE2B d4e645419d82787a5e411204
 AUX twisted-22.10.0-sendmail.patch 1045 BLAKE2B 4566f4fcecd6d79d43af52bfba4b9953c718458b8832871111b86255fa1b4cadddbc5b588bc61422cb41bf6facfe22d812106c32c912914f263d37cbb05ee6a6 SHA512 9ddb2416c730260e31bcd49584449ddf3172382de129613173c57e0360d2d1ae920870e74c3ed1edb19951b460ddb51ec0719b974d9142e8bbd6a42fea9cbbd9
 AUX twisted-22.10.0-time.patch 4275 BLAKE2B d8f4f79163aba42494c4f753f915df2611b3fd3f0dd26448087e9bc0b56be0fd1047a0a4e518e07846a6bbae14529590f057411528e8ca8464d122c6b5b08684 SHA512 e92be2938aca686e4cf2557d05287bf1b52cc4f57290ebc4d1942ad6894d148f7dd3072158b6249a0952b4bbb8ec221150ff81d162bd797a97eabde8b5f047b6
 DIST twisted-22.10.0.gh.tar.gz 3512714 BLAKE2B 2fd36ec6922f428e959ce0169bb9a3592b8b3e43aff8d34872883ecf0fad8d0fff01a52f06b54df3dc377f4fc1a488b6d66f9287b108b4749bb7d3c749b96061 SHA512 cf9ed96430376d499ae9627a7d0656c05cb99bc9e9b15a8f4166355363818f090bc3c2b383ed4cf19e1e38fb569e8618d35a0ddde2a90a06f3c9a4ea769837e4
+DIST twisted-23.8.0.tar.gz 3478691 BLAKE2B 44fa9da691456a2b1d97f54b95787abe3e162b5639ee7ab8779c6d9525eb2a878865f450aa6fd6c461c3eba84f95361d2423e241991f52f91a27b792b6d71123 SHA512 ef0a243a4c22dd31e57087f5b2c21a657b98e23cc486f08b9926a9ebe8c4b6fec137993aea71e6c60abc3d653d995da0f65ff10dfc6c3d2cb7fdae5db08e2532
 DIST twisted-23.8.0rc1.tar.gz 3479000 BLAKE2B d3dbc54759f4dcba422cbcc57451a268834f21616ea2b5d34d972f2647750afa4ae62424ae32b2e0fe22e3a886c45ff1e64280c99553aa1ee52923a192773fdf SHA512 a1e778247a311dda30cd7f9f02fa4ab8848d6d5b89de4ff83dee5a92f968b6ec8df48d1804eef780cd0a9dc1393a1a91d624e9c54e0c9cd52d930ac2b36a0b6c
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-22.10.0-r1.ebuild 4786 BLAKE2B c8e38c998613aa0e22c6b8e3253d336d02c8290cdbce55fe0e561ed021ad575fdd235df6601e10446893f46c1731dc923f58afd03359e673eef3fed54694ebc4 SHA512 d6bc65f955c3cb9228b8bd7bc84bca51f99e614680eb5d34cf99939af1fc696be11c04cee6766dce7d0a6475c12f2fd82d0a2a084c73e25380c823a6b71263ae
 EBUILD twisted-22.10.0-r3.ebuild 4961 BLAKE2B 9a89bd3a4ffb6fbfd4b1a47109192c6421dfd059a414956ff4c48657aa0c3c806eb91458ec0f00eca23f659b97f34c3ebfb48ba776235eeaf3172b96779f5660 SHA512 07de42b125ca7177883610712fc8380a048e8b8ef0c932cf394b58496730abf7061e5064d8e761c79ea18e2aea4bca7830ab18b0a96f6e968d7141ed3062ae58
+EBUILD twisted-23.8.0.ebuild 4192 BLAKE2B 287dd90c4ed51dd259ab3710543a8c9ee39b7ef43120f30868f716da3664261573a86562aa4e7282de2a5f9461bc2c51c73e6e0d1b0ef42371e63a3afc9e9044 SHA512 3cdc4f58b7ab29d557cd719f064eae282de0020e3854e001b41e5c207e202cef40f067996beeaeda495c93f832984f9a2b3dab54d42bfbd344f77b33872ac9ce
 EBUILD twisted-23.8.0_rc1.ebuild 4192 BLAKE2B 287dd90c4ed51dd259ab3710543a8c9ee39b7ef43120f30868f716da3664261573a86562aa4e7282de2a5f9461bc2c51c73e6e0d1b0ef42371e63a3afc9e9044 SHA512 3cdc4f58b7ab29d557cd719f064eae282de0020e3854e001b41e5c207e202cef40f067996beeaeda495c93f832984f9a2b3dab54d42bfbd344f77b33872ac9ce
 MISC metadata.xml 1281 BLAKE2B 06f3bba5716e641cfb848eaf212fcd5a18d89caeefe1b0ec2fc6e0799ded9ded5c54dc04d239b6e7c427a23c0300caecc67cbb2a292a745dba5cddbf02fe4330 SHA512 e78734d016205a2bd850ddf68bfefce024a95efc4d4a42af52314aa363d6c654dada671b98a1b02642e7abe2f9a48c0454949b4bf07e88776924c63175b24227
diff --git a/dev-python/twisted/twisted-23.8.0.ebuild b/dev-python/twisted/twisted-23.8.0.ebuild
new file mode 100644
index 000000000000..bdb064ec3895
--- /dev/null
+++ b/dev-python/twisted/twisted-23.8.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_TESTED=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="
+	https://twisted.org/
+	https://github.com/twisted/twisted/
+	https://pypi.org/project/Twisted/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+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 )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	http2? (
+		<dev-python/h2-5.0[${PYTHON_USEDEP}]
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+	)
+	serial? (
+		>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
+	)
+	ssl? (
+		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+			<dev-python/cython-test-exception-raiser-2[${PYTHON_USEDEP}]
+			>=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}]
+			>=dev-python/idna-2.4[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-6.56[${PYTHON_USEDEP}]
+			dev-python/pyasn1[${PYTHON_USEDEP}]
+			>=dev-python/pyhamcrest-2[${PYTHON_USEDEP}]
+			>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
+			virtual/openssh
+			ssl? (
+				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
+				>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+PATCHES=(
+	# https://github.com/twisted/twisted/pull/11787
+	"${FILESDIR}/${PN}-22.10.0-time.patch"
+)
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# the test suite handles missing file & failing ioctl()s gracefully
+	# but not permission errors from sandbox
+	addwrite /dev/net/tun
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# own the dropin.cache so we don't leave orphans
+	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]]; then
+		python_foreach_impl python_postinst
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index c4e7db27f00d..ccc606ceaa44 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -8,6 +8,7 @@ DIST zeroconf-0.80.0.tar.gz 147419 BLAKE2B 04f93331a667863f8ac5a40d156468d9ffceb
 DIST zeroconf-0.81.0.tar.gz 148284 BLAKE2B 103ae54a20b8d23bac94dcd2d48a05c567158cca6617344e90c8f0676a21262e2ee82eceaa236edb998409f3e5385ad8d8f091c1b5ed100a6196de3586f1ffff SHA512 66d2a9ba9b12f91b90c023ba935bdcae1a09c68026702664d5f7d40b392820ee4614be23e0bf6688230da86963b61f6d5505dc38787ded4cade48f52f13d4e81
 DIST zeroconf-0.82.1.tar.gz 147915 BLAKE2B 608d077e042f1b74f25f44b5b64350782944d0f4da96bb17a32bf9cbedfe5c1b751a8731a65c5cac86cc458425f2e38d0549317e7216c577567d0852a7a6c7ed SHA512 a02e9b1c6ce976de815f902f5607d6b0fecba4abc403234cbeeeef1abe450c3894e6c117bb554ba76c27250c748b36b862abb8ed059f0da8d31e5b10e5f1c2e1
 DIST zeroconf-0.86.0.tar.gz 149030 BLAKE2B d2ea241bcd1416517d8ac9e98c205c956419bc4d33492f8044fe1819458166cd20acb83e56b0e05c69feb473b026a277bc739541195bc2df8ee0e0b748c10c94 SHA512 1b4260ff9498d0a6504960162bd1d75485e83e816c7cb063d71857c77edae40a580d841b8d65940cfd2fe47f0dfa3f6e96f5b907e9c7b626e7ae9bc365219dc8
+DIST zeroconf-0.87.0.tar.gz 149844 BLAKE2B ef946a08b97493e536560178cc6516d86c8315b8db16d59867e7979d6f35a514f27d6cde401a7de5ec23b20f37f35ddde59ce6addd545d7640e3f15560859637 SHA512 cec7ea7e9bbac068b6ed6528a284de29c88ba0d4fc0ccf077b6520a4c0ea38964dc6971fdd34af3cf273dbcf1c9c34aac43d92e40217b0d192a58ff6610314e0
 EBUILD zeroconf-0.71.4.ebuild 1416 BLAKE2B d7833220517261b55880e27c23866720402a2869f568058b5fcd2103c3fdba3555f7c0eee6944a091d00045811176ce06ede9614368b0b64cdf2b6be51eb96e7 SHA512 d570948608ede5ad768a267a4ce45462f9072d5fc41d17d825ff88124e459f7933b2f537817fc01264e6704bfec852cb926e61072a7d98c3fbce15f0d3192d87
 EBUILD zeroconf-0.71.5.ebuild 1418 BLAKE2B 1fc712d83e2326d78abf0483f0362dcf7df3c8259db1fb5bc73d795dc5dccce0fa7515538f77cf3798dbee86507b0bb8aef4ab617ee38c6b92dfe2acb5b15ac7 SHA512 f64e04ba2ffd114b94e7cb7466aa9127eb958233991e196dca09bc95bac4e36cce046285d8b0425107506badc99b5fb6d076b4c361743a2594cae53f4a9ce35a
 EBUILD zeroconf-0.72.0.ebuild 1418 BLAKE2B 1fc712d83e2326d78abf0483f0362dcf7df3c8259db1fb5bc73d795dc5dccce0fa7515538f77cf3798dbee86507b0bb8aef4ab617ee38c6b92dfe2acb5b15ac7 SHA512 f64e04ba2ffd114b94e7cb7466aa9127eb958233991e196dca09bc95bac4e36cce046285d8b0425107506badc99b5fb6d076b4c361743a2594cae53f4a9ce35a
@@ -18,4 +19,5 @@ EBUILD zeroconf-0.80.0.ebuild 1418 BLAKE2B 1fc712d83e2326d78abf0483f0362dcf7df3c
 EBUILD zeroconf-0.81.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
 EBUILD zeroconf-0.82.1.ebuild 1403 BLAKE2B d07578674fad1d652289551e5862b54500d22a916e0e30cd8f5923bd5cf868b3e84775021b0a78748915f5f2ea0d929f1f5962607b5232d589ab4e22c5030849 SHA512 cce3574cee318737268207a2b2a5410641c3ccf1851b52c061e5ff4aed8415f40195730151bde8a28e9101f631755d1eda9d29e290126b4330dba72f9c1a633a
 EBUILD zeroconf-0.86.0.ebuild 1403 BLAKE2B d07578674fad1d652289551e5862b54500d22a916e0e30cd8f5923bd5cf868b3e84775021b0a78748915f5f2ea0d929f1f5962607b5232d589ab4e22c5030849 SHA512 cce3574cee318737268207a2b2a5410641c3ccf1851b52c061e5ff4aed8415f40195730151bde8a28e9101f631755d1eda9d29e290126b4330dba72f9c1a633a
+EBUILD zeroconf-0.87.0.ebuild 1403 BLAKE2B d07578674fad1d652289551e5862b54500d22a916e0e30cd8f5923bd5cf868b3e84775021b0a78748915f5f2ea0d929f1f5962607b5232d589ab4e22c5030849 SHA512 cce3574cee318737268207a2b2a5410641c3ccf1851b52c061e5ff4aed8415f40195730151bde8a28e9101f631755d1eda9d29e290126b4330dba72f9c1a633a
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.87.0.ebuild b/dev-python/zeroconf/zeroconf-0.87.0.ebuild
new file mode 100644
index 000000000000..76b5818dc18d
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.87.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9bfd5c7a7472..532505ae3c68 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 65ab5a611fb1..9b0cdb21e229 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -2,7 +2,6 @@ DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968
 DIST sinatra-3.0.6.tar.gz 268815 BLAKE2B 2993a4c28ad4559e65e6e0dc4e5f9bc25f4118f1f0d5462e0469808e873197823a13f682abb4762426860322df4408faddde037f120d370d0e206abc2b1753ef SHA512 83643b634d2a992144ced65fc1466fded29bf6fae2e20f359b2d440c46013df26f4595f842cbed36319c5278beb77383eea6ac6eb4281f508501cee4e1c6e67a
 DIST sinatra-3.1.0.tar.gz 272066 BLAKE2B 4bae4e3356adaec8f347dfc25ab9311f6740ff4f5c1486c7230269df0154e8127a4f61f6ebf47098f24848381a6e8e82429184c431cfb89c8beb9e4838135456 SHA512 b0b82a5319caf5768c830b2929f76a4fc9414adff4c32d6723a439747f756d2467c12b1391557a1afe31e5f8eab99872a51dadb59cf1cf8ace373e7a92dd5eb2
 EBUILD sinatra-3.0.5-r1.ebuild 1418 BLAKE2B 271aa29633cc26f9c208b5c393668fa0cc61824120842252503c4357f1b22026174f605f32b57814d999061377ebff5f43e6a5108201d8477740026283f9c059 SHA512 7139b0120f2351b8156cdf190cfff9f889208293c79d4348cef2663667d0c2bc0b3d1bd300b9221e3cff79aa9a6a60a6ba859da9730501325886e388e5cf4fe3
-EBUILD sinatra-3.0.5.ebuild 1162 BLAKE2B 03a501a76198e2062f4fcc7119ec7ab80f8a99b6c6101fe54944a13890feba4a9e138fa6b2c3874051b2da0bd5a7be7270fe54f5dbb8173dd1314fd92ce97c9b SHA512 5ecf1151fb089075004c87fb97913dc8ddb344f93cd1765c2b48af364bf75c6df5f9ebd02087e25d87d23275daf02a1db464cd86c2fb074b1d683b2d8a388a05
 EBUILD sinatra-3.0.6.ebuild 1261 BLAKE2B cf05bb00adf64ae7864854e9e7f97354f58f97c44fe06573d764f4e9241575016b9ef541ff783f8abb5fd208afbbe23ceda5e91f20b6d9c040e524a27305ff63 SHA512 5beb059d51e4bb3948b91d38051687d6a1736eb0ce410d6dff4ebb640aa30ee76dd1874cadf88bbfcbae27418514ee6b484d53bdc741494dbd46d9ea0441529d
 EBUILD sinatra-3.1.0.ebuild 1262 BLAKE2B 9383e9cd6fa98e3c12da36cc6e61232e9c3223a7c3d8760a233c059c6cb8a8e2018756a220393c62cbb276be3c5075d32460933bb83db5b3bfa2db58d3395432 SHA512 307fde1aa61220863b59d833bab2306cb71b96ce0f497d5886d612ab5ea1e960d7b2250c50cf434146144187cc59e29538f4216f118fc933b99019d97935afd5
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.5.ebuild b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
deleted file mode 100644
index 0f6a098f1385..000000000000
--- a/dev-ruby/sinatra/sinatra-3.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="https://sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:3
-	>=dev-ruby/rack-2.2.4:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
-
-	# Avoid spec broken by newer rack versions, already removed upstream.
-	sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
-}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 3be51a540be7..3370f3e6e215 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,8 +1,6 @@
 AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1586e0d3eb3581ece3fc398035bb4c6b32082a7366b946d29054ccdafa61b38adac5ff782991c070e161738aa1 SHA512 db3d64781003830fb98e331248fdaade0ee9076c6e452b06195d2cbbc6bbe7ed55c1da6c41e8ac0df9341f9c637e5cdc79142b7444f832eff870b8ea1a2b1dcb
-DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50
 DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4
-EBUILD slim-4.1.0-r4.ebuild 2132 BLAKE2B f3cf006a609dec8388a77b578f6c5af6e7ae268eb374f51cc9aeb288040dddfa1ad634782655e74718d3f79d2dd60663ca2938f4fba80f3798d48d848afbf1fc SHA512 5753cb009fe5461f5750742e01a8f340aa9ba64a027d6979d3aebe68f0feda595bebf7aa7ad93bf47fe10082d5f17e113b125f43ed90cf9d6b308efb738fbc50
 EBUILD slim-5.1.0-r1.ebuild 2236 BLAKE2B 7507a967daeb1f4eb8c0d7beb8ded4d51d57c81b902dd98b45e4fb79dda227f6edf00874fb17023189b374f4747acccc964bb8d6cf4bf284a535255e4e0c9e03 SHA512 c7f67bc8b78a1749dacd0e039f1ab0016e7b834ddc6bddbde2a539ebad7643dc33d09016945cef51430bb8ec45796154cd657bc178562080003bd69292cf7bdf
-EBUILD slim-5.1.1.ebuild 2230 BLAKE2B 93f7391eb3c4f2789764e7bb023e97f32209b6d1394bbe8ff73b794ccd6dfdccdb3cc6588b6df0b58b78115b6f1802a9bd03e0ce46ae32434a986abcbfef310a SHA512 b4ee7dfce4f040931f104503ca0342781ad951cb4c8901ce1dcdfe382b79f62905fc7c616f61f47c00173fc2b5a000047913d8a864dba7ca46d1209f0febc65a
+EBUILD slim-5.1.1.ebuild 2343 BLAKE2B 401902d64fbe95670891be202cf4f3257a59651ad188d828f56a0f786351e57e9a01d59b6d8a4ec3d235b901419aed523830bd78ab9f3e5aab04d655ad1a9acf SHA512 e9498be0362105251ecde4d929e8f6d6f1b6801d193e45ba7a517b7e84f38afe7b8503a809e3658624aa686d35d3bf547a70f69510d8bfa8041bb758bc0336ec
 MISC metadata.xml 328 BLAKE2B 278b8ae81f02f38eb7a70fe1f6649cfcaa5a256ecdeaafdd1231b18050fb9b1a7e36d332ba6165867565ecc7d19ea425966d35a739950c170f151ad927ab57ed SHA512 21ea066ca55a1422879792472cc5b07a87332e5eb204b1311a5a63cbe9f33296a9ef48cba2491a50064baa3760a18285cec51882c3ca885a7cce2453a4e2234a
diff --git a/dev-ruby/slim/slim-4.1.0-r4.ebuild b/dev-ruby/slim/slim-4.1.0-r4.ebuild
deleted file mode 100644
index 9ede38c06816..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="https://slim-template.github.io/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="doc"
-
-ruby_add_rdepend "
-	!dev-ruby/slim:5
-	>=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/${P}-temple.patch"
-
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Add missing include, bug 816573
-	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	# Avoid test failing due to tilt providing yet another markdown implementation
-	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
-	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-5.1.1.ebuild b/dev-ruby/slim/slim-5.1.1.ebuild
index a5c1188a4aa0..c914625d9a54 100644
--- a/dev-ruby/slim/slim-5.1.1.ebuild
+++ b/dev-ruby/slim/slim-5.1.1.ebuild
@@ -28,7 +28,8 @@ ruby_add_rdepend "
 	>=dev-ruby/tilt-2.1.0:*
 	>=dev-ruby/temple-0.10.0:0.7
 "
-# sass tests are currently disabled: https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
 ruby_add_bdepend "
 	doc? (
 		dev-ruby/yard
@@ -38,6 +39,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest:5
 		dev-ruby/kramdown:2
 		dev-ruby/redcarpet
+		dev-ruby/sassc
 		>=dev-ruby/test-unit-3.5
 	)
 "
@@ -62,6 +64,9 @@ all_ruby_prepare() {
 	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
 	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
 
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/literate/helper.rb || die
+
 	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
 		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index f5e997694a2d..962923f756b2 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,7 +1,5 @@
 AUX thor-1.2.1-tests.patch 13418 BLAKE2B 13d3fdde30676171abe62b8fb7acc0a0564eb2041658e520a0838b6fb272303db9c0fad60170707b0676a9c39950ebcab778abaaf683716dd8546620e60e1a6e SHA512 a08e95e3df2c338b7bc7f700dcf04801fa743f0dc04abf5fde1030f306b78c536da1554e06736604acfaf6bd98622b4258dcec1791339727a57384cb226f8dcf
 AUX thor-1.2.2-no-coverage.patch 752 BLAKE2B 936e3ef4ba494a8e1b221fbf2688c9487c127fbf5991ae53baf5c33e12033de17c48bfd6dbf0460f952b5db4d4a0139befe7ad683e3bffa8b9a978a0dda27825 SHA512 c8b8e833f8d133e3d2c8e507820b054245ae119a766ba7ef4009ca235d64d0f763733aac719b6c5df521b23a80c43068cfdb747659fdda514a74dcb3d330f347
-DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
 DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7
-EBUILD thor-1.2.1-r1.ebuild 2156 BLAKE2B 92a0bd402228056e0348a1288cc591f7fad95847a2aed072a885600ed67dc409430bc2e54a8e5d7cb53d959569cbc7563865ff7bb7536c4da62d1b151a2dc818 SHA512 9152e5aca31ced4e776c4eb6dafb419d15ffd73e7a5addd98ecc24f31f608e70ef4590abd3c96d4170dc3cb1c20e76fe7ce6368ad9dca1ecf2a0efcc320c2344
 EBUILD thor-1.2.2.ebuild 2157 BLAKE2B 18f1befd80e7fdc1647f72a0177db32b28831f5b95742a7aab052246ff00e7c85909c04890d0808af6182836acef0c6ef9bca2f95514e1c3445da9edb99a54ce SHA512 0ec3d98a34b9be07b5893400c42d2e511fa4dddcc75f28a27348cd2a8e0a8469b6cf2aa73cd9d7c15b078557d1501bec33e85da11a6f4d0689584b50fade37bf
 MISC metadata.xml 681 BLAKE2B 18af48da65edba93d19a6a8541a5a79b63485d15108736b8b2c964a57006dd8e0bcc094261045a2598ab5537c3162cffc012e35dbff7c631e45f8de1657b5cd4 SHA512 ccc14bf0262a52707216bedfa51c46d5de83b04308d6768dd73e9d63a0e807ae5f069b9730b5e88311ddf51185aaec12144ffd8540044baf2b18d1208dee380a
diff --git a/dev-ruby/thor/thor-1.2.1-r1.ebuild b/dev-ruby/thor/thor-1.2.1-r1.ebuild
deleted file mode 100644
index ea545738f4ea..000000000000
--- a/dev-ruby/thor/thor-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2000-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
-IUSE="doc"
-
-# For initial target porting (new rubies), we can make these test deps
-# conditional with:
-# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
-# 2. skip logic in each_ruby_test
-USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
-
-PATCHES=(
-	"${FILESDIR}"/thor-1.2.1-tests.patch
-)
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-
-	# Avoid specs depending on git, bug 724058
-	rm -f spec/quality_spec.rb || die
-
-	# Avoid currently broken readline specs (already fixed upstream)
-	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
-
-	# Avoid spec failing on whitespace difference in error message
-	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby32)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e985313630db..28eb0feeac75 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6e27bed401bd..530567bdb87c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,7 +1,6 @@
 AUX jenkins-bin-r1.confd 846 BLAKE2B 8ecbab9b974eca823a0039ccf83735648d57604ff8aaa8896b39bfe869eea6cc6837ce22ac2d8d110884c8934aaa558442d537dfe424662d5e5ba13dd17377f0 SHA512 a7c84e33d2b7e6ec2b195fc419715a8486f204dcd10806a9f32fc9133f295b9efbc63abefcac5f2e44d40d2dec04ced3b94a50674fe5066b8e32ee0cde042e20
 AUX jenkins-bin-r3.init 1485 BLAKE2B e15269e812ae1aed54f4aa88d161e182e7e20433832608481a2a29c79f8da9a3f4e9f29204ba6bf9944e54f3cb1662bfda8500a13ba55d97bdcfd5387ad1cf8f SHA512 fff205e58a09d4f2369aba61598e697542b8cf29908382f973ba465b6c32a57686e6389244f2188b0b432d49f3b633fbd616e002656f9e8dd10ad742b3786abc
 AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309ba7967873699a16a32da3e4e1eb2270d47e9dbd07833cd6afb9bbc65f2bce7c7345891bf1f4bcd2abb3bc40eb SHA512 f064f8516a7c158fee47a4d1c2a5d2520e88483226139b50e9cff828ccb46c41d01f4e8d4c76e82d1400b8c816edeaed18f0ee82f1a353f43f7bf0e6d987dc0d
-AUX jenkins-bin-r4.service 518 BLAKE2B bfd33c8afc8db031903c5d66dd3bba7c77b6b1ea179c91918daa8b03f7437092c948f00836f3382731096af3f3c76990412efb0b3c753d5de54709f0c64588b7 SHA512 330143f3527095cd7cf0cdfdbec0641c5bd6f10b6d62853c887193400162c9a1125de65f0baed9cec9f501d6d966a46c42b66030669c7b9f167808d2fe67f8e7
 AUX jenkins-bin-r5.service 509 BLAKE2B 570167d1949e072aadb03f570166a5c35de71260e3707da2c7258f9d39667be71bb9ede116fccd8d54f02f1769facb076e83ae0102fb65c1f376c37fc4b0d38a SHA512 5f9075977c8df0788cde4fbdfa9e84c4ca23c8927d5b88ab82109fab1326465ddea18b8f99831155a9c5b0fd902d204bd083c0bdf811b83c73eac8ab3ebd9ad9
 DIST jenkins-bin-2.401.3.war 98398119 BLAKE2B 249f7ace9dde2db5243aa041d5afc854cb3064c7044aa95a3f2bae6ec96c0fe2a9ed06917f3bdd9c8a3b9178ab795d5d5de1b3a45e28bac70b5fc096b888c1a0 SHA512 b634bea063dfbcfd24998af920324fd63c394da4d0e34c619ad5f2447ecf16c4142ab531e96d6b53572e9dd698804126c6ff8adfeff3bc7fa7b5192157346708
 DIST jenkins-bin-2.414.1.war 89532544 BLAKE2B 2da7c1d79b8e5421ded90f44697807d1c76e04c6652229d0cbdb73569116b7f78cb0887e8df8bda18248766f2b49b3d3e51ed553df488e1716b1370c0dd8df76 SHA512 4d9bcadc4296c43336ed90e5aa27feb271ff074793f2ea8e15513c77c9dd9e8f47409382ce1299ec21a05ca1d5a02b9dde40dab03952cc3c77109a17048739d7
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r4.service b/dev-util/jenkins-bin/files/jenkins-bin-r4.service
deleted file mode 100644
index dfe0d174f365..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r4.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-EnvironmentFile=/etc/conf.d/jenkins
-Type=simple
-ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index df860e82d49b..4358763887f3 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.ebuild 2665 BLAKE2B 75e985037a61bfd49b00214e9d31377f6862fd4e5bd1038d316c4b42ed99df48db2464da7a16358a05bd144abf6c2313cadd860cb0d4a815a179ee37f2ff0899 SHA512 6d4ca2fe6f8c76170c6d70304a711113658176ea29616e0cd9e050458f3883ab90eca7ec09908cd56437c13c71e8440b013cd724a74319bf7c0adb7b3af0536f
 EBUILD lldb-17.0.0.9999.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
-EBUILD lldb-17.0.0_rc1.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
-EBUILD lldb-17.0.0_rc2.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 EBUILD lldb-17.0.0_rc3.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 EBUILD lldb-18.0.0.9999.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20230803.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20230810.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
-EBUILD lldb-18.0.0_pre20230820.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 EBUILD lldb-18.0.0_pre20230825.ebuild 2618 BLAKE2B 5ecd21f17b8eb27087c55965fbe6fc8b9774ffa5b5af082748b3842011b22d3d2177faee9264769cda4b6fdc2b6355c9e3b2822af7b0db70a88ae6451dd1cf1c SHA512 854b2122ca921d3d04031e7a20c57fc5f831c94a9a85295aa3f685af06f05368e360403fc35c81c070a1aa7da6e9e45c740bf3abf29e3f896c0537ed3a0b3224
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_rc1.ebuild b/dev-util/lldb/lldb-17.0.0_rc1.ebuild
deleted file mode 100644
index 0b408d9e3c91..000000000000
--- a/dev-util/lldb/lldb-17.0.0_rc1.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=""
-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
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/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-17.0.0_rc2.ebuild b/dev-util/lldb/lldb-17.0.0_rc2.ebuild
deleted file mode 100644
index 0b408d9e3c91..000000000000
--- a/dev-util/lldb/lldb-17.0.0_rc2.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=""
-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
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/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_pre20230803.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230803.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230810.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/dev-util/lldb/lldb-18.0.0_pre20230820.ebuild
deleted file mode 100644
index ef2125c2af64..000000000000
--- a/dev-util/lldb/lldb-18.0.0_pre20230820.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=""
-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/sdl-jstest/Manifest b/dev-util/sdl-jstest/Manifest
new file mode 100644
index 000000000000..a7469ed99e8b
--- /dev/null
+++ b/dev-util/sdl-jstest/Manifest
@@ -0,0 +1,7 @@
+AUX sdl-jstest-0.2.2-appstream-util-nonet.patch 1370 BLAKE2B a7fae0e41537bb780603330d7018b1f790a4e3a3dbc00e669b989fd310b1a2ed92913fe553e9079c9a5e850d7499381e3c3fa5378aa6bf328f8d91d76e4112ba SHA512 5283a949b800bbf4d34c0138ee7230a8059a64db2a40a701fda6b3f234991696667496540cacaeb1a6402c5a5dcdccd6f046db32e8ce595e4b7cad5241a11c26
+AUX sdl-jstest-0.2.2-sdl1.patch 1199 BLAKE2B 3faa164fa14ba0f39891bb719f029cf8384bb21842574aaf982789f84cd54ab67f65fd8e71a129581b1852181abd60c51b74c2c1a7c026ca94dbe389fafa52ae SHA512 da0e63ecfde9fb8008c752ef868536e45cf5547be5e7b451c493ce1f7227b9e6ceb2d80ca374fad49c4c74486c7668605d323d42fdbeb977322f60f1b4447632
+DIST sdl-jstest-0.2.2.tar.gz 24018 BLAKE2B 21d5b50fceb6543084c68d04c732e8e45722fd36b7fecdc96e1c360da0d139dacf0a127c54f20bf008181390a201a1c9cf448945719f94721eb7931c1a4f23f9 SHA512 56d8688b22e86f307d94ec3b45f2c1a6068c92745e02e477a956218126e97c45d8f8a8606638e98f25ffa5893d7e52622df799815a64d05c0f09d466a8a33346
+DIST sdl-jstest-sdl_gamecontrollerdb-69c2ca071a.tar.gz 61994 BLAKE2B 41ae614dbdcbc4b820cd5586798cef4d56eefe58386829dc502552f0696ffd53fb1320a970e1a25fde29ba2e3243b0feae3e58014dfbd7e43cb85abf90cbc03e SHA512 d295f484ee108a18e48003321fb92e3ccb3f7b6885ddc3a0a4a20df7b6c25dba2e1d067f50ba5596ed246d08ed7d243cd0d2791f6c01c9fc6f1f440aa52fb2f6
+EBUILD sdl-jstest-0.2.2.ebuild 1578 BLAKE2B 09e1b34969972a3d74aa0fccf4cc3d317176c0a70166191961e2c82bd5666a90c9f160f52fdc2f8e6efb0fb306041107b6d3cf94c761c73ef5564f3889be8cda SHA512 51f0ddd5f964a0cfc72d7bdad2a7e060a387fea6ead43cb687749839b416c9c856ae48986ae36504c0ed622c1c09ee7b095cca814e6183ddf6e04dc3052c998f
+EBUILD sdl-jstest-9999.ebuild 1487 BLAKE2B 61fabb76913947f1b608a0ca31ba011ac43e7b56cfb571cbe0db91251748979422c1283ed2ff7279c550a539723e0281ccde4aa6ff8bd8eaf123e9ab4203fcd8 SHA512 62e83878e5fa34f1d1eb40174ff18d6ef8264a0fe78c37bbff955eb8b45444a741d394879b16a134d632768822481beca604441fad710dc6e95654641879ce66
+MISC metadata.xml 1105 BLAKE2B 1f39f01d735d356abc6fb2fa351ecb83f1726df58d3c6d6cff02975b86cd5593b1f23f98d36313b0d5719b1104ff8f4d094c427528d33f9562e5a5692d473d36 SHA512 ddd16b5dd98f264c48eb5464eeb58ab8e355c9e99add572c7e6bf55594b1ea61462b4554862d1813c313fe124e17b58dff0213879fcf1e2493efbb12b5d4932b
diff --git a/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch
new file mode 100644
index 000000000000..bcbb99518597
--- /dev/null
+++ b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-appstream-util-nonet.patch
@@ -0,0 +1,35 @@
+https://github.com/Grumbel/sdl-jstest/issues/17
+https://github.com/Grumbel/sdl-jstest/commit/d442ee9e2c4dda1fd43cb3201ea8edf8222ee66c.patch
+
+From d442ee9e2c4dda1fd43cb3201ea8edf8222ee66c Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Fri, 14 Jul 2023 10:25:11 +0200
+Subject: [PATCH] Disable tests requiring network access
+
+Fixes #17
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e4284..09d3e2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(BUILD_SDL_JSTEST)
+   if (BUILD_TESTS)
+     add_test(NAME sdl-jstest.appdata.xml
+       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      COMMAND appstream-util validate-relax ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.appdata.xml)
++      COMMAND appstream-util validate-relax --nonet ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.appdata.xml)
+   endif(BUILD_TESTS)
+ 
+   file(COPY sdl-jstest.1
+@@ -101,7 +101,7 @@ if(BUILD_SDL2_JSTEST)
+   if (BUILD_TESTS)
+     add_test(NAME sdl2-jstest.appdata.xml
+       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      COMMAND appstream-util validate-relax ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.appdata.xml)
++      COMMAND appstream-util validate-relax --nonet ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.appdata.xml)
+   endif(BUILD_TESTS)
+ 
+   file(COPY sdl2-jstest.1
diff --git a/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch
new file mode 100644
index 000000000000..d90024019e14
--- /dev/null
+++ b/dev-util/sdl-jstest/files/sdl-jstest-0.2.2-sdl1.patch
@@ -0,0 +1,42 @@
+https://github.com/Grumbel/sdl-jstest/issues/15
+https://github.com/Grumbel/sdl-jstest/commit/62124aa8b9d4c3a8eec5206bf0fc09fade52b326
+
+From 62124aa8b9d4c3a8eec5206bf0fc09fade52b326 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Wed, 12 Jul 2023 17:34:38 +0200
+Subject: [PATCH] Fix initial blank screen in sdl-jstest
+
+Screen was left blank due to only getting drawn once a new event
+arrived.
+
+Fixes #15
+---
+ src/sdl-jstest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sdl-jstest.c b/src/sdl-jstest.c
+index 388e84d..bc95024 100644
+--- a/src/sdl-jstest.c
++++ b/src/sdl-jstest.c
+@@ -192,11 +192,11 @@ int main(int argc, char** argv)
+ 
+         int quit = 0;
+         SDL_Event event;
++        bool something_new = TRUE;
+         while(!quit)
+         {
+           SDL_Delay(10);
+ 
+-          bool something_new = FALSE;
+           while (SDL_PollEvent(&event)) {
+             something_new = TRUE;
+             switch(event.type)
+@@ -302,6 +302,8 @@ int main(int argc, char** argv)
+             printw("Press Ctrl-c to exit\n");
+ 
+             refresh();
++
++            something_new = FALSE;
+           }
+ 
+           if ( getch() == 3 ) // Ctrl-c
diff --git a/dev-util/sdl-jstest/metadata.xml b/dev-util/sdl-jstest/metadata.xml
new file mode 100644
index 000000000000..4e991521b8b8
--- /dev/null
+++ b/dev-util/sdl-jstest/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="sdl1">Enable <pkg>media-libs/libsdl</pkg> based input test</flag>
+		<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based input test</flag>
+	</use>
+	<longdescription>
+		sdl-jstest and sdl2-jstest are simple programs that lets you find
+		out how many joysticks SDL or SDL2 detected on your system, how many
+		axes, buttons, hats and balls they have each. They also lets you test
+		the joysticks by displaying the events they send or by displaying
+		their current button, axis, hat or ball state. sdl-jstest is
+		especially useful if you want to test your SDL_LINUX_JOYSTICK
+		configuration.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Grumbel/sdl-jstest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild b/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild
new file mode 100644
index 000000000000..5494d36cbeee
--- /dev/null
+++ b/dev-util/sdl-jstest/sdl-jstest-0.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	HASH_GAMECONTROLLERDB="69c2ca071ac380569b7037e05d9153a08e2e7651"
+	SRC_URI="
+		https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz
+		https://github.com/gabomdq/SDL_GameControllerDB/archive/${HASH_GAMECONTROLLERDB}.tar.gz
+			-> ${PN}-sdl_gamecontrollerdb-${HASH_GAMECONTROLLERDB::10}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple SDL joystick test application for the console"
+HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+IUSE="+sdl sdl1 test"
+REQUIRED_USE="|| ( sdl sdl1 )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sdl1? ( media-libs/libsdl[joystick] )
+	sdl? ( media-libs/libsdl2[haptic,joystick] )
+	sys-libs/ncurses:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-libs/appstream-glib )
+	dev-util/tinycmmc
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-appstream-util-nonet.patch
+	"${FILESDIR}"/${P}-sdl1.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=( external/sdl_gamecontrollerdb )
+
+		git-r3_src_unpack
+	else
+		default
+
+		rmdir "${S}"/external/sdl_gamecontrollerdb || die
+		mv SDL_GameControllerDB-${HASH_GAMECONTROLLERDB} \
+			"${S}"/external/sdl_gamecontrollerdb || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SDL2_JSTEST=$(usex sdl)
+		-DBUILD_SDL_JSTEST=$(usex sdl1)
+		-DBUILD_TESTS=$(usex test)
+		-DWARNINGS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/sdl-jstest/sdl-jstest-9999.ebuild b/dev-util/sdl-jstest/sdl-jstest-9999.ebuild
new file mode 100644
index 000000000000..c2514acce683
--- /dev/null
+++ b/dev-util/sdl-jstest/sdl-jstest-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	HASH_GAMECONTROLLERDB="69c2ca071ac380569b7037e05d9153a08e2e7651"
+	SRC_URI="
+		https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz
+		https://github.com/gabomdq/SDL_GameControllerDB/archive/${HASH_GAMECONTROLLERDB}.tar.gz
+			-> ${PN}-sdl_gamecontrollerdb-${HASH_GAMECONTROLLERDB::10}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple SDL joystick test application for the console"
+HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+IUSE="+sdl sdl1 test"
+REQUIRED_USE="|| ( sdl sdl1 )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sdl1? ( media-libs/libsdl[joystick] )
+	sdl? ( media-libs/libsdl2[haptic,joystick] )
+	sys-libs/ncurses:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-libs/appstream-glib )
+	dev-util/tinycmmc
+	virtual/pkgconfig
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=( external/sdl_gamecontrollerdb )
+
+		git-r3_src_unpack
+	else
+		default
+
+		rmdir "${S}"/external/sdl_gamecontrollerdb || die
+		mv SDL_GameControllerDB-${HASH_GAMECONTROLLERDB} \
+			"${S}"/external/sdl_gamecontrollerdb || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SDL2_JSTEST=$(usex sdl)
+		-DBUILD_SDL_JSTEST=$(usex sdl1)
+		-DBUILD_TESTS=$(usex test)
+		-DWARNINGS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 697f71329715..053e58cc5b21 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -2,8 +2,10 @@ DIST stripe-mock-0.168.0.tar.gz 1290778 BLAKE2B a8d9ad32ecccb6ced1c45c34174a6a9c
 DIST stripe-mock-0.169.0.tar.gz 1290637 BLAKE2B e9e5e8861a23760830b6161fb69a55082457d370bd67811cb12d8ab3689eea915ceaa47f7954fd341cf8487d403b31b6e90c034d7fcd535014b7ba249c5eb7f0 SHA512 0ff65570c8327a929b132684dbed7858f62fe63d1ba6d6a41f355e5260d87433b1b5c0efe38e103f7ae814ae5d008f3f41683f46ae4bef295e28589cf2e3cc16
 DIST stripe-mock-0.170.0.tar.gz 1288862 BLAKE2B 141a0001ef9117e296a711e6a5cf786bd20b6eb7711a07e78e2ebdaf5e2b71ee8e9a9caba4d3f2e23482c6f56ae4fb7504c1c20c299eaeed694d4c119c65f873 SHA512 7bf6128aa3406426a845c199d1fc0c51e2d299ef5ae1add01d3fc43db2b0311ca9e813148fac453a5d48865ebc3155fb2498cf09c8661300e2dc97f148e8809e
 DIST stripe-mock-0.171.0.tar.gz 1297648 BLAKE2B a152573e43363133b8a32f998d1a5ea4a40232a4dc6a7fb9342c6e9b538ae026f1cee3b4d2139239a497d9e3d426467991e1ce721bd0179071a87568093ebb24 SHA512 9877c3ce68255496c99a08f57af89f4070e5d3ecca699c6d437ae62fda8781abe7ef63f56aee72662f5350b05083b47ca8b4552e513187465c73276d3bed4831
+DIST stripe-mock-0.172.0.tar.gz 1297748 BLAKE2B a712f532e9b8af019212bcd744a97bdd195388debb29c153041539ebe640ad877d37d0de1ad6d878f75e0e3c72e53ae62ca97a4662e77b3b111e1d926e240bb9 SHA512 5ae159389aaa5ac5e2b9caec923824771bc8a75434146f915ecb23e81f25d43ec73bdfa73b1851101b4cad7db431cece61c111ddedc89f229e5dd7de963b72a9
 EBUILD stripe-mock-0.168.0.ebuild 498 BLAKE2B a8e1dd0ac1f07195ecdadc4d5e68499e6d48ef5ac47fd770a7a421cc6b8fdc035bb1ae7c4f0ee7028c7ded5dbca4f260499f4fabb58d80794e807d6206232b1e SHA512 9fc51687f9fad3ac4c9c505c4a5f6b7bc668acd17f186bdec61a13cb4eb0b8d024b3eca7717434c6720f7ae4bd89431a7916575492700ad9dd9f86508b85d007
 EBUILD stripe-mock-0.169.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.170.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 EBUILD stripe-mock-0.171.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
+EBUILD stripe-mock-0.172.0.ebuild 500 BLAKE2B 86bc55d32bc4a634af3ae5f31db1716bfe8bba864b44d5a78a75519cc9347f4593763d06337aa5c97b4cc96775469d64812f8b7072806ecdcf7f5ceaa3cde9af SHA512 df95803239ecb13e6c4943af3b6c61b1229d16ad15a5168e3261413a1bc9d98a28e3920b4aa64ca88a542619be5391db4adcedf3a9ba9218ad010b6e6823fb6b
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild
new file mode 100644
index 000000000000..ca0f4e60efa7
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.172.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}
diff --git a/dev-util/tinycmmc/Manifest b/dev-util/tinycmmc/Manifest
new file mode 100644
index 000000000000..cbcc2b98a493
--- /dev/null
+++ b/dev-util/tinycmmc/Manifest
@@ -0,0 +1,4 @@
+DIST tinycmmc-0.1.0.tar.gz 10559 BLAKE2B 9708c6c95c5746d000bb02b46bc40b788b8b18d55d3bd2e97e88789f4b084e145db39e038b4d619c75273b8fd23713f6906a8618fa248664a468c60e1073000c SHA512 cf1e8108be2f5c8a23e08756b6f50a2493a688ffa8bd7a06a59330cdd74046035705f18d5f53a00d6779dafb76a2c529b4ca9be7e53ff2660d718e8f68544769
+EBUILD tinycmmc-0.1.0.ebuild 440 BLAKE2B 22bfe8ee885011786b41eaffed3edc427921086cac66bb3ecf3d494e2d6c9dec6a64eec2afce0b9ffe772e58a03a0dc9e3a9c8b7a2cae0e76648471ef9f1d33a SHA512 88a2d143fc2c3f5db8e964db71b0b1ee81f652f56213150d72e4e291e51e88d971a175cdeed8fe24832512d558a8bd894642d5f37f0f83f0bae2b9dc44058d0d
+EBUILD tinycmmc-9999.ebuild 438 BLAKE2B f2efba8224cde6c3099d5551dcfedf3dd714e381c2e55b7dc93e194d206752d6a680d7fb48dc807eb855793b62cfef810b1035f538db91e460ad5bb1bf04712c SHA512 cab8f8d6aaba6b6729a9f17cfe34222b5c6f2be3009b5a747a954ff2bb6b3f1eb791fbc3af8e639f90806465b0b83cfc8007c48cfe6e599e1bdaca28f8aa822c
+MISC metadata.xml 466 BLAKE2B 2fe1efd4c596f9c0023f6f6758da754cda0467f615798ff4f9eda4c9a4500db4364415ce14277dfbe40fdf1babde0a8ebd1ba636b58cb2776fc63ed977498304 SHA512 c0bf3b4a08ef90c34d7dfa222b59fb38cc6590465b9b2a93d5cbc501794f6ed36fc76ce971da04f495262964f4f7e8e659770881f7cb8308617ed60655b515c6
diff --git a/dev-util/tinycmmc/metadata.xml b/dev-util/tinycmmc/metadata.xml
new file mode 100644
index 000000000000..a85353b5969e
--- /dev/null
+++ b/dev-util/tinycmmc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Grumbel/tinycmmc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild b/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild
new file mode 100644
index 000000000000..d36c835eb825
--- /dev/null
+++ b/dev-util/tinycmmc/tinycmmc-0.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	SRC_URI="https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Tiny CMake Module Collections"
+HOMEPAGE="https://github.com/Grumbel/tinycmmc"
+
+LICENSE="GPL-3+"
+SLOT="0"
diff --git a/dev-util/tinycmmc/tinycmmc-9999.ebuild b/dev-util/tinycmmc/tinycmmc-9999.ebuild
new file mode 100644
index 000000000000..ecaf99a1a6db
--- /dev/null
+++ b/dev-util/tinycmmc/tinycmmc-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Grumbel/${PN}.git"
+else
+	SRC_URI="https://github.com/Grumbel/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Tiny CMake Module Collections"
+HOMEPAGE="https://github.com/Grumbel/tinycmmc"
+
+LICENSE="ZLIB"
+SLOT="0"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index aeadf77d0ba1..accb1f8ea9aa 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/geolith-jg/Manifest b/games-emulation/geolith-jg/Manifest
new file mode 100644
index 000000000000..f0e13a349056
--- /dev/null
+++ b/games-emulation/geolith-jg/Manifest
@@ -0,0 +1,4 @@
+DIST geolith-0.1.0.tar.bz2 245785 BLAKE2B a1a541bdf32da722a095282b4b0f41f6c4d27c9450615842c99a080a61d60c189b0a769812704d30ff0d20ccfbf5c950f01131bed7694dbd5e5814b73390c272 SHA512 94112de9e6f33593365559f275f3d2bcf759346c706c1608e010d60987c4e2337b50dce980a144c25593fe4a0bc4880d9bd955355f2ceed710ab39afcad4e916
+EBUILD geolith-jg-0.1.0.ebuild 971 BLAKE2B 8371897accb7f552c9ce78f7f3d9f77dc6e12f0af3fad0dd7b63153e7c03601b854c8e42324575f353b33bd05c90251ca7fef478763e27ce6ba4c134a775dcc2 SHA512 0906d4cc754c39e6f0b8a13b8c6691d6fb3c762c5a58284cae3e2713cfc4e73de802314388bc9bc538f7eb23e32b5ac376bc731a0599e091e5ce26e89c9f4d79
+EBUILD geolith-jg-9999.ebuild 971 BLAKE2B 8371897accb7f552c9ce78f7f3d9f77dc6e12f0af3fad0dd7b63153e7c03601b854c8e42324575f353b33bd05c90251ca7fef478763e27ce6ba4c134a775dcc2 SHA512 0906d4cc754c39e6f0b8a13b8c6691d6fb3c762c5a58284cae3e2713cfc4e73de802314388bc9bc538f7eb23e32b5ac376bc731a0599e091e5ce26e89c9f4d79
+MISC metadata.xml 874 BLAKE2B ed442eed66cecc3f25787a6139bf949c94987aec53a97c0ec0672d98e1fef074e0cf7a272b36bcc30d29b6e1a7ec9655c7d365fbdf362ea652cf08f5196fed92 SHA512 cc8fb1aa8ada69821d81f5d2f6f02c9a186859a9d0f9a757aec4907f78c808c254cc485974da76d37e47974da0b97ec96c6b683f0cdd3705102e5aa247e638b1
diff --git a/games-emulation/geolith-jg/geolith-jg-0.1.0.ebuild b/games-emulation/geolith-jg/geolith-jg-0.1.0.ebuild
new file mode 100644
index 000000000000..df45d534adcc
--- /dev/null
+++ b/games-emulation/geolith-jg/geolith-jg-0.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN%-*}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Jolly Good Neo Geo AES/MVS Emulator"
+HOMEPAGE="https://gitlab.com/jgemu/geolith"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
+else
+	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD MIT"
+SLOT="1"
+
+DEPEND="
+	dev-libs/miniz
+	media-libs/jg:1=
+	media-libs/speexdsp
+"
+RDEPEND="
+	${DEPEND}
+	games-emulation/jgrf
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		USE_EXTERNAL_MINIZ=1
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		USE_EXTERNAL_MINIZ=1
+}
diff --git a/games-emulation/geolith-jg/geolith-jg-9999.ebuild b/games-emulation/geolith-jg/geolith-jg-9999.ebuild
new file mode 100644
index 000000000000..df45d534adcc
--- /dev/null
+++ b/games-emulation/geolith-jg/geolith-jg-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN%-*}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Jolly Good Neo Geo AES/MVS Emulator"
+HOMEPAGE="https://gitlab.com/jgemu/geolith"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
+else
+	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD MIT"
+SLOT="1"
+
+DEPEND="
+	dev-libs/miniz
+	media-libs/jg:1=
+	media-libs/speexdsp
+"
+RDEPEND="
+	${DEPEND}
+	games-emulation/jgrf
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		USE_EXTERNAL_MINIZ=1
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		USE_EXTERNAL_MINIZ=1
+}
diff --git a/games-emulation/geolith-jg/metadata.xml b/games-emulation/geolith-jg/metadata.xml
new file mode 100644
index 000000000000..8ba92a8ef70b
--- /dev/null
+++ b/games-emulation/geolith-jg/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Geolith is a highly accurate emulator for the Neo Geo AES and MVS.
+		This project began life as a fork of GnGEO 0.8.1. All original
+		components were removed or replaced as the project progressed, with
+		the resulting codebase being entirely new, with all new code written
+		under the BSD 3-Clause license.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://gitlab.com/jgemu/geolith/-/issues</bugs-to>
+		<remote-id type="gitlab">jgemu/geolith</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-emulation/jgemu/Manifest b/games-emulation/jgemu/Manifest
index 339ae5a760f3..c0ff8c7cc061 100644
--- a/games-emulation/jgemu/Manifest
+++ b/games-emulation/jgemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD jgemu-1.0.0.ebuild 820 BLAKE2B ee8f7fbf78a7feda4a11d3cde353dc9f5c2e834a07d31787afccfce0831d5543dd5ffcd9d6ecb2c6a88d17c8a13222c6b526a25f6a59a6d8a0effb23fa08f6d2 SHA512 34eff51b1909ad7dc22eb7bc766385e2e3fda38b198ed8959bbbffd632d7c636c253e07a6822e6cf948bbc7d1edf3cbac5e8b165673a9cf6815f7ca3941ee834
-MISC metadata.xml 1488 BLAKE2B 65a09537b23177c058ecb0c6f4b9e26d5d2bac73a8748baf23a79d5a0422e54c412b3b55772e57ea803d3d8c42751ba1678034327eedda259ecdc3a6cd569125 SHA512 8ff927a17dbf5122fe64a4dceeab9c65b1393a068620ca40b1cbf84138215df66e89d6afef8bd95128405a0c8e9f4a2622b51e001e43ac9824d74c3e40116f53
+EBUILD jgemu-1.0.0.ebuild 872 BLAKE2B 32cc1a71ec9654207a52bf9a5a362383ce5aa7f34e920fa68674623eb6abd29c283cdd0e7136e8a2de52bb9c8e348714da9b37dfd43283e72d5e5d78acc130e2 SHA512 6687c4424764674a69509a201a32d9ed09d450723b0e90857c2fc970b4aca7e675dc9eeb38017845690d05f6aaa8c3e23dd198d822e0b566134d47b45ff1a837
+MISC metadata.xml 1554 BLAKE2B 7dcabfbc45c45835fafabecb63c86920d10119d32ea0cba13d3febe95d93b07e8dca2dbb35e4c23d8a764503fc7562165c5973d862a1ebf8c0c5676cb535b100 SHA512 b48cbea79daed4eb63ec39bb12736135cc77a9bcecf6bc540f685674f2df230b3c99b2514a80e1478d99eecb7cee1174cb8ee0c82438318b4ae87969a374bd61
diff --git a/games-emulation/jgemu/jgemu-1.0.0.ebuild b/games-emulation/jgemu/jgemu-1.0.0.ebuild
index 712ef6bd8de6..a9e79e906401 100644
--- a/games-emulation/jgemu/jgemu-1.0.0.ebuild
+++ b/games-emulation/jgemu/jgemu-1.0.0.ebuild
@@ -9,12 +9,13 @@ HOMEPAGE="https://jgemu.gitlab.io/"
 LICENSE="metapackage"
 SLOT="1"
 KEYWORDS="~amd64"
-IUSE="+bsnes +cega +gambatte +jollycv +mednafen melonds +mgba +nestopia +prosystem sameboy +vecx"
+IUSE="+bsnes +cega +gambatte +geolith +jollycv +mednafen melonds +mgba +nestopia +prosystem sameboy +vecx"
 
 RDEPEND="
 	bsnes? ( games-emulation/bsnes-jg:1 )
 	cega? ( games-emulation/cega-jg:1 )
 	gambatte? ( games-emulation/gambatte-jg:1 )
+	geolith? ( games-emulation/geolith-jg:1 )
 	jollycv? ( games-emulation/jollycv-jg:1 )
 	mednafen? ( games-emulation/mednafen-jg:1 )
 	melonds? ( games-emulation/melonds-jg:1 )
diff --git a/games-emulation/jgemu/metadata.xml b/games-emulation/jgemu/metadata.xml
index 413c1b66981e..22170a9600ff 100644
--- a/games-emulation/jgemu/metadata.xml
+++ b/games-emulation/jgemu/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="bsnes">Install bsnes for Super Nintendo</flag>
 		<flag name="cega">Install Cega for SG-1000, Sega Master System and Game Gear</flag>
 		<flag name="gambatte">Install Gambatte for Game Boy and Game Boy Color</flag>
+		<flag name="geolith">Install Geolith for Neo Geo AES/MVS</flag>
 		<flag name="jollycv">Install JollyCV for ColecoVision</flag>
 		<flag name="mednafen">Install Mednafen for Atari Lynx, Nintendo Virtual Boy, NEC PC Engine, NEC SuperGrafx, Sony PlayStation, Sega Saturn, Super Nintendo, Neo Geo Pocket and WonderSwan</flag>
 		<flag name="melonds">Install MelonDS for Nintendo DS</flag>
diff --git a/games-emulation/jgrf/Manifest b/games-emulation/jgrf/Manifest
index 5c0d5bad7a9e..8c24d08e8359 100644
--- a/games-emulation/jgrf/Manifest
+++ b/games-emulation/jgrf/Manifest
@@ -1,4 +1,4 @@
 DIST jgrf-1.0.2.tar.bz2 297837 BLAKE2B 1119f3b11ec4d64eda775ca39a13f1c6873dfa06b206229e12edf1790b8abb5ebf6b9161dd11fd735e9e3745c9c4bb7fc3a9e44523a65be8bd2ca139d0ccc14f SHA512 75b4c8fe8b142a144eccdcbbb763c78c091f869d3411caa127a8c319af1c37cd1157f63a2ee28945f4dc1c5b7b465b15a9c7fdeb23e03bb7d7441e8caa16b435
-EBUILD jgrf-1.0.2.ebuild 1068 BLAKE2B 3c842a18b02a8797ec6addbf2c8feb9458c3148c4145ed9f0b4d1678f2afc26dfaf4896b09e9e45b4ac01b12d743b17069574e2ed1bd494c67baef9ecf0791a3 SHA512 13658251c5469980bb8c26d2203b65941a0d09c1cb586f4e13e28197379e11d2283cb17d15084d780db5f876b4d6aaf6bd6f58cf9ffb40735a886f587337b0b3
-EBUILD jgrf-9999.ebuild 1068 BLAKE2B 3c842a18b02a8797ec6addbf2c8feb9458c3148c4145ed9f0b4d1678f2afc26dfaf4896b09e9e45b4ac01b12d743b17069574e2ed1bd494c67baef9ecf0791a3 SHA512 13658251c5469980bb8c26d2203b65941a0d09c1cb586f4e13e28197379e11d2283cb17d15084d780db5f876b4d6aaf6bd6f58cf9ffb40735a886f587337b0b3
+EBUILD jgrf-1.0.2-r1.ebuild 1055 BLAKE2B f4242efdda9c454b7a0976c832e0565a4d81afb9a730b399f4209ce9b34054548b49cd3cc276000d4dedfe6f957f255e8cd20b9de9c70fde99e7ef0246cc4ab8 SHA512 8b831d084f15609c9fe608c8bdec526b5bd5454611c338506dbacba97ed8a2de791d3cc0136212de8e1d60fc5fb23f8be53d8f74fc942f393442cae657eea0cc
+EBUILD jgrf-9999.ebuild 1055 BLAKE2B f4242efdda9c454b7a0976c832e0565a4d81afb9a730b399f4209ce9b34054548b49cd3cc276000d4dedfe6f957f255e8cd20b9de9c70fde99e7ef0246cc4ab8 SHA512 8b831d084f15609c9fe608c8bdec526b5bd5454611c338506dbacba97ed8a2de791d3cc0136212de8e1d60fc5fb23f8be53d8f74fc942f393442cae657eea0cc
 MISC metadata.xml 1000 BLAKE2B a8242496f3cdbf3a1ebd47d32e7f280a2c369a66c9e777fcebe222ccbf8aa6c666f0195e86e4f939ad03c2f65c1d6d24e874af56e5faa38c46f6fa58bb39385d SHA512 e4348e7a3fe378a5be64b3da293135344700ec686240c7a7bdf55c3280ad871244414fc1c9fff93eddb32b83ff13ec9aa906be13f5a16d936ae468ab13a10352
diff --git a/games-emulation/jgrf/jgrf-1.0.2.ebuild b/games-emulation/jgrf/jgrf-1.0.2-r1.ebuild
index b52af23a4df0..6f5ecb9db5e1 100644
--- a/games-emulation/jgrf/jgrf-1.0.2.ebuild
+++ b/games-emulation/jgrf/jgrf-1.0.2-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="1"
 
 DEPEND="
 	dev-libs/miniz
-	dev-libs/openssl:0=[-bindist(-)]
+	dev-libs/openssl:0=
 	media-libs/jg:1=
 	media-libs/libepoxy[egl]
 	media-libs/libsdl2[opengl,sound,video]
diff --git a/games-emulation/jgrf/jgrf-9999.ebuild b/games-emulation/jgrf/jgrf-9999.ebuild
index b52af23a4df0..6f5ecb9db5e1 100644
--- a/games-emulation/jgrf/jgrf-9999.ebuild
+++ b/games-emulation/jgrf/jgrf-9999.ebuild
@@ -20,7 +20,7 @@ SLOT="1"
 
 DEPEND="
 	dev-libs/miniz
-	dev-libs/openssl:0=[-bindist(-)]
+	dev-libs/openssl:0=
 	media-libs/jg:1=
 	media-libs/libepoxy[egl]
 	media-libs/libsdl2[opengl,sound,video]
diff --git a/games-emulation/nestopia-jg/Manifest b/games-emulation/nestopia-jg/Manifest
index 65e7d4135815..e38bd586776e 100644
--- a/games-emulation/nestopia-jg/Manifest
+++ b/games-emulation/nestopia-jg/Manifest
@@ -1,4 +1,4 @@
 DIST nestopia-1.52.0.tar.bz2 451267 BLAKE2B a70e1251a5b9dcb17a5d8e8233c12cc90189a0471aa3faf955c15d7331e44c4a67d6ddd101326820c219c3b5e09780a7191a45c14267e6da156d968a5b9bfce0 SHA512 5b2876ec3dcc90b94b99184d964bdeee8f194e07f8b8efeb9f425a118c3cc51e3d54901d922988047bfcb7fa5f3be97ed4e694c1451046a98e99678625d1f6f4
 EBUILD nestopia-jg-1.52.0.ebuild 865 BLAKE2B 1f8c74e6b9d1df39cb47e0e5c880590aa89ca78610f200989dd9d287f2d072794b013ea1b743270dce86d316640f42c6280e52f183c68e097670ab0a76cec5a7 SHA512 3846e74b721890616fbc754f031f24472ac6b56b344f28c82c1f6f3cb65a211d62b07406aee2850da7b75815afa36ceb17a470f50c97b9a6369d7540b191c2e9
-EBUILD nestopia-jg-9999.ebuild 865 BLAKE2B 1f8c74e6b9d1df39cb47e0e5c880590aa89ca78610f200989dd9d287f2d072794b013ea1b743270dce86d316640f42c6280e52f183c68e097670ab0a76cec5a7 SHA512 3846e74b721890616fbc754f031f24472ac6b56b344f28c82c1f6f3cb65a211d62b07406aee2850da7b75815afa36ceb17a470f50c97b9a6369d7540b191c2e9
+EBUILD nestopia-jg-9999.ebuild 887 BLAKE2B 1bb79dec330e84dbf44c63c0ec057cc7113ee9249dbb655e516b10c1cd0f99e763c7bea9fd6fe43d485f53f6aeb2dc5e7326bc38543507b716831a60b690cc98 SHA512 bff99e40b640f23d2a22a8f941ea03a40c446f2890d5994697dc92b736c71d57832d744c9fd00fa19cb5888ddbdc818c2344a60d7f53c403a865541e51481f3b
 MISC metadata.xml 800 BLAKE2B e726ff89dd81d47e24992bd36e346a4af5a7ace1ff015f3b0b25b66a9d241a9f354649090d36a1eff3f4cab6b3dfa23ac214d6136e6a171292a0c3e44fd4a25c SHA512 cfb80f7738596660ff597824072f7e4fda1af3277af684156f1e16b1994a6c26baa64a799082ae46fc4013499fae68fb57710ce055aabc49bc0b132cd63e4c43
diff --git a/games-emulation/nestopia-jg/nestopia-jg-9999.ebuild b/games-emulation/nestopia-jg/nestopia-jg-9999.ebuild
index ed6cc71cbb13..7d6f68053c50 100644
--- a/games-emulation/nestopia-jg/nestopia-jg-9999.ebuild
+++ b/games-emulation/nestopia-jg/nestopia-jg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ SLOT="1"
 
 DEPEND="
 	media-libs/jg:1=
+	media-libs/soxr
 "
 RDEPEND="
 	${DEPEND}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 0a65672bef28..e2d2076ff3e0 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/wl-clipboard/Manifest b/gui-apps/wl-clipboard/Manifest
index 4d58f59784d7..485545389732 100644
--- a/gui-apps/wl-clipboard/Manifest
+++ b/gui-apps/wl-clipboard/Manifest
@@ -1,6 +1,8 @@
 DIST wl-clipboard-2.1.0.tar.gz 43198 BLAKE2B 02d203072d51a412945f125fb9653391342548ce4bd5688f96310d50006824017fb1bde728a15d2c20d22e90f47af7dbb1e858ff7d8f1df6596794a0b5479d43 SHA512 3edcbec2df3a3d7f88ea9271f3befee61b888b4be4f1be6ca238958d78436a445ffd5a84d20ff4eaf4835016696c8e3f14df7b48c391b0647416e9eb9cbf5d2e
 DIST wl-clipboard-2.2.0.tar.gz 49344 BLAKE2B 4d7c8e5756396748871dd54f8823857511e0666b6bb5efa783894660efaf533a99064b84456439390f2ff2fc2fe16d97748efcafe24cfa18dbced42fb82e0269 SHA512 a2667b26970ebdd4c6d8bb6a05d902fa446fb94ba2c878dfa896e502277dac9837c75370108de9a39308597c153f3952289933174adf535148d027593a6cf829
+DIST wl-clipboard-2.2.1.tar.gz 49421 BLAKE2B 2d98c8b557ab39ab5b39af477632a55b19aff8f15496d6d6c6b8db8ab80a0fce9628a0d0c48cc77375def4edd4767b74c30816b6881142f420abd68f1e06c051 SHA512 fdda519df42e1dbfb112ab7d8195a0f36cf5cf18fffffa8f32ac4688a08009e206b96a169da641f909c9acf244eb6a5201811842b4d3111e1ccdb1ce8fb4db43
 EBUILD wl-clipboard-2.1.0.ebuild 581 BLAKE2B 885a076b3afdd368fa6a1e2861dbf940ebcb58118c88bbadabe71a5cef294b568b8f4736fb96fb7670437dda2550bf10b6a99aa63386ecc2774787a3672ca823 SHA512 be78d2ca1b35604853d551e06878845a40aef045b4dfe8e81fb4f5da0ca903e787d3503e798f5ffa35395a2897e8e21af492bb3a70d91be90abbba2fa909a68d
 EBUILD wl-clipboard-2.2.0.ebuild 611 BLAKE2B 79491328d806804475f2bad61654c1d761cb8116203515dad9a0ec4e2da61779868ebedfb61972a4477e98feb9379b67732c308b9f440602c08ae177f78b9d4c SHA512 32364c2c1ed24e85b9693ec062f813e688a15672be0c75fe6e008f762c8a21a24dce8a06583b26b315eff4cb70738e08c5e38197829a82a27975cd0bab4fef76
+EBUILD wl-clipboard-2.2.1.ebuild 624 BLAKE2B c6a033383b6ca6489849483a74ea2b969561c2868bcd856a62b1ce3e16201b96da6ea10955b30a57c71a1d854bb9cf1619e8a62bae6f2f0291108631c66770b0 SHA512 0336c52a8ff4676327bae0d1aa3db8a8e6945023f9e4d10e7c4389a37806f6496cb4c30c7e699f1125017edf6d744589011bef11991fdd4e73c7d218ef42dba5
 EBUILD wl-clipboard-9999.ebuild 614 BLAKE2B a0939edb30f43a13023a26062bd931e98c49fbf10a7697179cf7dcf14aac600849cc25ceee28d141cce2a38bd9eb8cf77daa739d6ea42c75194707a2765746fc SHA512 7a7fa691e37b58104d1da8e05f87fc8ab05e1ff94e9acfecb0db90c7480cd671685dc4d9b59dccaa6405d7f3e4262cb17f213fd1e35369ae5d791d9595e7c568
 MISC metadata.xml 468 BLAKE2B 4831c7406109ae1ccdd7af9cbd780f91cfbf23153de38b8bf3280fed440e90b38724a64b21570dbfd64795109495902999f5a28788aaf7d627264f9c811b9865 SHA512 753d3918a25a5a416758bf37b9c1d5c15961d62a876e67263d3a3c9391dc49cc4bd6cdf4816ca855f5e49d93ad308a319f9fe007e37f3e88480c2ed2a996ed41
diff --git a/gui-apps/wl-clipboard/wl-clipboard-2.2.1.ebuild b/gui-apps/wl-clipboard/wl-clipboard-2.2.1.ebuild
new file mode 100644
index 000000000000..0418c679db5e
--- /dev/null
+++ b/gui-apps/wl-clipboard/wl-clipboard-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Wayland clipboard utilities"
+HOMEPAGE="https://github.com/bugaevc/wl-clipboard"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
+else
+	SRC_URI="https://github.com/bugaevc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-libs/wayland-protocols"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e39970bf8d93..15acfb7496eb 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index b11926991c0b..eb23d8b5c290 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -4,4 +4,5 @@ DIST alpine-2.26-chappa-5.patch.gz 173031 BLAKE2B 8719d37fde313e190608489e6191d4
 DIST alpine-2.26.tar.xz 7517628 BLAKE2B fe156974462dd566ac3fbe25cc54a1b2a480b3af46c8356356a97426f3e42495853efdbfeedc6173537dc150d90592c3fd9109e7d37f16738922a4205fd2f9df SHA512 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
 EBUILD alpine-2.26-r1.ebuild 2327 BLAKE2B 929d810868a2580e59aedb0ba15d01a9cc46b70db24908a55458ed5cc1cf52296d3a33442d1c96e39f2929779ae6e1f5543694a989dfe3c457c87a787364728d SHA512 95c4489a833725470d8eee34ee8e301da67ef39bb0029bb4f9efe78ff8af30b93c469dd5fe11fd6a0b68d1ee8e55ec4eba9160d78a4d28a99590c3fe2d9e796c
 EBUILD alpine-2.26-r2.ebuild 2487 BLAKE2B 986c0421e6eff3602656f1ddb11b9829dde0904d283d86e6509b0388c14dc3fda315b65febf08f7702829f081ac1390da4cd1fd13605e615fdf7b4163ca22ec6 SHA512 61d3d8e84c7df1cad4d38cd4ebdde354f583937e8ece9aecf8a1ccdd888c3cb451b7c9f714fa1aead11289bd498d712f0b8db72582fbe4c60f1dd8619905a35f
+EBUILD alpine-2.26-r3.ebuild 2731 BLAKE2B bf3192563182a8c5e91a2f508b3f4823f91e0ded7f4390d9d7aa4ad8b05eae94b78327a7fbf1603d01c4f804666a18f983fa4c4f4275992ed1767a129574ae47 SHA512 856fca2bce573109ad1b7e0d681e046e48dab1823f85a6ff49eced1a698127bb41c2c1e1c1ddfc6b3ce6a99fb9bf153ef4a2e101a76973511cee02556b595c06
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.26-r3.ebuild b/mail-client/alpine/alpine-2.26-r3.ebuild
new file mode 100644
index 000000000000..0a3624b42955
--- /dev/null
+++ b/mail-client/alpine/alpine-2.26-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic optfeature toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://alpineapp.email/ https://repo.or.cz/alpine.git/"
+CHAPPA_PATCH_NAME="${P}-chappa-5.patch"
+SRC_URI="https://alpineapp.email/alpine/release/src/${P}.tar.xz
+	chappa? ( https://alpineapp.email/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl"
+
+DEPEND="sys-libs/ncurses:=
+	virtual/libcrypt:=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap:= )
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
+	if use chappa; then
+		eapply "${FILESDIR}/${PN}-2.26-fix-clang16-build.patch"
+	else
+		eapply "${FILESDIR}/${PN}-2.26-fix-clang16-build-no-chappa.patch"
+	fi
+	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-pthread
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+		$(use_with ldap)
+		$(use_with ssl)
+		$(use_with passfile passfile .pinepwd)
+		$(use_with kerberos krb5)
+		$(use_enable nls)
+		$(use_with ipv6)
+		$(use_with smime)
+	)
+
+	if has_version "app-text/hunspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/hunspell )
+	elif has_version "app-text/aspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/aspell )
+	fi
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+
+	# problems with strict prototypes, not easily patched #870766
+	append-cflags -Wno-error=strict-prototypes
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# the bundled c-client lib stumbles with both -j>1 and --shuffle #888709
+	emake -j1 --shuffle=none AR="$(tc-getAR)" c-client
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+	dodoc NOTICE README*
+	dodoc doc/brochure.txt
+	dodoc -r doc/tech-notes/
+	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+	newdoc "${S}/doc/mime.types" mime.types.sample
+	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+}
+
+pkg_postinst() {
+	optfeature "Spell checking" app-text/hunspell app-text/aspell
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f6e8fa88c3d6..eb9f4999e9d1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f9e738a26b5e..5d58f1056906 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Aug 2023 02:39:55 +0000
+Tue, 29 Aug 2023 08:39:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e8b5d98a6a62..d5d5125927af 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-29T02:39:59Z
+TIMESTAMP 2023-08-29T08:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtWn9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtruBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtmBAAqZ22/iRVETIZHupDSVpenNPt1+se9lUvZoIgN3+7+EEgGUUyYN6d+BG8
-llMtPLbQ4yjXcZpunny4G5DXKGrhwGWVATpg5s6pZFXVy9B8SIPevUREDvA+dWHu
-15oKRo83Htp2zT+WCxp3CE8XJp2YxtCvx2sLcHlQM4G/+XTu105AAQmS/SIM+QP/
-o4h4gJB72xc/IPWZpW0nISEN+DhO/BNufbd1Nsvi6x/JUiMjaNdUJeowO0fKbARg
-yUnzsPQos0JVCyHMdLsEpfrasZgIRYVR7FRt8XjcRsbxpPhHKTPMogh9EdQSqL99
-8MKoZt/jezcsCxmtMPvIBbwQczRdlc8lU+qPlAiyvL1rDZXsaZUiuYfpt1xOc14J
-LHSNQxg6Lpqwk5KsKeGAO4Oi3kJXjfYGedxtJ6T9SAVtoACHRRSTcydyDQmtXa+X
-IUVbO+kC1GGABcTx+l6dVjpTp/akyCSjhANOdeJp8mhBShF+6pIrJFCVq7qSmsMB
-2lVfEcrbSer1K9I/qv0vTYSohOeSANtTpq5rEP57CUwKsQeFfXlrSe4FTwRwx/yE
-gw403ZtSGQa9dnf3nj4OvyHOp8LWGOkMwomgNIX66/QhM1wP/M0SiavlAj4SlQQc
-BmGdTehgr6yYfopLKL1aG5eME1Nh7tOIE6zdoHiy8N6XUowcReM=
-=Ex8F
+klDIJg//b56TKMKkj8pn95rEYpDrh3TGp02QMLYUGlT49bnXYENKOvIy88yeu1pV
+ubI6aH/hXgKB9kfDZuCma0ZaiRDMcY0wX9kwNVjPUx+k/AtufmfPHOG6e5c0o4iS
+jEomkQ49j7gvEFUj+qhcxvZO6WVcllJ4dNi1Y17M9dqKZUnlAEojjKDTwWQu7vT4
+Zx/EJumYGdmopRsU4bFUhWULv8UPUKBDBf69x0XbuEh81vNuXXMANe5hDREZVxHd
+dGDARPAZtSCGIpjL22N5sLpeuYiINicZXnprZ7UfXV4ZLBtdimOHXv6RuLYLI3gB
+jg7DNsr+1bqL3r34ksgBncXbAq9LsgjyPXQ3WBDJT0BaBT8VR23H6iY8gtQVpdhh
+rY7TeMxMkCy4eFgjroWI2/kTivz8OVcYv5WJ9zY+zVWe7e2kvH5TqYZESqA9ATuz
+tiLMRqKrbc3VkWdGKk1UvZ5XdxMXfQWvxAqIzYR/7LTyydqfQdQPQAAPmO6Jz7jb
+TSOF5roaR8AZFY18WxhImr1l8rDJ5mEod1VyLg8ErxrOWUXRN5zjijzMkr1QOsmP
+PeMZB+Zq352Can1CeHQ0zhCpbuht4LOSm2NwI0Zq5naxR04TTQ3czpEWfE2kg6Xp
+d+zvCnwhjiDaQTdmMcIX4BesYXFMRfBc3oUfXIwkHRvwfJKeS0U=
+=Tl7I
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 03c3d5e73c56..5d58f1056906 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Aug 2023 02:39:56 +0000
+Tue, 29 Aug 2023 08:39:57 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1acbbb1b09e5..e0ea0d6e6215 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 bfbe8bf50f6d..799a2f8f56d5 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.36 b/metadata/md5-cache/app-admin/awscli-1.29.36
new file mode 100644
index 000000000000..7bc27bec8275
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.29.36
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.31.36[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.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-13[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
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.31.36[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) 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/aws/aws-cli/archive/1.29.36.tar.gz -> aws-cli-1.29.36.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index b9c2526a5d3b..b0730d233f18 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/fzf-0.39.0 b/metadata/md5-cache/app-shells/fzf-0.39.0
deleted file mode 100644
index 909d91d79758..000000000000
--- a/metadata/md5-cache/app-shells/fzf-0.39.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=General-purpose command-line fuzzy finder, written in Golang
-EAPI=8
-HOMEPAGE=https://github.com/junegunn/fzf
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT BSD-with-disclosure
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/junegunn/fzf/archive/0.39.0.tar.gz -> fzf-0.39.0.tar.gz https://dev.gentoo.org/~sam/distfiles/app-shells/fzf/fzf-0.39.0-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4339dfb32b04cf18124f8d208900d1a7
diff --git a/metadata/md5-cache/app-shells/fzf-0.40.0 b/metadata/md5-cache/app-shells/fzf-0.40.0
deleted file mode 100644
index e9e745b343cc..000000000000
--- a/metadata/md5-cache/app-shells/fzf-0.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=General-purpose command-line fuzzy finder, written in Golang
-EAPI=8
-HOMEPAGE=https://github.com/junegunn/fzf
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT BSD-with-disclosure
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/junegunn/fzf/archive/0.40.0.tar.gz -> fzf-0.40.0.tar.gz https://dev.gentoo.org/~sam/distfiles/app-shells/fzf/fzf-0.40.0-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=53444630e71b4cdce302665b65abba08
diff --git a/metadata/md5-cache/app-shells/fzf-0.41.1 b/metadata/md5-cache/app-shells/fzf-0.41.1
deleted file mode 100644
index 0240cd68d1f8..000000000000
--- a/metadata/md5-cache/app-shells/fzf-0.41.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=General-purpose command-line fuzzy finder, written in Golang
-EAPI=8
-HOMEPAGE=https://github.com/junegunn/fzf
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT BSD-with-disclosure
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/junegunn/fzf/archive/0.41.1.tar.gz -> fzf-0.41.1.tar.gz https://dev.gentoo.org/~sam/distfiles/app-shells/fzf/fzf-0.41.1-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0ae3d1cff4b7f382a1679c22020799db
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 8e4eac5082f3..84f64519ed80 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/asio-1.28.0 b/metadata/md5-cache/dev-cpp/asio-1.28.0
index 443c6db13358..11059a057240 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.28.0
+++ b/metadata/md5-cache/dev-cpp/asio-1.28.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
 INHERIT=autotools
 IUSE=doc examples test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.28.0.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=be85eae33fdb78ce54e6f1518166a8ce
+_md5_=12b7bfca5bc74cc88dbefe21140d7701
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a10b3eebb6a6..b573fbdf89ed 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/elfutils-0.189-r4 b/metadata/md5-cache/dev-libs/elfutils-0.189-r4
new file mode 100644
index 000000000000..bbdb6cf66ccb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.189-r4
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/flex-2.5.4a sys-devel/m4 nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-elfutils ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= net-misc/curl[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone sys-libs/fts-standalone sys-libs/obstack-standalone )
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=8
+HOMEPAGE=https://sourceware.org/elfutils/
+INHERIT=autotools flag-o-matic multilib-minimal verify-sig
+IUSE=bzip2 debuginfod lzma nls static-libs test +utils zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
+RDEPEND=!dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= net-misc/curl[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone sys-libs/fts-standalone sys-libs/obstack-standalone )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2 verify-sig? ( https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2.sig )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=6f97caa0e0a9cc118424ba308708bc53
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_rc1 b/metadata/md5-cache/dev-libs/libclc-17.0.0_rc1
deleted file mode 100644
index 7314ba36a1c4..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_rc1
+++ /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 ) ) ) 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_rc2 b/metadata/md5-cache/dev-libs/libclc-17.0.0_rc2
deleted file mode 100644
index a73e9869bfbc..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_rc2
+++ /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 ) ) ) 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230803 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230803
deleted file mode 100644
index eed9ab0880ed..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230803
+++ /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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230810 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230810
deleted file mode 100644
index 3638efd9715d..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230810
+++ /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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230820 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230820
deleted file mode 100644
index 6a00425cd00d..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20230820
+++ /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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 3f08aa2e2954..9414793b467c 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-17.0.0_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_rc1
deleted file mode 100644
index 7bf4be4c47fb..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_rc1
+++ /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 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.0_rc1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc1[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
-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.0_rc1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc1[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.0_rc1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_rc2
deleted file mode 100644
index 3ff9ee8f31ed..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_rc2
+++ /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 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.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc2[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
-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.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc2[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.0_rc2
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230803 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230803
deleted file mode 100644
index 5bcd3dcd5376..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230803
+++ /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_pre20230803:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230803[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_pre20230803:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230803[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_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230810 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230810
deleted file mode 100644
index 9f37937ab9a0..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230810
+++ /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_pre20230810:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230810[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_pre20230810:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230810[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_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230820 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230820
deleted file mode 100644
index 882565321091..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.0.0_pre20230820
+++ /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_pre20230820:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230820[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_pre20230820:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230820[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_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-perl/Image-Info-1.440.0 b/metadata/md5-cache/dev-perl/Image-Info-1.440.0
new file mode 100644
index 000000000000..b913062ff113
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.440.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=The Perl Image-Info Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Image-Info
+INHERIT=perl-module
+IUSE=test examples
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.44.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e0efd931ae1e70dd65b243f48d4ea825
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.6.0 b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.6.0
new file mode 100644
index 000000000000..bc5b803ae859
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.6.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Mail::Box connector via POP3
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Mail-Box-POP3
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-POP3-3.006.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=c53ef8b25447f80f425449826d277083
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index c1749beb6115..2ad3f9b4e57e 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Perl-Strip-1.200.0 b/metadata/md5-cache/dev-perl/Perl-Strip-1.200.0
new file mode 100644
index 000000000000..97c83e2ad053
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Strip-1.200.0
@@ -0,0 +1,16 @@
+BDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=dev-perl/PPI-1.213.0 >=dev-perl/common-sense-3.300.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=reduce file size by stripping whitespace, comments, pod etc
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Strip
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=dev-perl/PPI-1.213.0 >=dev-perl/common-sense-3.300.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Perl-Strip-1.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e93a27679cec8fbe25852d396177c5fd
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.329.400 b/metadata/md5-cache/dev-perl/glib-perl-1.329.400
new file mode 100644
index 000000000000..41fcb189298f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.329.400
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-libs/glib-2 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.300.0 >=dev-perl/ExtUtils-PkgConfig-1.0.0 virtual/pkgconfig dev-perl/Log-Agent dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2 dev-lang/perl
+DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
+EAPI=8
+HOMEPAGE=https://gtk2-perl.sf.net/ https://metacpan.org/release/Glib https://gitlab.gnome.org/GNOME/perl-glib
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3294.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=f2a88969e73825375c8baa42ef67ea8a
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 8b09a5d0b37e..4dd8d6c3afbd 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/adodb-5.22.2 b/metadata/md5-cache/dev-php/adodb-5.22.2
index 309790143386..fa9a8c1e9802 100644
--- a/metadata/md5-cache/dev-php/adodb-5.22.2
+++ b/metadata/md5-cache/dev-php/adodb-5.22.2
@@ -7,4 +7,4 @@ LICENSE=BSD LGPL-2.1+
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.22.2.tar.gz -> adodb-5.22.2.tar.gz
-_md5_=d011e410f14042f2df7ab90fd0cbdbf2
+_md5_=77a32e7752da0fca650632503b8b32eb
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2da3d0c272ac..cb7b5c28238d 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/boto3-1.28.36 b/metadata/md5-cache/dev-python/boto3-1.28.36
new file mode 100644
index 000000000000..b2e21472d5fb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.28.36
@@ -0,0 +1,16 @@
+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.36[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.6.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-13[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.36[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.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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.28.36.tar.gz -> boto3-1.28.36.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=126283200b84b4783039ed41b3d0a161
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.36 b/metadata/md5-cache/dev-python/botocore-1.31.36
new file mode 100644
index 000000000000..f52ad94c298a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.31.36
@@ -0,0 +1,16 @@
+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-13[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.36.tar.gz -> botocore-1.31.36.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=69d26e5c4dd7f9dfc7f380f8ca85ab82
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_rc1 b/metadata/md5-cache/dev-python/clang-python-17.0.0_rc1
deleted file mode 100644
index aa2fa49baf79..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_rc1
+++ /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: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.0_rc1:* !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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_rc1:* !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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_rc2 b/metadata/md5-cache/dev-python/clang-python-17.0.0_rc2
deleted file mode 100644
index fea46f42e848..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_rc2
+++ /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: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.0_rc2:* !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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_rc2:* !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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230803 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230803
deleted file mode 100644
index 1a71e13a213d..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230803
+++ /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_pre20230803:* !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_pre20230803:* !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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230810 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230810
deleted file mode 100644
index 036bce77306b..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230810
+++ /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_pre20230810:* !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_pre20230810:* !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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230820 b/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230820
deleted file mode 100644
index c89a0484f068..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.0.0_pre20230820
+++ /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_pre20230820:* !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_pre20230820:* !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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/httpbin-0.10.1 b/metadata/md5-cache/dev-python/httpbin-0.10.1
new file mode 100644
index 000000000000..a6f42ff2f864
--- /dev/null
+++ b/metadata/md5-cache/dev-python/httpbin-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flasgger[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-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:= ) python_targets_python3_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-13[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=HTTP Request and Response Service
+EAPI=8
+HOMEPAGE=https://github.com/psf/httpbin/ https://pypi.org/project/httpbin/
+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 ~ppc ~riscv ~s390 ~sparc
+LICENSE=|| ( MIT ISC )
+RDEPEND=dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flasgger[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.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/h/httpbin/httpbin-0.10.1.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=475e2b37ca008641fc1b62dad4e02638
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.82.7 b/metadata/md5-cache/dev-python/hypothesis-6.82.7
new file mode 100644
index 000000000000..98c6157701ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.82.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[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:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) >=dev-python/gpep517-13[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 postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_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/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] )
+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/HypothesisWorks/hypothesis/archive/hypothesis-python-6.82.7.tar.gz -> hypothesis-6.82.7.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=f00b5b084269c962e262d64a0aa9f53d
diff --git a/metadata/md5-cache/dev-python/krb5-0.5.1 b/metadata/md5-cache/dev-python/krb5-0.5.1
new file mode 100644
index 000000000000..28ea30cc5754
--- /dev/null
+++ b/metadata/md5-cache/dev-python/krb5-0.5.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/k5test[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( virtual/krb5 >=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-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Kerberos API bindings for Python
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pykrb5/ https://pypi.org/project/krb5/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=virtual/krb5 python_targets_python3_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/k/krb5/krb5-0.5.1.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=bbbfa701d6beecc7394e60e82c3fdd86
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_rc1 b/metadata/md5-cache/dev-python/lit-17.0.0_rc1
deleted file mode 100644
index a98fd24e2369..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_rc1
+++ /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 ) 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-13[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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_rc2 b/metadata/md5-cache/dev-python/lit-17.0.0_rc2
deleted file mode 100644
index 8ee233a51a37..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_rc2
+++ /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 ) 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-13[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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230803 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20230803
deleted file mode 100644
index 6469a95b1d71..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230803
+++ /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-13[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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230810 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20230810
deleted file mode 100644
index 9f77b03ebfa0..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230810
+++ /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-13[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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230820 b/metadata/md5-cache/dev-python/lit-18.0.0_pre20230820
deleted file mode 100644
index 34041ea4f7c1..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.0.0_pre20230820
+++ /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-13[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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/pandas-2.0.3-r1 b/metadata/md5-cache/dev-python/pandas-2.0.3-r1
index 3f2499f6c13f..e6ecfa5a6d53 100644
--- a/metadata/md5-cache/dev-python/pandas-2.0.3-r1
+++ b/metadata/md5-cache/dev-python/pandas-2.0.3-r1
@@ -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 virtualx
 IUSE=doc full-support minimal test X python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.23.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2020.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tzdata[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !minimal? ( >=dev-python/bottleneck-1.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numexpr-2.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) full-support? ( >=dev-python/beautifulsoup4-4.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blosc[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openpyxl-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytables-3.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.4.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tabulate-0.8.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xarray-0.21.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlrd-2.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlsxwriter-1.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_10(-)?] ) >=dev-python/scipy-1.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( || ( >=dev-python/PyQt5-5.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v2.0.3/pandas-2.0.3.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
-_md5_=173b86894a4dc8425875b459eaba29c2
+_md5_=a1a29db822a3a02e263bff2ab5deaff5
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-10.2 b/metadata/md5-cache/dev-python/pymdown-extensions-10.2
new file mode 100644
index 000000000000..1df6c681dd01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-10.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[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=Extensions for Python Markdown
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pymdown-extensions/pymdown_extensions-10.2.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=0d088140533af7820f3a383c7785f6c8
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.9.2 b/metadata/md5-cache/dev-python/pyspnego-0.9.2
new file mode 100644
index 000000000000..93ad58c2a327
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyspnego-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/gssapi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/krb5-0.3.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(-)?] dev-python/ruamel-yaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/cryptography[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-13[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 postinst prepare test
+DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[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/pyspnego/pyspnego-0.9.2.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=d90e241b139396b13f2d68838b22efb2
diff --git a/metadata/md5-cache/dev-python/sqlglot-17.16.2 b/metadata/md5-cache/dev-python/sqlglot-17.16.2
new file mode 100644
index 000000000000..8f2f7f999683
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlglot-17.16.2
@@ -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-13[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 postinst prepare test
+DESCRIPTION=An easily customizable SQL parser and transpiler
+EAPI=8
+HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
+INHERIT=distutils-r1 pypi optfeature
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-17.16.2.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=fe53db760b0de1ac68c4ab353234a4a9
diff --git a/metadata/md5-cache/dev-python/thriftpy2-0.4.16-r1 b/metadata/md5-cache/dev-python/thriftpy2-0.4.16-r1
new file mode 100644
index 000000000000..0dd13dd8fb4f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/thriftpy2-0.4.16-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ply[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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-13[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=Pure python approach of Apache Thrift
+EAPI=8
+HOMEPAGE=https://github.com/Thriftpy/thriftpy2/ https://pypi.org/project/thriftpy2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ply[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Thriftpy/thriftpy2/archive/v0.4.16.tar.gz -> thriftpy2-0.4.16.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=8ade2b5ea5efb40dc1c2a6b5b1cacdb7
diff --git a/metadata/md5-cache/dev-python/twisted-23.8.0 b/metadata/md5-cache/dev-python/twisted-23.8.0
new file mode 100644
index 000000000000..4e751736d0ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-23.8.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-fancy-pypi-readme-22.5.0[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(-)?] test? ( >=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-3.10.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/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cython-test-exception-raiser-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[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(-)?] >=dev-python/hypothesis-6.56[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(-)?] >=dev-python/pyhamcrest-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/openssh 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(-)?] ) ) python_targets_python3_10? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cython-test-exception-raiser-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[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(-)?] >=dev-python/hypothesis-6.56[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(-)?] >=dev-python/pyhamcrest-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/openssh 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(-)?] ) ) python_targets_python3_11? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cython-test-exception-raiser-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[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(-)?] >=dev-python/hypothesis-6.56[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(-)?] >=dev-python/pyhamcrest-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/openssh 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(-)?] ) ) python_targets_python3_12? ( >=dev-python/appdirs-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/constantly-15.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/cython-test-exception-raiser-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-test-exception-raiser-1.0.2[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(-)?] >=dev-python/hypothesis-6.56[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(-)?] >=dev-python/pyhamcrest-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyserial-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/openssh 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(-)?] ) ) ) 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(+)] ) >=dev-python/gpep517-13[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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=An asynchronous networking framework written in Python
+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
+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-3.10.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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/twisted/twisted-23.8.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
+_md5_=00a8ba47f41a9aaa31f9e55ba062cf5c
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.87.0 b/metadata/md5-cache/dev-python/zeroconf-0.87.0
new file mode 100644
index 000000000000..78ca8191b0a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.87.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[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-13[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
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[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/z/zeroconf/zeroconf-0.87.0.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=47b0522f1b80efa03d941baa9a702723
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 5bf07433fe8c..de3c6a5d4c0a 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.5 b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
deleted file mode 100644
index 38fbe02c3dee..000000000000
--- a/metadata/md5-cache/dev-ruby/sinatra-3.0.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/mustermann:3[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/mustermann:3[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby31(-)] dev-ruby/tilt:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby30(-)] dev-ruby/erubis[ruby_targets_ruby30(-)] dev-ruby/builder[ruby_targets_ruby30(-)] <dev-ruby/activesupport-7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby31(-)] dev-ruby/erubis[ruby_targets_ruby31(-)] dev-ruby/builder[ruby_targets_ruby31(-)] <dev-ruby/activesupport-7[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
-EAPI=8
-HOMEPAGE=https://sinatrarb.com/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-ruby/mustermann:3[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/mustermann:3[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby31(-)] dev-ruby/tilt:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.5.tar.gz -> sinatra-3.0.5.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a2e8a5d690cacc3d4fd4790c29c14018
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r4 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r4
deleted file mode 100644
index 33f0df09d0dc..000000000000
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby30(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby31(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] dev-ruby/redcarpet[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] dev-ruby/redcarpet[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/redcarpet[ruby_targets_ruby30(-)] dev-ruby/sassc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/redcarpet[ruby_targets_ruby31(-)] dev-ruby/sassc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
-EAPI=8
-HOMEPAGE=https://slim-template.github.io/
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby30(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby31(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bdd9e30854088b319f59466eaaed6e42
diff --git a/metadata/md5-cache/dev-ruby/slim-5.1.1 b/metadata/md5-cache/dev-ruby/slim-5.1.1
index 0ca475f2ec03..ade82ac28189 100644
--- a/metadata/md5-cache/dev-ruby/slim-5.1.1
+++ b/metadata/md5-cache/dev-ruby/slim-5.1.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !dev-ruby/slim:5[ruby_targets_ruby32(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby32(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] dev-ruby/redcarpet[ruby_targets_ruby30(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/kramdown:2[ruby_targets_ruby30(-)] dev-ruby/redcarpet[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] dev-ruby/redcarpet[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/kramdown:2[ruby_targets_ruby31(-)] dev-ruby/redcarpet[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] dev-ruby/redcarpet[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] dev-ruby/kramdown:2[ruby_targets_ruby32(-)] dev-ruby/redcarpet[ruby_targets_ruby32(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !dev-ruby/slim:5[ruby_targets_ruby32(-)] >=dev-ruby/tilt-2.1.0:*[ruby_targets_ruby32(-)] >=dev-ruby/temple-0.10.0:0.7[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] dev-ruby/redcarpet[ruby_targets_ruby30(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/kramdown:2[ruby_targets_ruby30(-)] dev-ruby/redcarpet[ruby_targets_ruby30(-)] dev-ruby/sassc[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] dev-ruby/redcarpet[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/kramdown:2[ruby_targets_ruby31(-)] dev-ruby/redcarpet[ruby_targets_ruby31(-)] dev-ruby/sassc[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] dev-ruby/redcarpet[ruby_targets_ruby32(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] dev-ruby/kramdown:2[ruby_targets_ruby32(-)] dev-ruby/redcarpet[ruby_targets_ruby32(-)] dev-ruby/sassc[ruby_targets_ruby32(-)] >=dev-ruby/test-unit-3.5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-5.1.1.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=507e65d874b2e75ba814f0011cf5c857
+_md5_=fcd48655c8d854f23ea2f8d3d8043b4b
diff --git a/metadata/md5-cache/dev-ruby/thor-1.2.1-r1 b/metadata/md5-cache/dev-ruby/thor-1.2.1-r1
deleted file mode 100644
index 110bd2f5a209..000000000000
--- a/metadata/md5-cache/dev-ruby/thor-1.2.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/childlabor[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/childlabor[ruby_targets_ruby31(-)] dev-ruby/webmock[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=Simple and efficient tool for building self-documenting command line utilities
-EAPI=8
-HOMEPAGE=http://whatisthor.com/
-INHERIT=ruby-fakegem
-IUSE=doc ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=!<dev-ruby/thor-0.20.3-r1:0 ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/erikhuda/thor/archive/v1.2.1.tar.gz -> thor-git-1.2.1.tgz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=924f3d544dd2a760fb62aec66e34e561
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b8e6b93c9bfb..c886ef101ff5 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-17.0.0_rc1 b/metadata/md5-cache/dev-util/lldb-17.0.0_rc1
deleted file mode 100644
index 97edad772ea3..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_rc1
+++ /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 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.0_rc1[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_rc1[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-17.0.0_rc1[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.0_rc1 ~sys-devel/llvm-17.0.0_rc1 !!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
-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.0_rc1 ~sys-devel/llvm-17.0.0_rc1 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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ff51bb18b647bf2b1d0c4ae79b74aa5b
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_rc2 b/metadata/md5-cache/dev-util/lldb-17.0.0_rc2
deleted file mode 100644
index b4301a8088bb..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_rc2
+++ /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 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.0_rc2[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_rc2[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-17.0.0_rc2[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.0_rc2 ~sys-devel/llvm-17.0.0_rc2 !!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
-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.0_rc2 ~sys-devel/llvm-17.0.0_rc2 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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ff51bb18b647bf2b1d0c4ae79b74aa5b
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230803 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230803
deleted file mode 100644
index 13d153ba8faa..000000000000
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230803
+++ /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 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-18.0.0_pre20230803[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.0.0_pre20230803[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.0.0_pre20230803[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_pre20230803 ~sys-devel/llvm-18.0.0_pre20230803 !!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_pre20230803 ~sys-devel/llvm-18.0.0_pre20230803 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/18.0.0_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8272b9584ca9a009c5ddd592570256d7
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230810 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230810
deleted file mode 100644
index 190459b0ca9c..000000000000
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230810
+++ /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 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-18.0.0_pre20230810[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.0.0_pre20230810[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.0.0_pre20230810[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_pre20230810 ~sys-devel/llvm-18.0.0_pre20230810 !!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_pre20230810 ~sys-devel/llvm-18.0.0_pre20230810 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/18.0.0_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8272b9584ca9a009c5ddd592570256d7
diff --git a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230820 b/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230820
deleted file mode 100644
index d3fd14162e20..000000000000
--- a/metadata/md5-cache/dev-util/lldb-18.0.0_pre20230820
+++ /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 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-18.0.0_pre20230820[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.0.0_pre20230820[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.0.0_pre20230820[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_pre20230820 ~sys-devel/llvm-18.0.0_pre20230820 !!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_pre20230820 ~sys-devel/llvm-18.0.0_pre20230820 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/18.0.0_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8272b9584ca9a009c5ddd592570256d7
diff --git a/metadata/md5-cache/dev-util/sdl-jstest-0.2.2 b/metadata/md5-cache/dev-util/sdl-jstest-0.2.2
new file mode 100644
index 000000000000..35b472c11787
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sdl-jstest-0.2.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/appstream-glib ) dev-util/tinycmmc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sdl1? ( media-libs/libsdl[joystick] ) sdl? ( media-libs/libsdl2[haptic,joystick] ) sys-libs/ncurses:=
+DESCRIPTION=Simple SDL joystick test application for the console
+EAPI=8
+HOMEPAGE=https://github.com/Grumbel/sdl-jstest
+INHERIT=cmake
+IUSE=+sdl sdl1 test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ ZLIB
+RDEPEND=sdl1? ( media-libs/libsdl[joystick] ) sdl? ( media-libs/libsdl2[haptic,joystick] ) sys-libs/ncurses:=
+REQUIRED_USE=|| ( sdl sdl1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Grumbel/sdl-jstest/archive/v0.2.2/sdl-jstest-0.2.2.tar.gz https://github.com/gabomdq/SDL_GameControllerDB/archive/69c2ca071ac380569b7037e05d9153a08e2e7651.tar.gz -> sdl-jstest-sdl_gamecontrollerdb-69c2ca071a.tar.gz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=58821ed230c529e6547bbffbc2456fc0
diff --git a/metadata/md5-cache/dev-util/sdl-jstest-9999 b/metadata/md5-cache/dev-util/sdl-jstest-9999
new file mode 100644
index 000000000000..dd4126db83e9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sdl-jstest-9999
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/appstream-glib ) dev-util/tinycmmc virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sdl1? ( media-libs/libsdl[joystick] ) sdl? ( media-libs/libsdl2[haptic,joystick] ) sys-libs/ncurses:=
+DESCRIPTION=Simple SDL joystick test application for the console
+EAPI=8
+HOMEPAGE=https://github.com/Grumbel/sdl-jstest
+INHERIT=cmake git-r3
+IUSE=+sdl sdl1 test
+LICENSE=GPL-3+ ZLIB
+PROPERTIES=live
+RDEPEND=sdl1? ( media-libs/libsdl[joystick] ) sdl? ( media-libs/libsdl2[haptic,joystick] ) sys-libs/ncurses:=
+REQUIRED_USE=|| ( sdl sdl1 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=730ed1e017d058e0b46c8bb1a1d6910f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.172.0 b/metadata/md5-cache/dev-util/stripe-mock-0.172.0
new file mode 100644
index 000000000000..5ebc78e021b4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.172.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Mock HTTP server that responds like the real Stripe API
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-mock/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT ISC BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.172.0.tar.gz -> stripe-mock-0.172.0.tar.gz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=908dfcc3e5829b18cfa35c52d83291b9
diff --git a/metadata/md5-cache/dev-util/tinycmmc-0.1.0 b/metadata/md5-cache/dev-util/tinycmmc-0.1.0
new file mode 100644
index 000000000000..74fb67edd330
--- /dev/null
+++ b/metadata/md5-cache/dev-util/tinycmmc-0.1.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tiny CMake Module Collections
+EAPI=8
+HOMEPAGE=https://github.com/Grumbel/tinycmmc
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/Grumbel/tinycmmc/archive/v0.1.0/tinycmmc-0.1.0.tar.gz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2b9c6deb6a07e2bf6334b60549a60e9f
diff --git a/metadata/md5-cache/dev-util/tinycmmc-9999 b/metadata/md5-cache/dev-util/tinycmmc-9999
new file mode 100644
index 000000000000..80dd6b391ce9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/tinycmmc-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Tiny CMake Module Collections
+EAPI=8
+HOMEPAGE=https://github.com/Grumbel/tinycmmc
+INHERIT=cmake git-r3
+LICENSE=ZLIB
+PROPERTIES=live
+SLOT=0
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=88cc6a3e6499dcef5c1127524b35f220
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c5d19449e3a0..2c3ccf9dd503 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/geolith-jg-0.1.0 b/metadata/md5-cache/games-emulation/geolith-jg-0.1.0
new file mode 100644
index 000000000000..8fe14a11fbf8
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/geolith-jg-0.1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/miniz media-libs/jg:1= media-libs/speexdsp
+DESCRIPTION=Jolly Good Neo Geo AES/MVS Emulator
+EAPI=8
+HOMEPAGE=https://gitlab.com/jgemu/geolith
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=BSD MIT
+RDEPEND=dev-libs/miniz media-libs/jg:1= media-libs/speexdsp games-emulation/jgrf
+SLOT=1
+SRC_URI=https://gitlab.com/jgemu/geolith/-/archive/0.1.0/geolith-0.1.0.tar.bz2
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=383d9a7341e591ed1533e25e671ae30b
diff --git a/metadata/md5-cache/games-emulation/geolith-jg-9999 b/metadata/md5-cache/games-emulation/geolith-jg-9999
new file mode 100644
index 000000000000..a51829a38f40
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/geolith-jg-9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-libs/miniz media-libs/jg:1= media-libs/speexdsp
+DESCRIPTION=Jolly Good Neo Geo AES/MVS Emulator
+EAPI=8
+HOMEPAGE=https://gitlab.com/jgemu/geolith
+INHERIT=toolchain-funcs git-r3
+LICENSE=BSD MIT
+PROPERTIES=live
+RDEPEND=dev-libs/miniz media-libs/jg:1= media-libs/speexdsp games-emulation/jgrf
+SLOT=1
+_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=383d9a7341e591ed1533e25e671ae30b
diff --git a/metadata/md5-cache/games-emulation/jgemu-1.0.0 b/metadata/md5-cache/games-emulation/jgemu-1.0.0
index 10c181883e3a..31ed0140fa75 100644
--- a/metadata/md5-cache/games-emulation/jgemu-1.0.0
+++ b/metadata/md5-cache/games-emulation/jgemu-1.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta ebuild for the Jolly Good API
 EAPI=8
 HOMEPAGE=https://jgemu.gitlab.io/
-IUSE=+bsnes +cega +gambatte +jollycv +mednafen melonds +mgba +nestopia +prosystem sameboy +vecx
+IUSE=+bsnes +cega +gambatte +geolith +jollycv +mednafen melonds +mgba +nestopia +prosystem sameboy +vecx
 KEYWORDS=~amd64
 LICENSE=metapackage
-RDEPEND=bsnes? ( games-emulation/bsnes-jg:1 ) cega? ( games-emulation/cega-jg:1 ) gambatte? ( games-emulation/gambatte-jg:1 ) jollycv? ( games-emulation/jollycv-jg:1 ) mednafen? ( games-emulation/mednafen-jg:1 ) melonds? ( games-emulation/melonds-jg:1 ) mgba? ( games-emulation/mgba-jg:1 ) nestopia? ( games-emulation/nestopia-jg:1 ) prosystem? ( games-emulation/prosystem-jg:1 ) sameboy? ( games-emulation/sameboy-jg:1 ) vecx? ( games-emulation/vecx-jg:1 )
+RDEPEND=bsnes? ( games-emulation/bsnes-jg:1 ) cega? ( games-emulation/cega-jg:1 ) gambatte? ( games-emulation/gambatte-jg:1 ) geolith? ( games-emulation/geolith-jg:1 ) jollycv? ( games-emulation/jollycv-jg:1 ) mednafen? ( games-emulation/mednafen-jg:1 ) melonds? ( games-emulation/melonds-jg:1 ) mgba? ( games-emulation/mgba-jg:1 ) nestopia? ( games-emulation/nestopia-jg:1 ) prosystem? ( games-emulation/prosystem-jg:1 ) sameboy? ( games-emulation/sameboy-jg:1 ) vecx? ( games-emulation/vecx-jg:1 )
 SLOT=1
-_md5_=7286a3428c72b502542ebde2de176b4f
+_md5_=e888787be97159350c684d544c879b83
diff --git a/metadata/md5-cache/games-emulation/jgrf-1.0.2 b/metadata/md5-cache/games-emulation/jgrf-1.0.2-r1
index 82a1caf29051..affd881b2cb1 100644
--- a/metadata/md5-cache/games-emulation/jgrf-1.0.2
+++ b/metadata/md5-cache/games-emulation/jgrf-1.0.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+DEPEND=dev-libs/miniz dev-libs/openssl:0= media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
 DESCRIPTION=The Jolly Good Reference Frontend
 EAPI=8
 HOMEPAGE=https://jgemu.gitlab.io/jgrf.html
@@ -8,8 +8,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=toolchain-funcs xdg
 KEYWORDS=~amd64
 LICENSE=BSD CC0-1.0 MIT ZLIB
-RDEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+RDEPEND=dev-libs/miniz dev-libs/openssl:0= media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
 SLOT=1
 SRC_URI=https://gitlab.com/jgemu/jgrf/-/archive/1.0.2/jgrf-1.0.2.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cecc51a726de6dc905797d354d93560e
+_md5_=0d79192ec2b4e122c59d7491c85e80d5
diff --git a/metadata/md5-cache/games-emulation/jgrf-9999 b/metadata/md5-cache/games-emulation/jgrf-9999
index 94ccc1fbf57e..09e493cb05d8 100644
--- a/metadata/md5-cache/games-emulation/jgrf-9999
+++ b/metadata/md5-cache/games-emulation/jgrf-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+DEPEND=dev-libs/miniz dev-libs/openssl:0= media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
 DESCRIPTION=The Jolly Good Reference Frontend
 EAPI=8
 HOMEPAGE=https://jgemu.gitlab.io/jgrf.html
@@ -8,7 +8,7 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=toolchain-funcs xdg git-r3
 LICENSE=BSD CC0-1.0 MIT ZLIB
 PROPERTIES=live
-RDEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+RDEPEND=dev-libs/miniz dev-libs/openssl:0= media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
 SLOT=1
 _eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cecc51a726de6dc905797d354d93560e
+_md5_=0d79192ec2b4e122c59d7491c85e80d5
diff --git a/metadata/md5-cache/games-emulation/nestopia-jg-9999 b/metadata/md5-cache/games-emulation/nestopia-jg-9999
index 630cdf5d45c6..152bad6dd6fe 100644
--- a/metadata/md5-cache/games-emulation/nestopia-jg-9999
+++ b/metadata/md5-cache/games-emulation/nestopia-jg-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/jg:1=
+DEPEND=media-libs/jg:1= media-libs/soxr
 DESCRIPTION=Jolly Good Fork of Nestopia
 EAPI=8
 HOMEPAGE=https://gitlab.com/jgemu/nestopia
 INHERIT=toolchain-funcs git-r3
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=media-libs/jg:1= games-emulation/jgrf
+RDEPEND=media-libs/jg:1= media-libs/soxr games-emulation/jgrf
 SLOT=1
 _eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=921378238380d0244b206da803be8718
+_md5_=8f14f47692afe2360e5baa2b635aa7fc
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index d8cd85ff4d34..be3289ab1635 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-2.2.1 b/metadata/md5-cache/gui-apps/wl-clipboard-2.2.1
new file mode 100644
index 000000000000..339b66ed4784
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-2.2.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner dev-libs/wayland-protocols >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/wayland
+DESCRIPTION=Wayland clipboard utilities
+EAPI=7
+HOMEPAGE=https://github.com/bugaevc/wl-clipboard
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/wayland
+SLOT=0
+SRC_URI=https://github.com/bugaevc/wl-clipboard/archive/refs/tags/v2.2.1.tar.gz -> wl-clipboard-2.2.1.tar.gz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=cf2f6ac6b8cd158e4a38a4ffd1ca1bc1
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 2c5af4040bca..0a55b820c2d0 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/alpine-2.26-r3 b/metadata/md5-cache/mail-client/alpine-2.26-r3
new file mode 100644
index 000000000000..e5f311d4b696
--- /dev/null
+++ b/metadata/md5-cache/mail-client/alpine-2.26-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap:= ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=An easy to use text-based based mail and news client
+EAPI=8
+HOMEPAGE=https://alpineapp.email/ https://repo.or.cz/alpine.git/
+INHERIT=autotools flag-o-matic optfeature toolchain-funcs
+IUSE=+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap:= ) ssl? ( dev-libs/openssl:0= ) app-misc/mime-types
+SLOT=0
+SRC_URI=https://alpineapp.email/alpine/release/src/alpine-2.26.tar.xz chappa? ( https://alpineapp.email/alpine/patches/alpine-2.26/all.patch.gz -> alpine-2.26-chappa-5.patch.gz )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=97b7db04e5d32d64847f1c53f105cb9f
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index d5c5b1cd93cd..7448725ddcc6 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/calcmysky-0.3.1 b/metadata/md5-cache/sci-astronomy/calcmysky-0.3.1
index 1f04c7a99caf..9496dffc47f8 100644
--- a/metadata/md5-cache/sci-astronomy/calcmysky-0.3.1
+++ b/metadata/md5-cache/sci-astronomy/calcmysky-0.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/10110111/CalcMySky
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/15
 SRC_URI=https://github.com/10110111/CalcMySky/archive/refs/tags/v0.3.1.tar.gz -> calcmysky-0.3.1.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=88f500f46db96e66846fc792bc25e995
+_md5_=fdcf1511d2921ad18bbb8bc592fa44d4
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-23.2 b/metadata/md5-cache/sci-astronomy/stellarium-23.2
index d20bdfd917ef..2b5934e103d9 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-23.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-23.2
@@ -7,11 +7,11 @@ HOMEPAGE=https://stellarium.org/ https://github.com/Stellarium/stellarium
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx
 IUSE=debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx verify-sig test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ SGI-B-2.0
 RDEPEND=media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sci-astronomy/calcmysky-0.3.0:=[qt5] gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 ) media? ( dev-qt/qtmultimedia:5[widgets] dev-qt/qtopengl:5 ) scripting? ( dev-qt/qtscript:5 ) telescope? ( dev-qt/qtserialport:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( dev-qt/qtbase:6=[gui,network,widgets] dev-qt/qtcharts:6 >=sci-astronomy/calcmysky-0.3.0:=[qt6] gps? ( dev-qt/qtpositioning:6 dev-qt/qtserialport:6 ) media? ( dev-qt/qtmultimedia:6[gstreamer] ) scripting? ( dev-qt/qtdeclarative:6 ) telescope? ( dev-qt/qtserialport:6 ) webengine? ( dev-qt/qtwebengine:6[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt6] ) ) telescope? ( sci-libs/indilib:= )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v23.2/stellarium-23.2.tar.xz verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v23.2/stellarium-23.2.tar.xz.asc ) deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.19/catalog-3.19.dat -> stellarium-dso-catalog-3.19.dat verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.19/catalog-3.19.dat.asc -> stellarium-dso-catalog-3.19.dat.asc ) ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v23.2/stellarium_user_guide-23.2-1.pdf verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v23.2/stellarium_user_guide-23.2-1.pdf.asc ) ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b8ad6a5eabed9195c8eae3908d62fe3d
+_md5_=44865b5bf2510b76401d6e631072a891
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 5bbb9c67fdbf..4c03c56fcdf0 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-17.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-17.0.0_rc1
deleted file mode 100644
index f4d8692b7e92..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_rc1
+++ /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/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-python/sphinx >=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.0_rc1: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.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc1[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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_rc1 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.0_rc1: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.0_rc1 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc1[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc1[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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-17.0.0_rc2
deleted file mode 100644
index fd5f167facab..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_rc2
+++ /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/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-python/sphinx >=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.0_rc2: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.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc2[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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_rc2 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.0_rc2: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.0_rc2 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_rc2[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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230803 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230803
deleted file mode 100644
index 133d19000427..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230803
+++ /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/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 ) 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_pre20230803: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_pre20230803[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230803[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_pre20230803 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_pre20230803: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_pre20230803 llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230803[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230803[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_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230810 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230810
deleted file mode 100644
index e19b1ab7bc47..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230810
+++ /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/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 ) 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_pre20230810: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_pre20230810[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230810[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_pre20230810 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_pre20230810: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_pre20230810 llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230810[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230810[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_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230820 b/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230820
deleted file mode 100644
index f4a9c57fc99c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.0.0_pre20230820
+++ /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/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 ) 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_pre20230820: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_pre20230820[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230820[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_pre20230820 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_pre20230820: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_pre20230820 llvm_targets_AArch64? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.0.0_pre20230820[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.0.0_pre20230820[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_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc1
deleted file mode 100644
index 157cf0d4d76e..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc1
+++ /dev/null
@@ -1,14 +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
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
-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.0_rc1[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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=bde681da3a50f0e3d93ae7f19b35c354
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc2-r2 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc2-r2
deleted file mode 100644
index 956e5c060be4..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_rc2-r2
+++ /dev/null
@@ -1,14 +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 stricter verify-sig
-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.0_rc2[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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=4c4f0e88db4f54136429ff7ae862c67b
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230803-r1 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230803-r1
deleted file mode 100644
index ba0e6038dc4b..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230803-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 stricter
-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_pre20230803[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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4c4f0e88db4f54136429ff7ae862c67b
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230810-r2 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230810-r2
deleted file mode 100644
index 4603841585e1..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230810-r2
+++ /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 stricter
-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_pre20230810[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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4c4f0e88db4f54136429ff7ae862c67b
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230820-r1 b/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230820-r1
deleted file mode 100644
index 3ff234718f40..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.0.0_pre20230820-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 stricter
-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_pre20230820[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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=4c4f0e88db4f54136429ff7ae862c67b
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc1
deleted file mode 100644
index 4a2ccd292634..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc1
+++ /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-17.0.0_rc1:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_rc1:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_rc1[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.0_rc1[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	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cd30a2c42b58da9e02efed310b714044
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc2
deleted file mode 100644
index 2064788ecdaa..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_rc2
+++ /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-17.0.0_rc2:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_rc2:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_rc2[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.0_rc2[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	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cd30a2c42b58da9e02efed310b714044
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230803 b/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230803
deleted file mode 100644
index b2088822073b..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230803
+++ /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_pre20230803:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.0.0_pre20230803:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.0.0_pre20230803[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_pre20230803[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	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cd30a2c42b58da9e02efed310b714044
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230810 b/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230810
deleted file mode 100644
index f64dabbf20da..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230810
+++ /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_pre20230810:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.0.0_pre20230810:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.0.0_pre20230810[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_pre20230810[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	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cd30a2c42b58da9e02efed310b714044
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230820 b/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230820
deleted file mode 100644
index 27cbf5d767e0..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.0.0_pre20230820
+++ /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_pre20230820:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.0.0_pre20230820:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.0.0_pre20230820[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_pre20230820[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	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cd30a2c42b58da9e02efed310b714044
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_rc1 b/metadata/md5-cache/sys-devel/lld-17.0.0_rc1
deleted file mode 100644
index 89fd089f116c..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-17.0.0_rc1[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-17.0.0_rc1[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-17.0.0_rc1[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.0_rc1[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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_rc1[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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_rc2 b/metadata/md5-cache/sys-devel/lld-17.0.0_rc2
deleted file mode 100644
index 8a310bef49d9..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-17.0.0_rc2[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-17.0.0_rc2[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-17.0.0_rc2[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.0_rc2[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
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_rc2[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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230803 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230803
deleted file mode 100644
index 3bc7f6302aa6..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230803
+++ /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_pre20230803[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.0.0_pre20230803[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.0.0_pre20230803[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_pre20230803[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_pre20230803[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.0.0_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230810 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230810
deleted file mode 100644
index a5aaa61ff575..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230810
+++ /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_pre20230810[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.0.0_pre20230810[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.0.0_pre20230810[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_pre20230810[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_pre20230810[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.0.0_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230820 b/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230820
deleted file mode 100644
index 0aaedf98ffed..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.0.0_pre20230820
+++ /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_pre20230820[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.0.0_pre20230820[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.0.0_pre20230820[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_pre20230820[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_pre20230820[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.0.0_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_rc1 b/metadata/md5-cache/sys-devel/llvm-17.0.0_rc1
deleted file mode 100644
index 99e60a624331..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_rc1
+++ /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-17.0.0.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-python/sphinx >=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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=55ef0c4467c1f7b0cdaa9037a735dc36
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-17.0.0_rc2
deleted file mode 100644
index a8607550b51f..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_rc2
+++ /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-17.0.0.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-python/sphinx >=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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=55ef0c4467c1f7b0cdaa9037a735dc36
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230803 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230803
deleted file mode 100644
index 8b4c8bb1ea8b..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230803
+++ /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/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 ) 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(-)?] ) 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 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(-)?] ) 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=18/18.0.0_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=97d14d6505c7e7188a8ab4aec5db76c5
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230810 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230810
deleted file mode 100644
index e99b687bad52..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230810
+++ /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/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 ) 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(-)?] ) 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 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(-)?] ) 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=18/18.0.0_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=97d14d6505c7e7188a8ab4aec5db76c5
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230820 b/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230820
deleted file mode 100644
index 6cf1a01f98de..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0_pre20230820
+++ /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/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 ) 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(-)?] ) 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 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(-)?] ) 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=18/18.0.0_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=97d14d6505c7e7188a8ab4aec5db76c5
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc1 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc1
deleted file mode 100644
index 908e3de1e300..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc1
+++ /dev/null
@@ -1,13 +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 prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-IUSE=verify-sig
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc2
deleted file mode 100644
index 63fbb73cc2aa..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_rc2
+++ /dev/null
@@ -1,13 +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 prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-IUSE=verify-sig
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230803 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230803
deleted file mode 100644
index 6f6ce0ee39cc..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230803
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230810 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230810
deleted file mode 100644
index 2131d5e013d5..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230810
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230820 b/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230820
deleted file mode 100644
index 117389102bf8..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.0.0_pre20230820
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 53af214e525e..6f3d51ce9f48 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-17.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_rc1
deleted file mode 100644
index e46ad0f67da9..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_rc1
+++ /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-17.0.0*: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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bcabd4e3a9b4f49717bbc4f9a5a6037
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_rc2
deleted file mode 100644
index 199d3425154e..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_rc2
+++ /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-17.0.0*: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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bcabd4e3a9b4f49717bbc4f9a5a6037
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230803
deleted file mode 100644
index e5b479237f86..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230803
+++ /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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bcabd4e3a9b4f49717bbc4f9a5a6037
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230810
deleted file mode 100644
index 85c229d57d34..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230810
+++ /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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bcabd4e3a9b4f49717bbc4f9a5a6037
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230820
deleted file mode 100644
index b067203e2a05..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.0.0_pre20230820
+++ /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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bcabd4e3a9b4f49717bbc4f9a5a6037
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc1
deleted file mode 100644
index 81e12f96800d..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc1
+++ /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-17.0.0*: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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc2
deleted file mode 100644
index cc7ca2a0255d..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_rc2
+++ /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-17.0.0*: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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230803
deleted file mode 100644
index 68fcb2df78f7..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230803
+++ /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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230810
deleted file mode 100644
index 32476ae70af7..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230810
+++ /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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230820
deleted file mode 100644
index c81516d4ee5f..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.0.0_pre20230820
+++ /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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc1
deleted file mode 100644
index 7e0c6a66d79c..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc1
+++ /dev/null
@@ -1,16 +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.0_rc1[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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_rc1[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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc2
deleted file mode 100644
index 4d22ea243920..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_rc2
+++ /dev/null
@@ -1,16 +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.0_rc2[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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_rc2[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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230803
deleted file mode 100644
index 737dab883919..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230803
+++ /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_pre20230803[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_pre20230803[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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230810
deleted file mode 100644
index 47a93aba4246..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230810
+++ /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_pre20230810[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_pre20230810[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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230820
deleted file mode 100644
index c6181f04de8b..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.0.0_pre20230820
+++ /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_pre20230820[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_pre20230820[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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc1
deleted file mode 100644
index 6ae988f9575e..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc1
+++ /dev/null
@@ -1,16 +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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc2
deleted file mode 100644
index 94620be66b48..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_rc2
+++ /dev/null
@@ -1,16 +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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230803
deleted file mode 100644
index 831b00d838b5..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230803
+++ /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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230810
deleted file mode 100644
index 1d6a71e3a749..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230810
+++ /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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230820
deleted file mode 100644
index 1b9d2ff18b14..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.0.0_pre20230820
+++ /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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_rc1 b/metadata/md5-cache/sys-libs/libomp-17.0.0_rc1
deleted file mode 100644
index bd06d6581485..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_rc1
+++ /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 ) 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.0_rc1[abi_x86_32(-)?,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
-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.0_rc1[abi_x86_32(-)?,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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_rc2 b/metadata/md5-cache/sys-libs/libomp-17.0.0_rc2
deleted file mode 100644
index 6278664b6e21..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_rc2
+++ /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 ) 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.0_rc2[abi_x86_32(-)?,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
-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.0_rc2[abi_x86_32(-)?,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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230803
deleted file mode 100644
index a3f82b1b4081..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230803
+++ /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_pre20230803[abi_x86_32(-)?,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_pre20230803[abi_x86_32(-)?,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_pre20230803
-SRC_URI=https://github.com/llvm/llvm-project/archive/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230810
deleted file mode 100644
index a733a9a8c659..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230810
+++ /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_pre20230810[abi_x86_32(-)?,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_pre20230810[abi_x86_32(-)?,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_pre20230810
-SRC_URI=https://github.com/llvm/llvm-project/archive/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230820
deleted file mode 100644
index a16b9435e50c..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.0.0_pre20230820
+++ /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_pre20230820[abi_x86_32(-)?,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_pre20230820[abi_x86_32(-)?,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_pre20230820
-SRC_URI=https://github.com/llvm/llvm-project/archive/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc1 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc1
deleted file mode 100644
index ae84833f961b..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc1
+++ /dev/null
@@ -1,16 +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
-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.0-rc1/llvm-project-17.0.0rc1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc1/llvm-project-17.0.0rc1.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc2
deleted file mode 100644
index d6a6b83a868b..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_rc2
+++ /dev/null
@@ -1,16 +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
-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.0-rc2/llvm-project-17.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.0-rc2/llvm-project-17.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230803 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230803
deleted file mode 100644
index 431574f7f992..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230803
+++ /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/c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz -> llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230810 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230810
deleted file mode 100644
index cb328e8b4903..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230810
+++ /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/7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz -> llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230820 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230820
deleted file mode 100644
index f214ccabe558..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.0.0_pre20230820
+++ /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/fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz -> llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	25e7bdef7dbaa79d42acfb3aba76a6b1	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 35de131f6cce..9564ec7460a5 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-bin-117.0 b/metadata/md5-cache/www-client/firefox-bin-117.0
new file mode 100644
index 000000000000..a35971bd7823
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-117.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/en-US/firefox-117.0.tar.bz2 -> firefox-bin_x86_64-117.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/en-US/firefox-117.0.tar.bz2 -> firefox-bin_i686-117.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ach.xpi -> firefox-117.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/af.xpi -> firefox-117.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/an.xpi -> firefox-117.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ar.xpi -> firefox-117.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ast.xpi -> firefox-117.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/az.xpi -> firefox-117.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/be.xpi -> firefox-117.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/bg.xpi -> firefox-117.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/bn.xpi -> firefox-117.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/br.xpi -> firefox-117.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/bs.xpi -> firefox-117.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-117.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ca.xpi -> firefox-117.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/cak.xpi -> firefox-117.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/cs.xpi -> firefox-117.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/cy.xpi -> firefox-117.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/da.xpi -> firefox-117.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/de.xpi -> firefox-117.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/dsb.xpi -> firefox-117.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/el.xpi -> firefox-117.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/en-CA.xpi -> firefox-117.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/en-GB.xpi -> firefox-117.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/eo.xpi -> firefox-117.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/es-AR.xpi -> firefox-117.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/es-CL.xpi -> firefox-117.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/es-ES.xpi -> firefox-117.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/es-MX.xpi -> firefox-117.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/et.xpi -> firefox-117.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/eu.xpi -> firefox-117.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/fa.xpi -> firefox-117.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ff.xpi -> firefox-117.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/fi.xpi -> firefox-117.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/fr.xpi -> firefox-117.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-117.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-117.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/gd.xpi -> firefox-117.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/gl.xpi -> firefox-117.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/gn.xpi -> firefox-117.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-117.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/he.xpi -> firefox-117.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-117.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/hr.xpi -> firefox-117.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/hsb.xpi -> firefox-117.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/hu.xpi -> firefox-117.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-117.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ia.xpi -> firefox-117.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/id.xpi -> firefox-117.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/is.xpi -> firefox-117.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/it.xpi -> firefox-117.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ja.xpi -> firefox-117.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ka.xpi -> firefox-117.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/kab.xpi -> firefox-117.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/kk.xpi -> firefox-117.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/km.xpi -> firefox-117.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/kn.xpi -> firefox-117.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ko.xpi -> firefox-117.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/lij.xpi -> firefox-117.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/lt.xpi -> firefox-117.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/lv.xpi -> firefox-117.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/mk.xpi -> firefox-117.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/mr.xpi -> firefox-117.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ms.xpi -> firefox-117.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/my.xpi -> firefox-117.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-117.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-117.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/nl.xpi -> firefox-117.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-117.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/oc.xpi -> firefox-117.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-117.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/pl.xpi -> firefox-117.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-117.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-117.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/rm.xpi -> firefox-117.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ro.xpi -> firefox-117.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ru.xpi -> firefox-117.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sco.xpi -> firefox-117.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/si.xpi -> firefox-117.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sk.xpi -> firefox-117.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sl.xpi -> firefox-117.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/son.xpi -> firefox-117.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sq.xpi -> firefox-117.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sr.xpi -> firefox-117.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-117.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ta.xpi -> firefox-117.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/te.xpi -> firefox-117.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/th.xpi -> firefox-117.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/tl.xpi -> firefox-117.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/tr.xpi -> firefox-117.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/trs.xpi -> firefox-117.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/uk.xpi -> firefox-117.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/ur.xpi -> firefox-117.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/uz.xpi -> firefox-117.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/vi.xpi -> firefox-117.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/xh.xpi -> firefox-117.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-117.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-117.0-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7dc14c48a50d8468367df04ef4a62446
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c9f376e412ab..966809522771 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-08-29T02:39:59Z
+TIMESTAMP 2023-08-29T08:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtWn9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTtruBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAN5w//cWYeMpc5GN696E2t2v85/rpeGv86yL7tEmH4067YdZM2mM/8Nbu1ZmG2
-fJ8gCUqlE14rOmZ8ahWqb9krVtLmONVVRES+FsP/gHQxBjXKwycnFj3JITMISVGj
-8M/op8gpKa9GjpGBcLi7LFKLAHQqHByKhjNl2LBfbJpA4lIvrxkVLRdXMPTRG0F5
-UuVeJlonDllRJpFOVhodFTgbmo49iCDJobvuGlKImvDpV1pdBiiq2xbbtJNvgyq3
-hLKmLNhuTm0xMIXSDdmlAfHT7WA+gIm2UARscatvzNJAVjLKi+Eg7dKF686D4Osj
-j4Q+AYOlgYxtNyHekTFdZS1xIoqaWyTmo++ASfOSAq4GwlZEI6iIUbnhi0nru5Xd
-A6RKFmsaDlNeLAOeAy5heBLdyX76qL2qUI5SP5nJx+TLdXD1XCP1JtgUofsGT4hs
-a22Zd9ExKVSGrCy6xmw08cYgwWpua+CxNAFi+KZVypfrCwkSlhPLkYrPIjzPNaAs
-FvfR6xeG1fvwR269lHDtgpBAAXP38K32gQbNVvhEkGMEsDcCzYt2N5AOgB1rwU8i
-1YqDqgdk2wzDkhMnky04fXD11Fmj+JXsVQqVrw0n8ErWReXhBKD9gsKZVhWz2Q5Z
-dWgF/o+2PKylG+AiceLg+/1fyDPKojV4xZo8XgJ0KHjiSP7cr74=
-=xZJU
+klAl5Q/+OBff2cmrzmsA6vOUZ4BeqXn4gEGJNx1kLi/uW5sgClkD54bhD6AZXCR1
+D2rWsq1Ss+pcWBe9IBxP7gB4zMTLhnNkPcHEP5MkxllMeYgM+w3rcUCDYfuNJ/rS
+QtwN/01GGrsTn9trwvISPEszDwF31cEhmuX9eKSwZaOrvLqTcdBCVOKZPkJ6Oj37
+eNpkcZPH1k9p/OA/VYuuLAlpVr45uiOqm3cgk7P1ZL8bnR9DknXOrkQdBwKZkHk4
+kfXVlrEsM6/l0cmpAPDcJucp2lJ0+lKw1dJKJ4z6c3tYCEbah+ucr9qTb8UuKUgK
+kO3UnzsSWHCaBfVXWLB3xsFUeFxI/ik5Z7DG7FiZC2kca9eAUshTbr1BLMljVhpY
+tzbME9kfjZ5OUTU4Kz1m9wWGQCy6f9Vmx/0CtKWqywBf4r/AYIZxyT2F6D3n0VCc
+Jse9v8CxgGItYzxFihOjwzjLHiHoOFoLgocUlr9ib7v+aSKMHwcVdZe6Xx0zqMB8
+ICMzjMkJLhtEpwhfDVMoiM4yHA1iFzI2dtE2jnNZwo+buUgE/RNpTFIW2LkPmF/d
+dB9geA0xWYva3VTRS+wzvg0M02IVkQaT6yTKjslBQiqmEqpDx7443Uylf9Tcsr84
+Jv16sFHlaMcqJJLNoD18dDINzt3PebXU03LPicutyEiEjZbf0tA=
+=PWEu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 03c3d5e73c56..5d58f1056906 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Aug 2023 02:39:56 +0000
+Tue, 29 Aug 2023 08:39:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a0c94dd4859a..7f15708a3a27 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug 29 02:39:55 AM UTC 2023
+Tue Aug 29 08:39:57 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 82d0e388fb83..778ed2887e57 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Aug 2023 02:45:01 +0000
+Tue, 29 Aug 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b91b03a8b3e0..dc012b6c61fc 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3447da464af4af50d18d556f4326918d01d31b56 1693275103 2023-08-29T02:11:43+00:00
+062dac300298e5c523f3e283587d0bb560d87209 1693295821 2023-08-29T07:57:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ee628058dece..28167de02886 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1693276801 Tue 29 Aug 2023 02:40:01 AM UTC
+1693298401 Tue 29 Aug 2023 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f9e738a26b5e..5d58f1056906 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Aug 2023 02:39:55 +0000
+Tue, 29 Aug 2023 08:39:57 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9ee437b1bd92..8de3c10710a7 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
index 403ef84484ea..9b2c49695dec 100644
--- a/net-im/ricochet/Manifest
+++ b/net-im/ricochet/Manifest
@@ -1,4 +1,4 @@
 DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
 EBUILD ricochet-1.1.4.ebuild 1187 BLAKE2B 7508b27bf257a4ac1028559dd636155a72aec1fa4ce1d6ace1bc62e80ef053e366408d9399367ab572b8e3e997c0512a0483e48796fe7b7d815bf0a145e9aae3 SHA512 888e9d1379c3ac0c60210b714a24e2a94ae1944658e8b134a153ba89f9da4c02e9aff474c3db4d907803f4949ec4afb0b7426b5578a5a2838b5a03613287d78f
 EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553
-MISC metadata.xml 395 BLAKE2B 33f528b302e014c10806a2aaedcf1ce7a512d85e7b69fec656ee4fbdc2b1f55c6d033d543be518f6d3eb14e6782a93faa2166fdab959798b10e9ff3a6fdafd9d SHA512 37b5a72e8b04358fbb44e822cc740f738333039a94c772c94a99c5f90deb059c465684c7dd78be5564eb7dee039ec2d03369f57bd13a5947ff65416fd57299a7
+MISC metadata.xml 480 BLAKE2B a33870bdf6a6ba41cc2f8d39ba043581766882f17d448529ee430657f57cc6b7257aadc9ffc4667365ac3219bf8815d089c5b04c7d1cfee6198590a59940210d SHA512 17c9683ea0bbcd4820924b6627852f4cb2fbf5e71ab601256c23a632310cd5aa93d44926326b266f19fad22478c11d373e41326bf09095d097cc60547f062f22
diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
index 3c27f902e41b..c4af8f701ab9 100644
--- a/net-im/ricochet/metadata.xml
+++ b/net-im/ricochet/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ricochet-im/ricochet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index ab1f13ac95d6..a8be0e9b343f 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,4 +1,3 @@
-AUX spectrum2-2.1.3-log4cxx-1.0.0.patch 2375 BLAKE2B e2ef1dafeb4d79a4d8cbc5f545e119dfc6d10b48c26e5e552a7aab911ea2d45aab95edf12ef761bea35ae1a3ceaabe6e5682bf5cd8a1d5fa5bbd9a5f5834e98b SHA512 28891262ae6ef40f2fa04ed6a9ba9ec4b18bbaa88cd5745ab09800dd71cb52340ce40b45451cd709bc9230d29798d93dbc9d4cd0043b97afeee857f6cac52362
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
deleted file mode 100644
index 852f4ad78027..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
-  This patch just enables C++17 for the build and using smart pointers
-  where needed.
-Author: Tobias Frost <tobi@debian.org>
-Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code.
-Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@
- 
- project(libtransport)
- 
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- if(WIN32)
- 	set(CMAKE_CXX_STANDARD 17)
- endif(WIN32)
---- a/plugin/cpp/Logging.cpp
-+++ b/plugin/cpp/Logging.cpp
-@@ -26,6 +26,7 @@
- #include <iterator>
- #include <algorithm>
- 
-+#include <memory>
- 
- #include <boost/filesystem.hpp>
- #include <boost/algorithm/string.hpp>
-@@ -100,15 +101,17 @@
- #ifdef _MSC_VER
- 		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
- #else
--		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
-+		auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+		auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout);
-+		root->addAppender(consoleappender);
- #endif
- 	}
- 	else {
- 		log4cxx::helpers::Properties p;
- 
--		log4cxx::helpers::FileInputStream *istream = NULL;
-+		log4cxx::helpers::InputStreamPtr istream;
- 		try {
--			istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
-+			istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
- 		}
- 		catch(log4cxx::helpers::IOException &ex) {
- 			std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
---- a/tests/libtransport/main.cpp
-+++ b/tests/libtransport/main.cpp
-@@ -23,7 +23,9 @@
- #ifdef WITH_LOG4CXX
- 	LoggerPtr root = Logger::getRootLogger();
- #ifndef _MSC_VER
--	root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
-+	auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+	auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false);
-+	root->addAppender(fileappender);
- #else
- 	root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
- #endif
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 425d25a64a32..96feecf624ff 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 9fd21b64d85f..7f5674b2cbf6 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,3 @@
-AUX rpcsvc-proto-1.4.3-lfs64.patch 1766 BLAKE2B 45b3fc79c0a78c2b354290155e03b6fe8e440af9341bc61b1d8e53db514eabaf17ddacf204cba48bc1877a01a524f09eb871011b2bb12ddff54a633f7371980c SHA512 62c6eb36ebdd7690b00fd3886883985d4b5262c812ae00ddfcb515bacf02c593ef17e07cbb832712858f2ee3594170d3da1fdcb1f304f105a573f78b6c6b445b
 DIST rpcsvc-proto-1.4.4.tar.xz 168648 BLAKE2B 2cba39b0307d773133306c4222e43cc44d4189bb125f993634b2a5e7679e5f5b4d28b05b95db6e694d316b4fdd182cf91c2a01ed1c519a3ca7ced5ebf5da3d10 SHA512 0138ac8fb2d8de3cb56f661bd1b6435fa0a35d3bd12c5cb7081c9ae1701e3620f47fe3dd002263db456655b61316749768e9a1a44325a1a6a542beae364a0393
 EBUILD rpcsvc-proto-0-r1.ebuild 471 BLAKE2B b0b4ceaa115b11ede6f31697b22ef19201a61918b8b64efa5e46e859f9e566459e3d9e3e12199eb93075d7d01b3fa21b0b81155f1ebbd3ecf85ac2ba212b2f1e SHA512 2259a0d8b0a1357c882de4d3d1db7cb95cc2756e8d83a2677e42418a5c6549a90e6da0a870cc04935951623cb713c9eb15077f5680e011087e78ef0d14ca80f0
 EBUILD rpcsvc-proto-1.4.4.ebuild 1121 BLAKE2B dfa57c55ac3c4d9c28909f229f8748adb9bf13262c1694b0c6ebbc2cec0fd2b6bb6df3619788d47dc1390ab058f3bb05dd46b2328f03c7d2598f8fd5a68bcb43 SHA512 71f60760626addceb26e2ddca3dfe045e6ea38b392463e7acc54e2a4d59c4c2d508846e10473d87dfc7c3d468efe19a79669fdd64d2bc5383cc40281db7a6499
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4.3-lfs64.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4.3-lfs64.patch
deleted file mode 100644
index 8d45fac6151b..000000000000
--- a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4.3-lfs64.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From https://github.com/thkukuk/rpcsvc-proto/commit/2527c37f956aa38408e251587556a6c8389af319.patch Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 11 Dec 2022 21:42:59 -0800
-Subject: [PATCH] Use AC_SYS_LARGEFILE macro to control largefile support
-
-The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64
-where necessary to ensure that off_t and all interfaces using off_t
-are 64bit, even on 32bit systems.
-
-replace stat64 by equivalent stat struct/func
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,6 +8,7 @@ AC_PREFIX_DEFAULT(/usr)
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- 
-+AC_SYS_LARGEFILE
- AC_PROG_CC
- AC_GNU_SOURCE
- AM_PROG_CC_C_O
---- a/rpcgen/rpc_main.c
-+++ b/rpcgen/rpc_main.c
-@@ -62,12 +62,6 @@
- #define EXTEND	1		/* alias for TRUE */
- #define DONT_EXTEND	0	/* alias for FALSE */
- 
--#ifdef __APPLE__
--# if __DARWIN_ONLY_64_BIT_INO_T
--#  define stat64 stat
--# endif
--#endif
--
- struct commandline
-   {
-     int cflag;			/* xdr C routines */
-@@ -337,9 +331,9 @@ clear_args (void)
- static void
- find_cpp (void)
- {
--  struct stat64 buf;
-+  struct stat buf;
- 
--  if (stat64 (CPP, &buf) == 0)
-+  if (stat (CPP, &buf) == 0)
-     return;
- 
-   if (cppDefined) /* user specified cpp but it does not exist */
-@@ -1125,17 +1119,17 @@ putarg (int whereto, const char *cp)
- static void
- checkfiles (const char *infile, const char *outfile)
- {
--  struct stat64 buf;
-+  struct stat buf;
- 
-   if (infile)			/* infile ! = NULL */
--    if (stat64 (infile, &buf) < 0)
-+    if (stat (infile, &buf) < 0)
-       {
- 	perror (infile);
- 	crash ();
-       }
-   if (outfile)
-     {
--      if (stat64 (outfile, &buf) < 0)
-+      if (stat (outfile, &buf) < 0)
- 	return;			/* file does not exist */
-       else
- 	{
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 83b349a686e3..d3d1c2651580 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index b0ace2a3c791..68e5b63b353d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,23 @@
 ## app-misc/some-package
 
 #--- END OF EXAMPLES ---
+# Hans de Graaff <graaff@gentoo.org> (2023-08-29)
+# Use the newer slot instead.  Masked for removal on 2023-09-29.
+dev-ruby/twitter:7
+
+# Sam James <sam@gentoo.org> (2023-08-29)
+# Obsolete as of September 2021 when legacy Tor hidden services stopped
+# working. Now fails to build with latest protobuf too. No upstream activity
+# since 2017. Alternatives (unvetted) are 'cwtch' and 'ricochet-refreshed' but
+# neither are packaged.
+# Removal on 2023-09-28.  Bug #830477, bug #913004.
+net-im/ricochet
+
+# Sam James <sam@gentoo.org> (2023-08-29)
+# Fails to build with new protobuf. Deprecated by upstream which recommend
+# sci-biology/kallisto as a replacement.
+# Removal on 2023-09-28.  Bug #912828.
+sci-biology/express
 
 # Michał Górny <mgorny@gentoo.org> (2023-08-28)
 # A shim that is no longer needed.  No reverse dependencies.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 15dad9847f5f..430f915b8f6b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2850,6 +2850,8 @@ dev-util/schroot:btrfs - Enable support for chroots using btrfs snapshots
 dev-util/schroot:dchroot - Enables the building of a wrapper named "dchroot", replacing sys-apps/dchroot
 dev-util/schroot:lvm - Enable support for chroots using LVM snapshots
 dev-util/schroot:zfs - Enable support for chroots using ZFS shapshots/clones
+dev-util/sdl-jstest:sdl - Enable media-libs/libsdl2 based input test
+dev-util/sdl-jstest:sdl1 - Enable media-libs/libsdl based input test
 dev-util/spirv-llvm-translator:tools - Install the command-line translator llvm-spirv
 dev-util/strace:aio - Enable dev-libs/libaio support for tracing Asynchronous I/O operations
 dev-util/strace:elfutils - Enable stack backtraces (-k flag) via dev-libs/elfutils
@@ -3002,6 +3004,7 @@ games-emulation/higan:gtk - Use GTK3 (Qt5 if disabled) user interface backend
 games-emulation/jgemu:bsnes - Install bsnes for Super Nintendo
 games-emulation/jgemu:cega - Install Cega for SG-1000, Sega Master System and Game Gear
 games-emulation/jgemu:gambatte - Install Gambatte for Game Boy and Game Boy Color
+games-emulation/jgemu:geolith - Install Geolith for Neo Geo AES/MVS
 games-emulation/jgemu:jollycv - Install JollyCV for ColecoVision
 games-emulation/jgemu:mednafen - Install Mednafen for Atari Lynx, Nintendo Virtual Boy, NEC PC Engine, NEC SuperGrafx, Sony PlayStation, Sega Saturn, Super Nintendo, Neo Geo Pocket and WonderSwan
 games-emulation/jgemu:melonds - Install MelonDS for Nintendo DS
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 875759105a6b..4a59d7fe8908 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
index dad53e227477..9ce24092f947 100644
--- a/sci-astronomy/calcmysky/Manifest
+++ b/sci-astronomy/calcmysky/Manifest
@@ -1,5 +1,5 @@
 DIST calcmysky-0.3.0.tar.gz 2164140 BLAKE2B 18d904ad0ed2ec81d705005fa3fea4e66d7250ff2c46bd563e14c783768760d6cc55ea3376682298d5290516ea3b9bf170da8546da5eafc2d2603e597220d9d4 SHA512 529e9cd3d1e71e5ba3e910e9af44e5ddf1af105b499948325401faa9e0cf7911d8ef003570f5bb5395ff6954c37ae6fd7242eb1300f78636232d745012d495ef
 DIST calcmysky-0.3.1.tar.gz 2166487 BLAKE2B d1e2bf0a5a2118e3679427e705f5265c9d6c8962adb58b4a5a6464252ee10fcba396758ef3a1a8c1e57b2291a076bc034e4231ea21a6fc464eda3c5ffd376bc1 SHA512 3038feffdf3a61d49d39304b72f1c2809ea5e3a835c4b3c1603162802afc3d27af6cdfd63eb3286e9e614850b73e338e1cc2cf6a6e915ea968194c0a7a9a56eb
 EBUILD calcmysky-0.3.0.ebuild 1220 BLAKE2B 96fa75434224737253e61900154f96a9a1577c3a5afdcc927daf1fcc7e30652b9b6c55829efbc68efead24cae846ce0b2fb0cc96d089780dc965da4a3031e17f SHA512 cd3bee65131528c9a98304bce978b2cefd8cdaba347e3ff59d451d849b070e7fccf72b07be02c3c945fcafdf3d3bb85cdbab6aff091235b765cebfab59881c84
-EBUILD calcmysky-0.3.1.ebuild 1222 BLAKE2B 2eeb44dcf4a4196554eaca135ce1581e3f127d160af9bf628000e275151ff837e0bb32a0bbc13ef613ecdc3f24de64be5083f038b21d59fbc4e79c87c035f9c6 SHA512 13b5c4bda1aa16a84d1be650011705b8f264b9362e3383721f67993ecaf3cf8918f8200c13ae4c51873bacbbc72fa370e12187a7cde08097c8ecd1e0942e8e5d
+EBUILD calcmysky-0.3.1.ebuild 1221 BLAKE2B 2b58f5d6451c7cbe9d14d2a314ecfe6ec17a3905828f87b0850c47021c48ad3899da08957d2c1fd6a6483e117ebf28717ff9e946aaa72a1fb6d18e3646e1d254 SHA512 f285012e5ae9ad7e410937ad6405466bacdf45db00542f90f6b2fac35d4d7644d4bb4f8f1d2233a2c94e0a34b42316eeaa2eecf462b67cf1675638a1f5a7c8d0
 MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408
diff --git a/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild
index addd6360ca5c..0d83309b526d 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 # subslot is soversion
 SLOT="0/15"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 1b9f25b1ade4..b3ab77b827f8 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -16,5 +16,5 @@ DIST stellarium_user_guide-23.1-1.pdf.asc 313 BLAKE2B b573ea45b236ad35cca1614919
 DIST stellarium_user_guide-23.2-1.pdf 32767542 BLAKE2B feb317354b0e696b585fb9edbe2a643bd57ba9da7657173506c1989d63618dcc4e2dd15fd1a9009d919d99ab4b28bd56599b569df11a573aa8d0af8ab85522ef SHA512 d699c9acd048d44221409515657a1f8a3be01629e64e233a1fb114c3935ee1c0fdffe9c7cd1ac60337d8168858f8d9ca3f5624965ff3343463b1a1a0b1b32849
 DIST stellarium_user_guide-23.2-1.pdf.asc 313 BLAKE2B bbc579e34b00a5e5b3497955e7cafcefbf9400063c97dee11bcc0c66e46f446f247c20e1d0205cf9b2117330d4209b6289808a59db4ff298c986771ca962a136 SHA512 d8fac13754bde068cb581ca21149ebcb6307bf4c71c95083fa4bf6e01f953f8d586ed5e149d91ca6439995d6fb7049254be09001ad0c8ff354ea75f7600e5de6
 EBUILD stellarium-23.1.ebuild 5625 BLAKE2B f921a0805b88b3b932532aec76f75776308800d1bcf2f77daa6cd82f5b760d7151b562fee1e8e0e8e6e1f4a8bd9ada0b1dc0599a2be0f9defc0660720bbe4e58 SHA512 fe18193f9ca5e8b2f646504e96c66e2a67ddc25219a4d1dd6618d75258cb8574f84f3c4c7f54f6f733b7d2e7a6d643151a7b2aedf2269bc93a5bac0977e1af38
-EBUILD stellarium-23.2.ebuild 5627 BLAKE2B 4b6fe3ecc1e12fbfc11c0bdbe2774dbdafc29beb13cb290825063dc05592693726fb5d9f6eda8872a208f2a19493f4dceaa60b1435e4ca1218a9664f3f008cf9 SHA512 24c33a897116358d3a2039eff1a4ef494dba4e6a775ef7d4b491d73b80dc7b35d4cb9c0684cd293ef70fe27cc99094ee75913f957f084db99db1e9f08b977baa
+EBUILD stellarium-23.2.ebuild 5626 BLAKE2B b1217decebff015dc134fe547a93552faac65c0aa9b2fa83388cb49b379da2378f1e2edac983b18caca094eea427bd5b827b70f40d2df8977e0b6666c935e0fe SHA512 39c98dbf5e12b013ef5ee225699180b63255cdcbeef44affaa04a2a5c87f3d745a87adb9b991f1d19c09502c281d43c219029fbf3eac948031b724015526d6bf
 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/stellarium-23.2.ebuild b/sci-astronomy/stellarium/stellarium-23.2.ebuild
index b0ee74a8a236..4c2406c674bd 100644
--- a/sci-astronomy/stellarium/stellarium-23.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-23.2.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
 
 # Python interpreter is used while building RemoteControl plugin
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2f55cbfc203f..549819ad6254 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index c8fa786caf7a..e5aea34bc18a 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,4 +1,3 @@
-AUX eagle_wrapper_script 247 BLAKE2B 62fb49b87be84527b983473c7f9876da75a037cb82321de16a3fd49d8d8dbab875bcf9837537520103c4f9a26369b3be6e331ea910bb7d582aadd6311e9b36ab SHA512 a347dc4f4ec8f369ff6a1beb8eaf3dfc9f4d8c2de3fe8b33b0f662cfb469905b17a72d5273c4627bc8a3fee9ef650654d1d654d33ea3a01c4f9a2ef57961256d
 DIST Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz 171780187 BLAKE2B 6fb627448068b8af8fb2a4117c84386a300acef769afe8524cae703afb09edf719f19fc4a5298d091667f3d4c09e8ec06a0da4a16274cb6e6c64a1ae349ed014 SHA512 4ef17dfa52b1ee0f5ba68896bc3821616a1b7d1a073a586604271cd7129e29671c480cd324cc5eadc517eb300ca4be6efa69423a306944e36732c2aa34cc59a3
 EBUILD eagle-9.6.2-r3.ebuild 2247 BLAKE2B d684aec4245992eaa811f2387ff199a9bca642ffefa627f35b32e1cfb3f3bb6ddee6566a5a59c0fb6090919bfeff6eafefcab15318251e0022ecdecd197d0fbc SHA512 c353ae535bf3fbafde58d3429fd874260b2dfade1766f99e285f54ba80d6c93a34fb6bdc753b8b6ec39af91ab992cbf44f3271be359071e3f25c3bccf1c1756e
 MISC metadata.xml 672 BLAKE2B ff4a5feffa8823f7984b1e59111b17359a8fc8fd01b2e39becc437b39192b0a4b8aa5416fea2aeb2027df42cd892261dd482c627ce8abeb80886b13c14dc8283 SHA512 33949d396dfb4c87e0dcf8dd4ba677ecb0535e512e295385558f1abd8a5808572727efbacf5996aaf1b2bb1fa4ef65cddf7385a433363b2030cde19551ba8334
diff --git a/sci-electronics/eagle/files/eagle_wrapper_script b/sci-electronics/eagle/files/eagle_wrapper_script
deleted file mode 100644
index 5a20922893c6..000000000000
--- a/sci-electronics/eagle/files/eagle_wrapper_script
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# From http://www.cadsoft.de/faq.htm#17040701
-# Work around problems with the Composite X extension
-export XLIB_SKIP_ARGB_VISUALS=1
-
-# The ebuild will append the final line respecting INSTALLDIR
-# Default is /opt/eagle/bin/eagle "$@"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0692f52d3afd..991f0549d161 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 d0f1a968d4a6..143ef7d8c076 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,27 +4,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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 5523 BLAKE2B d1679b6e4b3f8430b9840c0e43e16d7deaf26990822c4754e906ece5451f142a201d70d8f9207ec461c9be4c28960811bb4c4f3f253c23d2c9abe5e3e66278e3 SHA512 8b9f63bbd13006f1c2e207ba889c3e4a03e8edd63b7c51d4bfa78bb10ccbb6f64636a0ccf2fde91abc43fed16b5c5993375a8bc6226315c80fb9fd3f2d0ebf14
 EBUILD clang-common-17.0.0.9999.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
-EBUILD clang-common-17.0.0_rc1.ebuild 5439 BLAKE2B a9e244677be20b2eb40ec21906a2985ffe08936908f0680adf258e2bb0d0cb4c58c17d9914cca82f46845c862266be4c595c54a99fe3ed21e2e7f7d2fa37cb8b SHA512 68b40b0470e25cb50c2cf9ea937a99bd01db8abe8d22c2e51de9ff98ea6cb2389133343757a5c341110c51bb9dc7de5ae66d01597ddc5b9689a578b7158594bc
-EBUILD clang-common-17.0.0_rc2-r2.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
 EBUILD clang-common-17.0.0_rc3.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
 EBUILD clang-common-18.0.0.9999.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
-EBUILD clang-common-18.0.0_pre20230803-r1.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
-EBUILD clang-common-18.0.0_pre20230810-r2.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
-EBUILD clang-common-18.0.0_pre20230820-r1.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
 EBUILD clang-common-18.0.0_pre20230825.ebuild 5862 BLAKE2B d1738a71b8e61b605a9fb2c08c494e9f7361a7034549d6a106affa730f2f9327d8c38b585c4d0ed06737539d45228469572d5434e9acfec6b6e8c55bf784bab4 SHA512 4f0f981996e8f375837bb0069a352a5d3e7f6f19575f8c51afc06bb00e5754f083f26816a9ad8f1c9412013ad7ba2527563013985636d69bf56a58eb91485264
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-17.0.0_rc1.ebuild b/sys-devel/clang-common/clang-common-17.0.0_rc1.ebuild
deleted file mode 100644
index 9295c64406f2..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_rc1.ebuild
+++ /dev/null
@@ -1,190 +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
-
-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=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-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
-}
-
-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
-
-	# 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
-
-	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(__OPTIMIZE__) && __OPTIMIZE__ > 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
-	#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
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	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-17.0.0_rc2-r2.ebuild b/sys-devel/clang-common/clang-common-17.0.0_rc2-r2.ebuild
deleted file mode 100644
index abf3150abbd6..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,200 +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=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-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
-}
-
-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
-
-	# 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
-
-	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(__OPTIMIZE__) && __OPTIMIZE__ > 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
-	#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
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		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}")
-
-		local tool
-		for tool in ${abi_chost}-clang{,++,-cpp}; do
-			newins - "${tool}.cfg" <<-EOF
-				# This configuration file is used by ${tool} driver.
-				@gentoo-common.cfg
-			EOF
-		done
-	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_pre20230803-r1.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20230803-r1.ebuild
deleted file mode 100644
index abf3150abbd6..000000000000
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20230803-r1.ebuild
+++ /dev/null
@@ -1,200 +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=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-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
-}
-
-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
-
-	# 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
-
-	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(__OPTIMIZE__) && __OPTIMIZE__ > 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
-	#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
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		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}")
-
-		local tool
-		for tool in ${abi_chost}-clang{,++,-cpp}; do
-			newins - "${tool}.cfg" <<-EOF
-				# This configuration file is used by ${tool} driver.
-				@gentoo-common.cfg
-			EOF
-		done
-	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_pre20230810-r2.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20230810-r2.ebuild
deleted file mode 100644
index abf3150abbd6..000000000000
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20230810-r2.ebuild
+++ /dev/null
@@ -1,200 +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=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-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
-}
-
-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
-
-	# 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
-
-	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(__OPTIMIZE__) && __OPTIMIZE__ > 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
-	#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
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		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}")
-
-		local tool
-		for tool in ${abi_chost}-clang{,++,-cpp}; do
-			newins - "${tool}.cfg" <<-EOF
-				# This configuration file is used by ${tool} driver.
-				@gentoo-common.cfg
-			EOF
-		done
-	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_pre20230820-r1.ebuild b/sys-devel/clang-common/clang-common-18.0.0_pre20230820-r1.ebuild
deleted file mode 100644
index abf3150abbd6..000000000000
--- a/sys-devel/clang-common/clang-common-18.0.0_pre20230820-r1.ebuild
+++ /dev/null
@@ -1,200 +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=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-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
-}
-
-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
-
-	# 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
-
-	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(__OPTIMIZE__) && __OPTIMIZE__ > 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
-	#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
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		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}")
-
-		local tool
-		for tool in ${abi_chost}-clang{,++,-cpp}; do
-			newins - "${tool}.cfg" <<-EOF
-				# This configuration file is used by ${tool} driver.
-				@gentoo-common.cfg
-			EOF
-		done
-	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 94afc30e11e2..1773c14f732a 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,12 +2,7 @@ EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e710563096
 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.0.9999.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
-EBUILD clang-runtime-17.0.0_rc1.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
-EBUILD clang-runtime-17.0.0_rc2.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
 EBUILD clang-runtime-17.0.0_rc3.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
 EBUILD clang-runtime-18.0.0.9999.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
-EBUILD clang-runtime-18.0.0_pre20230803.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
-EBUILD clang-runtime-18.0.0_pre20230810.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
-EBUILD clang-runtime-18.0.0_pre20230820.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
 EBUILD clang-runtime-18.0.0_pre20230825.ebuild 1351 BLAKE2B 2d30237a865c2abd5b7d2ae2c64167c82103d7abd4ff09b47f26348cac5aed3fe78da821b9d6f12cebdef2abb8c85f5a48834cba65e60091d787886bebaa29fb SHA512 5197003db8e6ed5292d5e07f171922600c9eed2a6c36c5b498b08a850e74376d88730a4c460c9b5456e9379460779ecc345ec824e513651b0985eb6fd6b6e8d1
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_rc1.ebuild
deleted file mode 100644
index c69faa0fbdd7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_rc2.ebuild
deleted file mode 100644
index c69faa0fbdd7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230803.ebuild
deleted file mode 100644
index c69faa0fbdd7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230810.ebuild
deleted file mode 100644
index c69faa0fbdd7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230820.ebuild
deleted file mode 100644
index c69faa0fbdd7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.0.0_pre20230820.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=""
-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 8f1db6bc5dc8..2416e3cafb69 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -13,28 +13,16 @@ 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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-14.0.6-r4.ebuild 11941 BLAKE2B 7465741c3d32f432aabc000ef1d1e78c4538bdcb11983bc5e665b95b349345cf96ceab8d797763532ccb10e8d9311f3699043e5d5aeca08974caca1bd378a275 SHA512 16011488cb74e0fd477cd6950a4742abb44444537de5c07ccb0dea1d19ae8d482b3f75b5e38777f382284994e8f615c8d71bbb6d768585390bdb4bbd365984cd
 EBUILD clang-15.0.7-r1.ebuild 12617 BLAKE2B 780db8dc3c92efab35280d32f6b7d4ffcea912d7839b995a18aa603d0cf59df1199eabd53eb5a475e67da7a45e10fdd08e9879b871a25672f135dbdb001a5f46 SHA512 f6302415c9a4fb8571613ff5ebea4096f1318333ba4bc0f3c0b63b04eb0d10755c4555f55186875db0d34bb5d2c0b245b758aff387b97033bc643a1a291d1195
 EBUILD clang-15.0.7-r3.ebuild 12548 BLAKE2B ee294ceb058c489007ebb5b9f6bfdbd8fe0f5f77d32c1f71f97aa29ae2bb8234df687a931bb88865f8c5684121623f288620e538e2778dfb8f4fb3f900d14c46 SHA512 0e31baf473cc77b213e0fd7b8e1817439d9f8c94130f388fbb49900306378491b4715a3eab533ffa94e88c91b7e8a9a9303371a73e564df8a5fb2b4319765c94
 EBUILD clang-16.0.6.ebuild 12462 BLAKE2B 532fbc03f98a4135371238de3f3d933ac321d4ecccb1e1ce2511563a6529a7bd55444dcdfa4b46140b4b592e1174d534be82e9b29fb1161522253e25c86f75fe SHA512 6e2dc62b7281caf5aa2378eb19f8c24023b62814be4f82e678ee8b98f92cc032de64d5feef0f29c7512aadb34a16b8f50e05a8eadc3bf6663f71504045ad3822
 EBUILD clang-17.0.0.9999.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-17.0.0_rc1.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-17.0.0_rc2.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 EBUILD clang-17.0.0_rc3.ebuild 12090 BLAKE2B c10c0f0f8d0451d8294210a8eb1287182ef62919784fdfef86f2419f57edf2e85ba5aa64aaa344cb9bcda62ebf08fa8e5c0e64ee950bee610349b00407e3918a SHA512 3f87f43c3d7903262b0c95a12928cba68df69420631bc96a2037c294cbe0ca7a891bb9cf3d37578e3a2fa8a0854a83018d6469a2b7ace8dcf9b7d2018b8e7a66
 EBUILD clang-18.0.0.9999.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-18.0.0_pre20230803.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-18.0.0_pre20230810.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-18.0.0_pre20230820.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 EBUILD clang-18.0.0_pre20230825.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-17.0.0_rc1.ebuild b/sys-devel/clang/clang-17.0.0_rc1.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-devel/clang/clang-17.0.0_rc2.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-devel/clang/clang-18.0.0_pre20230803.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-devel/clang/clang-18.0.0_pre20230810.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-devel/clang/clang-18.0.0_pre20230820.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-18.0.0_pre20230820.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=""
-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/lld/Manifest b/sys-devel/lld/Manifest
index 8da86859d377..cd63269d0bb1 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,26 +5,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-17.0.0_rc1.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-17.0.0_rc2.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 EBUILD lld-17.0.0_rc3.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 EBUILD lld-18.0.0.9999.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-18.0.0_pre20230803.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-18.0.0_pre20230810.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-18.0.0_pre20230820.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 EBUILD lld-18.0.0_pre20230825.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-17.0.0_rc1.ebuild b/sys-devel/lld/lld-17.0.0_rc1.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-devel/lld/lld-17.0.0_rc2.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-devel/lld/lld-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-devel/lld/lld-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-devel/lld/lld-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-18.0.0_pre20230820.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=""
-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 28ac3c4cdc8a..8b981cb0e6bb 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.6.ebuild 608 BLAKE2B 0fbd471136d4fac398c87b43a4dbbc939c93a54336670e4a58022a32f64c92a78c273746edb9815f733d1fb58823864be7e621a6f1adf441a6fba3c06a0e652b SHA512 fe4b57e1e9335ae3957aed622cc1114677c4b7d33637db85fadc1fa3a09cb02767dddce5b2f84f45034cdd119068d69d35530db996ec1ac08966d86d494cd2e2
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-17.0.0_rc1.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-17.0.0_rc2.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_rc3.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-18.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-18.0.0_pre20230803.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-18.0.0_pre20230810.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-18.0.0_pre20230820.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-18.0.0_pre20230825.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_rc1.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_rc1.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_rc2.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_rc2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230803.ebuild b/sys-devel/llvm-common/llvm-common-18.0.0_pre20230803.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230803.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230810.ebuild b/sys-devel/llvm-common/llvm-common-18.0.0_pre20230810.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230810.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230820.ebuild b/sys-devel/llvm-common/llvm-common-18.0.0_pre20230820.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.0.0_pre20230820.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index dd0aa8d954ca..99df797fd616 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,26 +11,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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 12510 BLAKE2B 5b5c8f9fd24e31c4e84ae4b805823cc88d3d8d7998d7de2b4920a3db619b400882e25313cd87a2e6c34f31bf6e210ea20c65a915adfdda94c368515ca36a2259 SHA512 4ada6a4b029c43c988efaeccd88a3772c52f2a476973777b97a4238591199a4bf0696e6a7b7d484e3af1c6eb772c2594bb3637962b1baa23d1b91522f4627c5e
 EBUILD llvm-17.0.0.9999.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
-EBUILD llvm-17.0.0_rc1.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
-EBUILD llvm-17.0.0_rc2.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
 EBUILD llvm-17.0.0_rc3.ebuild 12712 BLAKE2B 1d0ee73bb83d021a99abfb1b3c9da22ef9cf0f1f0ffe6882727a631f3ac1acba27c55531a725a793a13542588df7611615cb430e80fea9441cee9866caad6ca1 SHA512 0dbc06054236aad21310cbeade7d130c13921f4b5148556329ee71a7dc7fb8e0275c6c418f2b913667710b153a77a9ec749aa4a1799137457c3209f9465d41ad
 EBUILD llvm-18.0.0.9999.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
-EBUILD llvm-18.0.0_pre20230803.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
-EBUILD llvm-18.0.0_pre20230810.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
-EBUILD llvm-18.0.0_pre20230820.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
 EBUILD llvm-18.0.0_pre20230825.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
 MISC metadata.xml 2782 BLAKE2B 4bd546287f630462c3f5d98cbd15a59a4cdef4023f86a5f4fe64fc5f10256cae7014d18823bd0909f4af4e42f299b6e7983c9c3c569cfab1ad38b0160f1eae40 SHA512 6bf1dc4f71f50e1eecc55cbb8366d8ed82a3dd328871acf1d808fc5e3ee4d203d623f81d9968bda45a87c72a2f20ed69b735b0a289b0052b048175cf6502e124
diff --git a/sys-devel/llvm/llvm-17.0.0_rc1.ebuild b/sys-devel/llvm/llvm-17.0.0_rc1.ebuild
deleted file mode 100644
index 3b29671ea107..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_rc1.ebuild
+++ /dev/null
@@ -1,533 +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=""
-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
-
-	# 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-17.0.0_rc2.ebuild b/sys-devel/llvm/llvm-17.0.0_rc2.ebuild
deleted file mode 100644
index 3b29671ea107..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_rc2.ebuild
+++ /dev/null
@@ -1,533 +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=""
-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
-
-	# 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_pre20230803.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 8f7c0ff09445..000000000000
--- a/sys-devel/llvm/llvm-18.0.0_pre20230803.ebuild
+++ /dev/null
@@ -1,532 +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=""
-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-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}"
-		# 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
-
-	# 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_pre20230810.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 8f7c0ff09445..000000000000
--- a/sys-devel/llvm/llvm-18.0.0_pre20230810.ebuild
+++ /dev/null
@@ -1,532 +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=""
-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-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}"
-		# 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
-
-	# 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_pre20230820.ebuild b/sys-devel/llvm/llvm-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 8f7c0ff09445..000000000000
--- a/sys-devel/llvm/llvm-18.0.0_pre20230820.ebuild
+++ /dev/null
@@ -1,532 +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=""
-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-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}"
-		# 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
-
-	# 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-libs/Manifest.gz b/sys-libs/Manifest.gz
index 818a0db10524..fc8571a6d33b 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 ee987f6ed823..bd6b8e6391fa 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,26 +6,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-17.0.0_rc1.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-17.0.0_rc2.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 EBUILD compiler-rt-sanitizers-17.0.0_rc3.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 EBUILD compiler-rt-sanitizers-18.0.0.9999.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-18.0.0_pre20230803.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-18.0.0_pre20230810.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-18.0.0_pre20230820.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 EBUILD compiler-rt-sanitizers-18.0.0_pre20230825.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_rc1.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_rc2.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230803.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230810.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230820.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.0.0_pre20230820.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=""
-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 6bc40effaa23..48e4c4644ee9 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -6,26 +6,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.ebuild 5208 BLAKE2B afc59515558ee4dcc0f7e0eebe8b281e43c7d6cef68d7301d690dabf3abee2cfb8a47f092cf8f5300c99dba5a9dea307625e960d5c64c5b30a0c25a5eadd1e43 SHA512 0b37254f0b2847adfdc983b1f7394f7ad73d7500e4ca4a333983be4d8e02cd5727244bc7a331c40ddba18196af7b8ec243390c1933c0a1aff18e927d591373d8
 EBUILD compiler-rt-17.0.0.9999.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
-EBUILD compiler-rt-17.0.0_rc1.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
-EBUILD compiler-rt-17.0.0_rc2.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
 EBUILD compiler-rt-17.0.0_rc3.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
 EBUILD compiler-rt-18.0.0.9999.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
-EBUILD compiler-rt-18.0.0_pre20230803.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
-EBUILD compiler-rt-18.0.0_pre20230810.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
-EBUILD compiler-rt-18.0.0_pre20230820.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
 EBUILD compiler-rt-18.0.0_pre20230825.ebuild 5135 BLAKE2B 9ac6c4ba7e405d74a3cd74f42aa67c50164c3d721e4842ae0453a9f6eb1085fbe36ab806d1412378d8ffa6592ccd4e6617e34fb31c7e372a1af4ed9a2599df4e SHA512 78044bd66f2ca8bd49fac61dc579f7989797fcf6d341b179f245f19e57602d4efd4e0448ccb4734f31aad1226aba4a29eb1f27e19176b35ea789e9b9f0cb5d91
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_rc1.ebuild
deleted file mode 100644
index f5ece0834a5e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_rc2.ebuild
deleted file mode 100644
index f5ece0834a5e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230803.ebuild
deleted file mode 100644
index f5ece0834a5e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230810.ebuild
deleted file mode 100644
index f5ece0834a5e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230820.ebuild
deleted file mode 100644
index f5ece0834a5e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.0.0_pre20230820.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=""
-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 5eae0e3fbee1..f5844789462e 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,27 +7,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-17.0.0_rc1.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-17.0.0_rc2.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 EBUILD libcxx-17.0.0_rc3.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 EBUILD libcxx-18.0.0.9999.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-18.0.0_pre20230803.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-18.0.0_pre20230810.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-18.0.0_pre20230820.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 EBUILD libcxx-18.0.0_pre20230825.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-17.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-17.0.0_rc1.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-libs/libcxx/libcxx-17.0.0_rc2.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-libs/libcxx/libcxx-18.0.0_pre20230803.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-libs/libcxx/libcxx-18.0.0_pre20230810.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-libs/libcxx/libcxx-18.0.0_pre20230820.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-18.0.0_pre20230820.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=""
-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 3810d044278c..dc5e75049ff3 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-17.0.0_rc1.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-17.0.0_rc2.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 EBUILD libcxxabi-17.0.0_rc3.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 EBUILD libcxxabi-18.0.0.9999.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-18.0.0_pre20230803.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-18.0.0_pre20230810.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-18.0.0_pre20230820.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 EBUILD libcxxabi-18.0.0_pre20230825.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_rc1.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_rc2.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.0.0_pre20230820.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=""
-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 2daa4a4b599d..c8ce8850b99e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,27 +7,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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.0.9999.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-17.0.0_rc1.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-17.0.0_rc2.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 EBUILD libomp-17.0.0_rc3.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 EBUILD libomp-18.0.0.9999.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-18.0.0_pre20230803.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-18.0.0_pre20230810.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-18.0.0_pre20230820.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 EBUILD libomp-18.0.0_pre20230825.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-17.0.0_rc1.ebuild b/sys-libs/libomp/libomp-17.0.0_rc1.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_rc1.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=""
-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-17.0.0_rc2.ebuild b/sys-libs/libomp/libomp-17.0.0_rc2.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_rc2.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=""
-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_pre20230803.ebuild b/sys-libs/libomp/libomp-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-18.0.0_pre20230803.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=""
-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_pre20230810.ebuild b/sys-libs/libomp/libomp-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-18.0.0_pre20230810.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=""
-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_pre20230820.ebuild b/sys-libs/libomp/libomp-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-18.0.0_pre20230820.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=""
-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 0aa02b613634..192401577b8d 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,26 +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-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
-DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
-DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-17.0.0rc3.src.tar.xz 127805656 BLAKE2B ecaead9f227b8357a5dc5ff21554d9b4f5aa036df1b88676fd8c3e16b438381db062872be396af5246e12cd71812a886016e0331a272dafc3508ecd0bfbb50ed SHA512 5f48b4af2e4f9bc470fcfd42fd48072b7bd442bc676d8401b04fbc6e9014a9a78e1bf524ba78f7ae8a1246222a6b03ca662721e3bf6e9eb03a015dd3306c7234
 DIST llvm-project-17.0.0rc3.src.tar.xz.sig 438 BLAKE2B 7b644cf501d17a6aef9b052e359ba06c1840a75e5263de46d938dbbdea07720b53d7ee6b5861ad641d0f7a7f75c6cc17717847b0ea9cf08873dbfacbe1c19074 SHA512 7059b1a90b7dd8cfa831f9e199a3a817358fd75d7c7d7e6de446d5443fce5831877a28e9b964ea238c1d803f9054bf4f53a97622d5f756f7f99aaa1c1a279f44
-DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
-DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 DIST llvm-project-e3373c6c83d3855adb78f1952a3bf0398baf359e.tar.gz 196926975 BLAKE2B 9da1052db0a6ff81a8b76cbf9cb2ab7eed5c8798dc5ae6887a4694de8b151c7a1282cfff2da2e8440b1a67d3d12c33db319fbbe6062761b6d5369e6b335821ae SHA512 8bb6d49ddb824e932f7bad3c51e4a6c2227139aaf19c02e9deb15657919bc12ea41844d8fe045061814aefb9031d82b167c7c0c20bedaa09aaffe164a2109f7d
-DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 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.ebuild 3040 BLAKE2B af0ca343905805b2aa88dd6d5f28321d50efbfb52e483eff47eaeec23bd3eeefa2269d542070b17db8bdb8ba7f0501ce7d1eb9c8085ce759ba9ce76161ffa64b SHA512 304872d8138323e91f45cef61e119b1bde128d3aba77a4650567a9d9fa3cf0a36d012a1f08168171b756b44d7a2e676eaabf8d3e3ca144ff3731909e38650a96
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-17.0.0_rc1.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-17.0.0_rc2.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 EBUILD llvm-libunwind-17.0.0_rc3.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 EBUILD llvm-libunwind-18.0.0.9999.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-18.0.0_pre20230803.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-18.0.0_pre20230810.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-18.0.0_pre20230820.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 EBUILD llvm-libunwind-18.0.0_pre20230825.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc1.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc1.ebuild
+++ /dev/null
@@ -1,123 +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=""
-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
-
-	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-17.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc2.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_rc2.ebuild
+++ /dev/null
@@ -1,123 +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=""
-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
-
-	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_pre20230803.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230803.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230803.ebuild
+++ /dev/null
@@ -1,123 +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=""
-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
-
-	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_pre20230810.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230810.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230810.ebuild
+++ /dev/null
@@ -1,123 +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=""
-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
-
-	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_pre20230820.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230820.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.0.0_pre20230820.ebuild
+++ /dev/null
@@ -1,123 +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=""
-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
-
-	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/www-client/Manifest.gz b/www-client/Manifest.gz
index 54e8f91af3be..9e3f68e35bda 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 5a4a1e51c424..bd1cdffa8523 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -196,10 +196,109 @@ DIST firefox-116.0.3-vi.xpi 596616 BLAKE2B fb75d03eabb99f6ed60079fd5f509495950a4
 DIST firefox-116.0.3-xh.xpi 401664 BLAKE2B 1de763b5c8827217095f304d7800d3dabf78e197f6559aec9775d69c89c340137636e4db952cc5e9045cf5d78dfc7ee3de76e33c246db40b798115a49a9497b7 SHA512 a4ded42cbabfa12b9236a699a52d27bd7083e118ce683a59cf3a200b9c70aa3333238d1729f19c03001bf97793102882c3fbf88e82f79b3b27d6d653b8a536c2
 DIST firefox-116.0.3-zh-CN.xpi 596069 BLAKE2B adead5cae90fab7daada7a6d6ac29fefa8e2706e5316b22d9a2af6da70bfe43c8c0dc1776ede6c4840ac974b363f4b0b7282bcadf46dc7372ce845be10eccbbf SHA512 1ea142d55ee2eba534738e5fa8eaaa4b869e6e0c33f153b2becaea558ee196805b20bbaabece433af3fbfa5b667820f948cba57edd76eb7ed4b21cc9645f65f2
 DIST firefox-116.0.3-zh-TW.xpi 598589 BLAKE2B fc7879a838e63711402b457f951033789be486c1980ee3cf0bd47c60524622f6e4cddc54102a04fd046bb14e14c1a80c78aa1dd33db333272e64029c6dad8e06 SHA512 ac20f5fc22d469f8ba7550e7029884ac4733f33cd0b7d1ec89723072ce99625fcb2fb40535ae9972a0cd7ce4f6bb6349952f785c44b00384abbc2ef5929ec330
+DIST firefox-117.0-ach.xpi 444788 BLAKE2B ef17002a9dcadd4b27e15cb16a916055acb69a1d5753744efb9a096351ff7e79a7fa4b3d809f55d17f75d74f970cf40793df18ba6d9c4f1bea104cd8da8f9aac SHA512 43db55e41ba8ace6ea453e76dbcf9621b62eaff3928e465c3a1589ed37d9d6ae33f82aaf714dbf739be5feeb7f60ff5d1d134c3480dcff5068a4a5ae1bcf5a7b
+DIST firefox-117.0-af.xpi 401860 BLAKE2B cc8253085558e57fad333266889ac7f861b3239f550e8077a0d6a4549a3700e0369abb6cb68e88a2fb7d22468f71d187852863bfcdad91f801eaae7585b9fe61 SHA512 8ba9d7c8333150eab916c63e2883308e6e0a697bd0029c805810ff14f116bd8fda5730147e84546e2f9053fbb99dc90a5f24756e12b79642e6ffb40070bfb729
+DIST firefox-117.0-an.xpi 483716 BLAKE2B 19c22429911e27c05ef476733c84a2cd33d9a6f55b1c6c24721d95d046a3c4fc43bf424975613eb87cc9f808c311e0681f7270f2f17018d5249625abf0eb460e SHA512 d2bde00432f39412ca459df9ddd3ddc92b7e073f4ee41250b8fe74377a886e6ef6a9e6d7f98b83007c831824f5894a76414c4286144a845a76920026bcb556e2
+DIST firefox-117.0-ar.xpi 550582 BLAKE2B ee97e036f1cc26ad9f8f9d9c8a48f5119efd6f02fe46f9ea0988e02dd1f09cb116987e2e3472e47073a89abc2c1a28c30299000d2a14c5877821db570b6493bd SHA512 b5175bab0c958246c27867aa8a26e9c5b5c69324d88962a205ded2ae600ed8c0711b29156a4cbe32b5712ca4250cb4c28371a350e66f7d33e64d99bcca6b5efa
+DIST firefox-117.0-ast.xpi 477429 BLAKE2B 1d16a45966113db7bc2c8d75d0921e0e5a8160a3c01c46e91978b7ac168f1a94d1618548f9d2e1eab0815f2f37d922d3d6205f1d8a3b4547f709b86f5ac738a2 SHA512 f21c4a75fc9c398552ddfe2ae146fc0a5b703c50d3b6744ec7bf29644a7793829a365204824c18e09928712757d10a3c2199df6092cfb3d491deb1e167d0044d
+DIST firefox-117.0-az.xpi 470714 BLAKE2B 2d3967eaf45a67b7bb6bc4ef467e45b2c36e484b4b2760cde703b797a38ca9b1a08aca23f2db3b6f0dcd4548dae902211a3358dfa7a536e44332cbe0757d91f5 SHA512 7cf3c68107244905b5c33a9561c9a2f4a685d52742adcfb30f2b3bebfaa95a04e1c7237e38b7223448bccc8486755bb8709ebbecfece7c1f3cac2c368618b143
+DIST firefox-117.0-be.xpi 652078 BLAKE2B 4d70a0377af74a809b8eb8a8fb5e506a9cc7343a7c38cdd4a86c1dcd8df67c07a3d0d2a14aa468a85cf174e414264828fed5c0694b5a1767bdead9cd5b794830 SHA512 d5cdebb39cfc80116af6cfaf1cd1ec4966233e52d0ef297f8c369a05215cce1408fdd5197e6d7d6f09ad311fdb1f1a691a86473ef5cf8870c93310371f2fac32
+DIST firefox-117.0-bg.xpi 565315 BLAKE2B 2e78a8117e7f0f7696424e8a4d8169fe8fcd9ad09520e39900cc1c8c2e9b1b519f01d54c44cbb83ad0c8ceaa9029805600ce4b7d7f45e5bbca21c05c4b17931d SHA512 033ecd5ecdffe1c8575950c123e94789268d015c32315fc103f7ff7181cfa9fc561ba8512bf758db8e74520533688d95b72c29fd46f645d5af6d8c2110b6a240
+DIST firefox-117.0-bn.xpi 559636 BLAKE2B d96874de55aba2d963216bf0d202f6ad3665dc5937cf452ad25d8102121a8b74f0d7f900c723f44abd0b3dd857021df93dd0449cae66d71606ade250a474e0a2 SHA512 d4818f4e2177aa45362274e3872b609da00694814be834fa1d3d21f07571c0c40b964052ffedce64d0525607977dea371ab03c6758249539700c6d001a3c6470
+DIST firefox-117.0-br.xpi 542781 BLAKE2B 5fdbe2b23c626c0ab0741f1002a3d7d7c9523be1c651067ba30d732a23525c848aa5de118d315d8e70da92e6b9fc388bebb1e5b382d25ede3269dac8254bf104 SHA512 c97b0162e0f4038e6015427e773b15ff805c4ed3dcceebc82bf86fde2864a3bc49c57a2c37063830de68a9c40b6c60bcfe110562aaeb322db3c837a78f0b0a5c
+DIST firefox-117.0-bs.xpi 440964 BLAKE2B 79da02c1efbec5a36cd57658f9596eb0c12876e18d39d45caf31d403347aa33bf06810f80b8ed22998c21c0d592bb314a47a44d247fc22712dfc1129b87f56f8 SHA512 beee21e4e6e877f3f82438812e60591b8b213fa13ebd7c40703f096aa961c43e5e8addbdf9c2c1f2dbf14cfb305af09ff40e0b4d5bfce478fd00a595abf0215c
+DIST firefox-117.0-ca-valencia.xpi 522898 BLAKE2B 99c09cb50cf522a454b842688707b42f88e1af7cfb3357d068540dc5167f70dbaf3f4400f4492fc5b8a36843b93dafb9d06571c0eec89b8791c1f6226e05578b SHA512 6d152bb902dc5c78063f80949f60e5f9deb95eac3a0060401e219432829b45271818d93daafa791dc73f86635aee13078d09882d519930fb4eb007fb962885c8
+DIST firefox-117.0-ca.xpi 546626 BLAKE2B 8118f313ebd9f4d6122343a219a90e68b7b3050b12456b2163f170ba2afab9a0f12ffe3b5ea65dac921f2a468d671a8e28fc7e6f4607ae3f29d07f3ba60b8bc5 SHA512 83d49acf492fc5a97136b68597fdd7c3a3c8bc762d7f0645b7c2ea4d4c60cf4a500cd0c83f6cff388885c6b9a2d09ec854973162877b3d2c2e7a317f4b4d55c2
+DIST firefox-117.0-cak.xpi 567755 BLAKE2B 781d88dc7efdf8f430428b0fd6491bfe024a1ff73741d6c933264325f82b5f158b58c6e4f2ab1f6695206f4330a0ce114d556c504996d71a885e2b89423039bf SHA512 b72209ee35691dac223b68e7ba12183707f8b67ddcdf13d80d0c1d8020b7b1cb695d83d028f48ac2b67a43d8ba5044dd361e91650f5134971a97acbe91f825db
+DIST firefox-117.0-cs.xpi 596748 BLAKE2B d9bec9788797a7dfc69a68ee6e2cca9135c58c422380d92e9d6ae2099039870e2bf65fb287ca6914f88d10e1117422e221e43ee8b0eaedc6e578bbebb51f5204 SHA512 982ae3532ae0c75156ea5ef79c2bae719b03fd667f7b81924d6255d7e6b6a66c7b43357adb7b23eb9542149d57fad82202f491e2b917c59e289a3ba0682f90cf
+DIST firefox-117.0-cy.xpi 568486 BLAKE2B 6995a13783581a41111336104d37ad8119e178749db7c9b84576ae3310e7813b27054aa1f6eed4432fc38ec7dde1805120767447834bf2a3464f259fa15893db SHA512 ae3f51dc95f0fe8939d8b304731c210852bd2b96a4d57138828e83e4814c7506f17120271b43b09b85e71900edec00a9836be2e532a69f47585bad12cd05c2d2
+DIST firefox-117.0-da.xpi 557765 BLAKE2B 63528f66845bdbdf0624ab9939dd8dba7b3b14763fb17c43a8df2fd3fa2cee1b2fe8dc711d87c98fa0bd1faf4fdbc77120791bdde49c606cd552e05e03587482 SHA512 c83f058c3241a0f422e0c7fcadef233f94b56b348e922721ed9538dba1866b775f8d057b82ac564eedaaef05093b9131998717ef96e05931ebf5b57e9d01f6f1
+DIST firefox-117.0-de.xpi 578122 BLAKE2B bdeac0ee710b35df8726b84445be9ac66c1d5d82314f06d4c3ed500a935326726b607dee59f0d0642f60f2d4b721858d9afb11c9cf9f5c77c1066391d4244b1f SHA512 c1c0a33a3fe24d30e47afae40ae5f631e32b7eea52e214a8565847353a1d4d71bcd9112fcfb84a30cb3a249ac216debc18ad8741e1676ec79695d188b2160501
+DIST firefox-117.0-dsb.xpi 592974 BLAKE2B 7dd640b7352ccb88f4e287338ee785a397f00f70145b6464cf036b8a6f27ece336da665914ccfb8071b0f325197c0ac4db03aa725012bcfd208b8871d885579d SHA512 02779be2fd25756f47a8289d6f16e4778fda98c3f29a40ae436b286005769a0484bceb19743a4b098b821add52af6191411bad726ea2aeb343fbf7efa752ca76
+DIST firefox-117.0-el.xpi 666556 BLAKE2B 14634496a7ad092ae8dd3b2f20aca76422ee3436b04c8b3239777f15cb5b2b74f2bec21cce15182208c7df5eea44f9ebb0f902c6b8f3875b9279fd2428545a16 SHA512 934f48cf60e0fc1bd576207a5f56a046639f25b85643c0348cb57e47e9ea2a6ff0190d0aa71560ac5dcfd8c774c389056d9fcd9118ca32801b8461ef2975f805
+DIST firefox-117.0-en-CA.xpi 520398 BLAKE2B 0d7b3ceb4114a10fa3b455b9a81b7904b29a7e71fa14f11e5b00f8bed2380ed725c017b2b890f334295b5f676bc1c9ff97d9ce3c6d5c450f5859dcbd54559ee6 SHA512 35bfa6551d7c7df720f256668faedd509e14958ae16e7ad82ab464e5ef5722d3f88a4cd5f7bc50843cf7ff8ccf6604695780d23cdef9c7dfc3b221b8f42fcb7c
+DIST firefox-117.0-en-GB.xpi 533890 BLAKE2B 9f3d81fee98755bbf1db1fb5bb953686a12165073afeb83f7d8893e0b7d7ff35746d9ea209a3d64560d612268521e4d528410ed10b41b6f0d8cbe8b452bc9b57 SHA512 74bba5adeb4c76a0c8956e7bad49ba262222859947123da6dbb7e7dc90e19b908c24dab0536fec6a3663a71fc1d99416cbb0f860b10efa369305a9cb93b7ab6f
+DIST firefox-117.0-eo.xpi 561462 BLAKE2B 0e5b0af86d63dc7f48e39be2639ab886fa1f9dc4671fc534d30ea98ec7053c9bc6f92430e4b9a5355a4f113bc7736f5b76f6a2e260f71c395608fb4e295866d5 SHA512 d3659dcdc82869c38762203af0cc5a77151b0350415b00c27855d9c3b350991dd214f965b2eefd37e861f961f81f2b366178e1579bbe85e92b8600102c7e9c21
+DIST firefox-117.0-es-AR.xpi 572715 BLAKE2B 07260f2dc970722f6cabfffd8194dd5c35227179ceb1d752b4cf18a26b8890c59cd9962ca8d6aac100a2c2a3dda17ae94e75b9446ab6f5011d1f7880d4008851 SHA512 2e13b6684577d74597a5de0ad180b8ac80f96387b7ae8b9f03c97b3a38ddb4c4965663fe40d56dfdb36177bc802daaea6ce485e32b0eb371b97e932ab1717460
+DIST firefox-117.0-es-CL.xpi 571659 BLAKE2B d9d4f99a0d2e993f7905f110d5a751ebee3e808c5736a5a7ca28bb3e7c9b476bd2cd169857658e29efd94006f8b05caf8b5ca855147f72978e50fb0415520e72 SHA512 bda99013bc47fbe7303f9878f803140f2e341afe451ab83840a7e20f6f908feb33dfcddc58da27bc10afacb9c0eb4da25f3779f7ce629e7bf1e7ae028b6ff71e
+DIST firefox-117.0-es-ES.xpi 564574 BLAKE2B f5a60d0081ce7551035694a6bb16415ba9197a99be0c8cefd9285270259d8b5acd286103ce94246342a3b8aa55fab68e3163144764b7282c6e0a85dbe3e7e2ac SHA512 20572d7f0cfcabd70c316d35bbd7576d22dc786dc55386bb0339377127886f1ae5970c1f57bcba8099555ce9157a16737985434eeb46ce20436b3c1ae4e49c79
+DIST firefox-117.0-es-MX.xpi 566692 BLAKE2B 145338c3371181c4cf7f3f5fc42d29c869dac71c089e86f1bc43ebdd7036920f69a1861b10f85ef2765d061ccb4d001ec1026e11797aeeee0f64b2ebe8d25698 SHA512 6137113905497e3eeec6ebd3eff5fd9277d5f67d428b690cddbf6a082e6cc84630709fcacff27965b2d5f8bc016d1db491c5275385009148e0d8d8a4ad4a0506
+DIST firefox-117.0-et.xpi 517152 BLAKE2B 844f2ada1f47fa432c318789f9584d7022a4125c776c82a0f169dc37b7c009b90a9639bffc769b004e9c6e7d505d6d30f0386cdf239e5a7ddf6b8f8f5d93f546 SHA512 67bb272836e63c5f309681106f54241d8e6ce25b11d50d2358d5f837a80739167bfdb2fc5b61b2315def5c0117eb388ba054c9fee017d6509a4fa2550094f1f0
+DIST firefox-117.0-eu.xpi 555901 BLAKE2B 3169495bacbc51c128b74027182ec398c4dc1505d6d5e9ae2687227644938534d629c07374a5dae8f1c3ad7a5cbc98259d1b5d43fbb4ce844fcf54401c1ab120 SHA512 31376e7cbcb9e01bfe3788f4c1c122fcf5d1ab8e5fa320fa9250b072778098a759c91dd66caa36fcf31d330c87004f4d0a2dc1afb4d9fc5a10d20c6808d1c7a0
+DIST firefox-117.0-fa.xpi 567396 BLAKE2B b4255a23990b442eebf4f6f5621d8813f1d6eaf83925e8d63f9891b9fa0491f5ea40a716dc163149adf5469a73cf01e38df45f787ca5e7fa86e8926b66f68ded SHA512 cbdc310c571162f1b476553abec42d90e9443fa9f2b844b10bad668416d30a1086385319d0a3a63ec2cb3868c2c76ebce16e97451d40593ac1a6a134c7348d27
+DIST firefox-117.0-ff.xpi 456765 BLAKE2B 973909392492d6b8089fd941da4d94f3d46306a219d4c9092119027e46cef208832b7dcaefa96c50bd4a7de43c27e344b6b203378d0d74705adade3e2208d01d SHA512 7bbb8e62e318964672077de0f4b07434a262d28a745aa8bd0c0ec9ae999966cc06d6f87dc2c9e6feeb7538c0cf2234da2100720bb83600b4dd1f5709aa249feb
+DIST firefox-117.0-fi.xpi 555264 BLAKE2B 0a356c760d2f792b0b8a54867b581e839824eb03bc4965b950494e775141870a8e862229a4aab1ad5ac36d31c2d4ed5cc9e3534fb9ea9c1b2971d9d2e36c7f22 SHA512 3874386c61578e68e676395ea89cb0706964dac2719c6d0e69415e462aacbf71ccc253e28f5a21dbf01eadd123bdf65509c05feb49558ce95df25cca6c27ef47
+DIST firefox-117.0-fr.xpi 584461 BLAKE2B 38883834c3b67e19b7b81e33874d0e3d7741f499252555becc3ec400ed9022bf9dc6888dddeda9a419bf6d459bb6002acae66e44fc75dea71763a9c58f38d038 SHA512 3672809279181c27f1d07d666e2c15aac8cc6bc5f51fe104abf993dba54df4e3cda89cad2d498317cbdb70262517f6d13b56230ad2db2652b78b29c7a162fe3f
+DIST firefox-117.0-fy-NL.xpi 568063 BLAKE2B ddcf440d28802a8a515349faf18d5b8a4b61a7ec76395d221cb1631252611c8d49af8ae5f42cc7b2808c0bdceffd53dd74e80d5fcb14f58c5117f54080d74e2a SHA512 2d10b0eeb2ade20e13e51010ce96683c25f5688944a7a3f9a1bc46e0285ae9114770798e87a1f9c96b92ee89bf0c050521cc4e6ce6a6aa60ee54f03e0c7324b0
+DIST firefox-117.0-ga-IE.xpi 453864 BLAKE2B c474b54721e0857cea2187ebb0019d5c99cca728de54d7c684a05c27cbcd3ee6dd1308f25d20b52834e27be7ba6877fa2f830d27820f2cc6351c523970a68d7f SHA512 2b1419e54eb26d0351c1dc87ea345af6f68b193ef4bb38c4ca813b4b581e01c10de13da532de1885c39a1cc41550545f16e38ffdd982bbcbad56ea5f63f57a18
+DIST firefox-117.0-gd.xpi 568320 BLAKE2B 84e08fd94a85e75cdb7dbd6a714bce2b8cc21612fb12ea7b629f6d20d7fdef06eca0df6b55bf6f6e8d866f5d67f2f7c604205332854148996daae751843c0571 SHA512 35bb8511bdaa770500040a09e200559dd5cef6d377e3eb48333621734e1cd2f0060679410b60d2bef21a1d883e8587e3e17e87949d793cdd3e6c6216e728ad32
+DIST firefox-117.0-gl.xpi 567520 BLAKE2B ab1b5a69c48ae49ba99c282e48d58947e3b699e91c5efb0516ccdac7c233f8679aaded41310e7c122bb045e3f80ddf0aa0613ee9c48ecb4487f16f88554190e7 SHA512 21e346df8fa2a41e290fa2c74297b3ffa6f80fd409b3d738f3bb2524f98b5fdb4fdf2a145ad64f954565c602167d6256a7e65dbce0e9b012373e3346efa89ade
+DIST firefox-117.0-gn.xpi 581970 BLAKE2B 9475f90d1b09b7c23f9afd561095422bafd15fad8d8b461bc435036606e77538a63e7ce24398d055e078b14a462985aec1f52c58c24ce4e8edc8f2231ea0b0d7 SHA512 34507447d75109c79068a30aa29d6e59b0fd37232329ba4792297bff7b2a7b3f15e9dbc699f2cf881a96b1b99af71ff3848c4a6f7c82c99fc1b52f97e8096112
+DIST firefox-117.0-gu-IN.xpi 506745 BLAKE2B 84fd2f2d49173a268f57501661cd602aeb88ddd65efca979a5106c1cee9d81a54a4b62a17267358bdd272c1d05068d94cc70ec970f0ebef39031d4627c75dcda SHA512 bdb0c49160d18bc84c506ce770582632a39ba18d24da68ab51e9de2da91f2b1d1f0541d06dc00c6513302b45240ed37b1526deb48d6bbc482a685252c41a9011
+DIST firefox-117.0-he.xpi 577839 BLAKE2B 5275c069c5bfb43e4e65bc1882364b2e41e4a9a8da3d4a38bc664fd29318eb529a01a3efa48eeef3c8507bbc1c9c1578823fe614f4253bfc5d71a3ad4d56c279 SHA512 11731dd50d8428570863ffd695441fd74854dd3f4b3244b2a90e2c5899710609609a12a335c57bda4401b6b2700a166d6d847ea957ce94e39f930f57ad69cf00
+DIST firefox-117.0-hi-IN.xpi 543574 BLAKE2B 5e20adea7f90f2e0f50f4d5bcdddc384c8cc62f3ba4581a85ca2b65465f9251402926c2ee4adb7933149aef5db20f86edd263c88edf21b0ec11140d8f6a83de2 SHA512 da35727eaad053772b5d1181c736bfc1775518af6cb3f3e1d4248a6180275ad996bd2acb1771e34ca2e9b7042e886d9dc4e6fb033005edd670aef2ae27583b41
+DIST firefox-117.0-hr.xpi 533127 BLAKE2B d3b9c07b3f41e959a58dbf13ee6796abfb106551b848c1b423a2e2a31c5bc15603e918ccb8f7a00554dc1e2ad808bc1a853c3ef1ef0062e15d350c2e5bf5e031 SHA512 f4cb0dfe17f2ce12f84f7ef41eabaa876496589e1009bf218da928536259b904cdaaded2ba9950fca0e7d5ac4175d571a3839fe869f3852409359a7c75a3517c
+DIST firefox-117.0-hsb.xpi 589118 BLAKE2B 5665142c95af8b2a311116e97dff56d478def458d6aabb6b6f13b54fc13f1ff28b80d5ddd608ddbb7b71fd6d8fe49e9131ffe57a6750e08703d30da4fb85b285 SHA512 5e37225df3e508a9471b63fdd988be68986cc2575742a8cf39c2ba34157d462c36c3df9653d251fda9b9f54e3d86c378b4be6f25aa8fbed4592c195a21c34c78
+DIST firefox-117.0-hu.xpi 593014 BLAKE2B e95ba51745dba52c9e627ec85cf40f2b2f193d89835ff04a962de5d698257c38d03c32f34f53744eba3e144a9c7b099a3074f07922fb75d4f72c20af534d85df SHA512 b5f032d99b1b9e63a4ccfc5e5db25687c78b3fc160b287d9a140d4daf24b04d1953007b11a97a851ccc046e9bbd5b8de392c4eb118859c01916536511a33a94d
+DIST firefox-117.0-hy-AM.xpi 580487 BLAKE2B f0235d0a6940b37ebfa9a97de8f5e66b2a1cd721c9ef938032c712b377c9e03ec18487621847187e621667048dcda281676b60ac7116bdf8db8788663eabe6b5 SHA512 e9f998d1b1cefb5e1c5eee1272f8433cd68a8c13e918c39370c4593714896a76086e02e947865bada6de9e2a5ac974022d7c383b57346c99f8f0ebe49a1c9a48
+DIST firefox-117.0-ia.xpi 556613 BLAKE2B e2fe037a4652220fac31ddcbe798f5585a050aa489329b00147523882c303e8e55476a6a330098455a97a61fe72f463e2f11d5e5fcb244ad52c6ab2ce7a89165 SHA512 668656cebfdbf84683b841c22f4e7f0600a004c620cef1826246313f3a6aeadf02fc58473276b32d953992c8352f6a9fe7d1f947e966bfcb872c72260d0696a5
+DIST firefox-117.0-id.xpi 540547 BLAKE2B 30844eab1f30da3b389719e74f92ccecd847580f0ddd8711ba0865672f5e2feb5c7d679ea9916b02aba04ed281dae7714728ef333f2905ab41720422b1303dab SHA512 438a386161ec4510cbad1020e5b3838c39d7c2b56ff8cdd9ad76a9dd57cc89ed898886deb6c56b95b4df63370a81b30327bb189ba5f9a806f270eb7aca6464ab
+DIST firefox-117.0-is.xpi 564445 BLAKE2B 46c5f8ae8489d98a4baa83d3d4b2ea140fd2bfb1308b2c5ed315a462ddd97eb87be9f53208299c481b31c64659e838d84eb7fc0a9395d21c7a7925cda717b136 SHA512 5abca07ea04b7933aff177015ab7127074d316fd2d9acce7643227965333fda6f8b95e3ac6e9888c4030b7e70fa6bf498051d77fcb4db2d218a7067a3c75fc4a
+DIST firefox-117.0-it.xpi 510633 BLAKE2B 5dacb1b56b96e9e5f63f617e827a4557d97783c453b2b043b8561d15abf3e742341bc7857dbf7ddb7de11f788f5b83bf1928b3af22bca7dde98676cb7aa76cbe SHA512 10d22727304efb1ac07f3ccfa29528cdc742e254964a403fbf57c3b755aeb002b2cc16e07104640bd91f5fb53b5d4c6eec9beaa627ed299ea34433a41f54d3e4
+DIST firefox-117.0-ja.xpi 620389 BLAKE2B c43b560746013c92a2aeb290a3c8292b9d02cd5c5163ca753d478822eb66194680da489799ffec90be9b5e9fd36955c42a8c52909420670909a0a6e52ac69e12 SHA512 3e11c4e693e44e387b7aab5c1d94ba0205feae19c0bf525e5808b9598ad2c594b864fbc3107dbce7f986b95ebd12a48c06c2ed0f8153dde3c7b6bafd67048585
+DIST firefox-117.0-ka.xpi 620748 BLAKE2B 975dfcd56e1a8434ca472073ca63bd615a1abfe2da0e5117ec3e2806e3ffdd6a9e33b539eb0999eb5cd7a4259288e4310b90ad800c5cf79cc453c648f89e155a SHA512 8c9c4c880b90a6a06181ab7d30d7ab8e7819815b8041dd524b0a478d1bc81a819897070ed1c58b283cf789d16ab9b692d9e9c3c84684417601abc12bedac4822
+DIST firefox-117.0-kab.xpi 565296 BLAKE2B 46d5570335da2cd5c85bbab2462794bb9282de8e8ae8ef2e38e780397beae9bfa88b5028055c9b7f342f376c46ccfa7731d7372a95c08ed4a8d015fae23034a9 SHA512 a5e8264fd3ff3228b30c2e24d4ac8dcde64d48d79b698209d7a4a9528fa3b98e35eeaa58c7613bbda2d15cd9e38125915ce7683caa30591e1c24d3058687d3e6
+DIST firefox-117.0-kk.xpi 645194 BLAKE2B a93a56e500a5b9e65c87a110a992539b00d3125c4bcd4d13e191e8acb2354e2809e88af3d00fdbef1b354778ae2e265fbcf343046c9b04fb83641e28131051e7 SHA512 d8985a7a7669553668254abaa9007392afbfa99ad7687d7ac0c654d357c382515579e088af8d0fc37617703c62064c37fabec7e72a9cd14340bd5fb029f8e335
+DIST firefox-117.0-km.xpi 507784 BLAKE2B d865e39c2e2e74b1933ba183a24b46c8fa28decae45c5fbaba30a4b94e5d245c2626c0f16218fa437539e0f1b25426269d333ff7a1f5e154392ddef3f5cade6c SHA512 3bbb3d6250f33ac9a1a2e566961b0469e32832c3e3efd41c89ebbe6f58d52352b6cb47041570337e8ec1dc079f30dbb8411d37ee656fd53399ec9e419c4cd660
+DIST firefox-117.0-kn.xpi 473341 BLAKE2B 9e0bcd9100b1d346e9e4c253e985c8357cc5c9e97da72135e902a321193d42043378fe656b5da597eb66071bb3f7646b006987ab675130753314bcf4134ef23b SHA512 29ae1c264379f191bb1fc70abaacf2973457be37bddb716b8f8e593c41afe0b8e20d1cdf12c2da7798a2a7a08be50e930e334bd3ad3d6b794c04c4433cc35704
+DIST firefox-117.0-ko.xpi 603688 BLAKE2B 33315adced1e5727262343649990175f2a6eb85e19a87e85d54cb84342895d367db85526e8495965916fbfe4a05c9974ea5b5ada4637881f9d2f806847acc613 SHA512 289c06d283ba3075cab7026fa2c5f64a8deb526637492e9eafa70bdc0ca3cd46c277805efef8178b9a62b03785d8943a2e159861718e4c70e3373776491c7b4a
+DIST firefox-117.0-lij.xpi 464070 BLAKE2B 99c032187d9c9256f3445de62e9d5a2988435dc45fe1caa36d36bf47030ed66127b3e502d8a3eb06972eaf2a0cb27a8daa3ef0594a39797c06822893615ffb9c SHA512 1b85e94b9fc883ebb1b869cfb50a7894f9b509bcfbed7ba1f010dc59df635417c22624cb7a677d4729cb3c7e62f43c4f72020421c7a2ba4fc0c49d1352448507
+DIST firefox-117.0-lt.xpi 549426 BLAKE2B 4b4f9d6383db50580598acc56f67b164d396fbbda929804ba74fafde6d81a3f0ab71dcf973383094f5235fe1bde45c2306c1cc066632b1d7e9b9c3b68a11b674 SHA512 690bd4890b857d5d500c69c3e346fd50f4f496b8737706d5249dc8c87cc5ba6fc42e2e9f6edf287362bc5de1012a595d9001ac6f54089507a0dce3d353fb1c09
+DIST firefox-117.0-lv.xpi 450441 BLAKE2B eb5a6805add0b12fc12c0f45c9b9b828b4c8dcd8bddd1cdeeb82edaa5236d52f408092872329d27fa1cbcd3671bd1e88839437d1043a57e20bfad946391e117a SHA512 9704887bbd1e37c57f2b6f1c2a1c49114cb5b57c875b47aa52a058fa9b16c1e5433954b3044630adcbd8e06d68337149ef2994a5171a9a9cc7237390015fee02
+DIST firefox-117.0-mk.xpi 476037 BLAKE2B b85dfb78387933933f5a1c4a148155410465091e59807aba8c3b2fccdf8f4a832c51f273c229af9654f16f144bc7236b7edf6d42fff5ec86ed4a032570e38729 SHA512 4627a51584d77ba592dff0447363b1c34bb49da938f52fff923ab0215b10430cbbb32fc465b3e7d42e924137e10caaf4626ed3ff6a02e09972cc522741126260
+DIST firefox-117.0-mr.xpi 511399 BLAKE2B cac2b33c894ecfde0a7ab9f140c9d5dbcfa22523d90487f1d507461cad78c882edb0e77867944226d7e9851d33489747a574f227b373c6d61f912f5230027d55 SHA512 9cffa25e5b29ec835db7db4feb14369e87efb02adc58d3d06c60e880f4ec7a59066d5a700da611fc1a0231a1605b23b6cc87463d4a14b6cd46d04ec19e9bd649
+DIST firefox-117.0-ms.xpi 430982 BLAKE2B 171548409ec9c51439feb001e0cd3240d5a3ccc3f84d62802ce354d630dc80781a63a8831ffc50ccaa39e7331381a0c046e5fe2b2089d4c5946b060d20227f11 SHA512 a8431d76b3aaea5402feead837060630c58828bbd114571ac4347aa860b66a0833596fa55f7945b5f15ea6e073b4547ff792075cfd5e02e28182fbd37c8d1f46
+DIST firefox-117.0-my.xpi 493857 BLAKE2B b67b95179acc29f513fb8d28e1aad905fc2813ee7adbf94436b098cd1d1b15d7506ed7e420e6e687a7ed44681caa0ae42a67adfddad601b9364971505456b504 SHA512 a724992edb927a964b1e6b03c1927c5d84d8aa24de737741a13660b87f7b68593ae32bd07c0c210d9ee8b5e90512c391f1965615287c372a43677ff463dc5ed4
+DIST firefox-117.0-nb-NO.xpi 550912 BLAKE2B fda5cf3aff360abd5f90a488bc994cd849aeffff3951258959d2889545391b8e3cb713477387e909b3565929c77e30942b129a86763b45343e00f05e833396df SHA512 6d4f3a38f6260f367aca7c00cae8845b12eb64a9b12c50ae2f3095bb518966f5b7c049b6272f54f1aaa5403e11dd20a9be51186364a7d6febefbfebb7a0a0c04
+DIST firefox-117.0-ne-NP.xpi 468692 BLAKE2B bdf52a3a15c9a384c747f57075d047e576ccdc1f7d1a29e52fdb1426be7bcfada9d8faaafc1e8d4c0a7e1ee25dc5f1ebf1b0f66844bef1fd2f99a1b95e9f54c8 SHA512 47b902d11cfccaeb7c3c38a8d5ecde74ccc69a7d0dbd952844f7997e43cc0aefbe188fc524cdfde71c54a12e11c21e29b47db14b28368cdac4433660bdc397f5
+DIST firefox-117.0-nl.xpi 562330 BLAKE2B 9f631252caa598618ea286126a7509c68d24b4dafb0695d6616ab24ce6be012973a47d4fc31291955611138136aef2298b64f98900b188211e9a888d75f3055d SHA512 57895ee8821489e4240bcba3c0bac9009d9f3a94f7511a98d0979390eb4402ac48da11a8dc344d9b5ae97f2e0536b5d7e3cb83a9887e6fb757703f1606a1e4bc
+DIST firefox-117.0-nn-NO.xpi 555660 BLAKE2B c25249a9040d638ae374025c42accbe78f12e54e64275ddc9fe8217c77621560f6ca85414375f402a683b659a24c892f116e0ccca5757dd0279d9fbea55c98c1 SHA512 7780ab0d0eabf0837dc71b31376aa5924b33eac94d4fc423e047ec06851b4f1d8e0710c9bfd03fb825ef3d1d333244c63e6bd69a6db08ad3d31f3573d98e88f6
+DIST firefox-117.0-oc.xpi 575183 BLAKE2B 699ef5ebfa34ff2599ea97c8c4e58a136b0434a71d09e12c97b37899e04d3e6ab5d8365340ffd5cf1370c8db3b503a147640c9beb0fec0a30918d646a7990531 SHA512 25b5d8ea24d0f1707fa0510b5eba5fc5547a359e9639d8c07f30215d30e7ebd64162a2aa7d80c5fbf365cd63cb2cbeb8a9df9d3c52221e4d2a798131c1add826
+DIST firefox-117.0-pa-IN.xpi 629872 BLAKE2B a6689b2a15aa03a09bf371b794520d47e598432b27868d77ef6679bd35f8af1de268b570f9e94f7171a28f5c7b4744a91461ec19904de33d0a215c98fb5f96b1 SHA512 6db73647e71a399cb4e7dd7f741e7cd3c54846904d404366e2d50a9df7b2487f85dffaf43be5cdda0041848beffea3e0372eddc89f927067827dc6ea719536c6
+DIST firefox-117.0-pl.xpi 585320 BLAKE2B e7b92da62b687d344e9169ada36ef80c4600ee95fbeaf94aaa88593f3c5968ab398d665aab85285e1516217254959aca865535e4dfe047890e84a281d1441b28 SHA512 815e0b8ebb8dcf4a03ba4a9af5f646e3ef8ec37292dbfbe6584e9b2543e7ffed2b728a2692808c87a6b58433c944bbc35093a684c9618dfeeac93fa214969f88
+DIST firefox-117.0-pt-BR.xpi 567113 BLAKE2B c49330ec54ac546471f51c211469d3837e8bc0d753501969ac13a00cedb9170f78f3c31f123aed6127ff6e36c4828b30862c21556f8cbe91c552ff46ed679800 SHA512 e78efc0ef30b148781db62aada8b16f1524d2a39e85039ed97cd81e5db7361f7e53b2bcb7ffbdabb90af0c7e8ccf20b53afdb1edc6f4c5e78c6cdefa7288f475
+DIST firefox-117.0-pt-PT.xpi 571431 BLAKE2B a75ebdcd1799abe60dce8d72209e50acc08a1b0dc351589fab8703ecc0b413c7f3a3c90deac5bb600ec4834589b7ee1336e0ef29cec573b4693d6f8dbe21e5fc SHA512 9760b140bf4b0abff7a8e6dce2dd98e7961bbeace51509b3448ab77d1b7befdd117871e56b06390a5c71212718e7406ccddb4e45bfe85853f04787fe69e2a5a6
+DIST firefox-117.0-rm.xpi 562452 BLAKE2B 9dccb03b6b8f95dd6b8d9e88c24e64e5ded3f9343bc46b713d20cd4603d762663c3342425e23df003d2d1066311c3d2b46d1279fac915723b0a74b593c4b15f1 SHA512 6913f1012cddba71fbd2ff0e6d8e2faeaccb21efc567e2e1b792db8a9265de3e42d68ddc26a90553dab4668087725161a9040d21efdadd07b868e1d0ec96459a
+DIST firefox-117.0-ro.xpi 525852 BLAKE2B ccb6953a9727bd0ea2c6d82e23d04b24953ec3e39e95aea98d91cb26420499e127e0a5cbcecc58e89c90db18df8b762b2b6a7665b3d1a707f05b364939e4eca7 SHA512 767251aa06b9a08a3c99aa433aa749786bdc872e63d70a39059d2259fa3d07438e64929a74599df1a03c6913149970dd0c13b263c100c5ea492a74a32187e2e4
+DIST firefox-117.0-ru.xpi 656333 BLAKE2B 3f88cef9e1e9f04d4f03f00cb0733d5f5e658d53acfafe0d8b60c751e263322345a680834f3300a4ee04b221a50499543fa857e50e346b9a4de78f30e8ed3663 SHA512 bf8cffe6adad3cfc744f8a2fb8ebfc1cd340cab2a831e1a961e04da7c0fece856b4fe5fab8245d0c964399b7bc6fd097f26775dd6d8528987ae3956af8aaa6b5
+DIST firefox-117.0-sco.xpi 490201 BLAKE2B 19ddd93d2284bb5e56fa5ed64fe1af9af0a09f3b65939b36c98ce095853c2688e73ec54c5f4f9add20bf0d220696435780b7b0a9d9db1bea27fc3636105ee969 SHA512 d8664243923f7b3a7378c59c5011c8b89f4a2a045b0234503b1ac45bd8b4019ca6d779248050034f320811a42473bd3519d40020e6130639953da052371db4d7
+DIST firefox-117.0-si.xpi 578784 BLAKE2B b9dc28fa91443133ef2c919b0216422f5ccd6689255533882289920ba547441653895bc33f4a15428cb23f2ff59d77c89c98d1c0cf08b6db644dcf5f5c19fdf2 SHA512 540fd4001858227e0b24a3e0120f7892335de81587b181b0f8b72f4fa72cdb91a6607c510c8914babe2004935a24ece1d117e8e8dbf04b3678cd60ce48b83785
+DIST firefox-117.0-sk.xpi 593717 BLAKE2B aee43f472d86c277cb7694b12ded497e617a301c1242650a0cd930649ce82c806defacca772b65fcd3be05d8d9f9b6d7c82234da0bea471e71ef78be1a0162a5 SHA512 c353e42e8c829ec2445f439102d44341c90a9ad249c5c88a2b7e3237b0bb867b77c6aea64371cbf9616ad51dfa5c5be79cee1e340d8d607c4f3a550dd6c0cf01
+DIST firefox-117.0-sl.xpi 565952 BLAKE2B 62c2243d9994610fde8140da2927debc41f02f0523333a9d6967f227819b78f9995f6dadfa9c462803fe262f41070620701a42d45c000e1af78651e4c4cf6c8d SHA512 eb00b30b5e88d0ecb7af8b8bfad01807ac392031f5c130c2e573abb832d0d3765377c6187acb42ec77c56c968e0cb86ca468414ca27965d5d1af3faf62aa3386
+DIST firefox-117.0-son.xpi 400534 BLAKE2B 63fc1334826be5a25212cd04059d8a9fe3514324bed823a70d34283e4cdd267fc2f5f5dffd08c1a9c96248ebb6830f6a4732d78d58b6a04ed540358694f144ae SHA512 6539e2a0ef4ec1efdc519c9ce25e082033bfcb2defe2ad4bcb064241f4b604eb223146f482354c6ec9b534b24cb79f496808bfe772bf2e23eb176fd82e5148c5
+DIST firefox-117.0-sq.xpi 565642 BLAKE2B 551f3db6fabbf9a59d6d2c0b51bac459e077c4f8235b4b3195b073e0b33ce65cbc4b29f16cbe03dd9aff48b56366868cab0a1786d57428b7481560562e3ff53b SHA512 030104499b999b3a71c83289c2faf0f2013945bedca43186871a0088d62e53faa1dca27de41643e411e567c09d996b3d17c3231585262c10708a0a91be361b0f
+DIST firefox-117.0-sr.xpi 615331 BLAKE2B cbdece09003b6a96be1b65899415e91ca7158a5a27be8a435dffd9835f892ccb7991f6844ba3772d50eef1db884c5ea2023305df18aec2140d12430b8501f7d9 SHA512 57e86876ab12c48bd21e79d62c435179a32dff336e503e7b9e151ea12f3eedade926fe8caf3b400117f4b36b90c10df505c5b792f7056084ec92aab04f74ee7e
+DIST firefox-117.0-sv-SE.xpi 564229 BLAKE2B a8518d90a6c7a004028f4c60409afe0926200c147f376dfb084ad4c2e9e1fc37c2b0bcd97ff0d04e7c332468b384cc530842d7f4a2a3ea55a7f272c72eb9b930 SHA512 65c018e3c24e6808511cb24e6c73f645480e57d6f5f045811b42ff315c458353121c3c8243d665389f5e3b86bd5c343a26902c76e8bcd3d831253cc2c8feeac2
+DIST firefox-117.0-ta.xpi 488403 BLAKE2B 8e190b10ed0218344be7846a4d382755a5c6c1dc5f858db56ff2d8b84ba683b054044f54a1afc730bd0ec97cc1b2378d016bbb1dace9021bba59b3b09dcb76ff SHA512 207ba7d11566a1fca33845e62c966830bff0dd4e0707eddcc741a783cb571b6cb4513004df962bf412614aefb07df022e5c0e8547745b084627da61f10b5e934
+DIST firefox-117.0-te.xpi 536504 BLAKE2B b3788f65449350f60e7869a3fe0d9644eb2bd3e634bb05db5867ac5e46f5b5cdac2c8c4468a9a4a0991f9f899da5b60b03a6ed92a67dfb79dfdfb8da515a66e2 SHA512 c82b7ffc879e553d49c0a1106352aa71fba19a0a36bcf690aa796cb9901a839f5ebbad2ea8f404ecf1f324dfc3be8a067c5f561a934c064fd5c38154c7888448
+DIST firefox-117.0-th.xpi 635856 BLAKE2B 1b61af133e988166dc0383fc3c4aaab1009e0b3aa047e9d9d0636b9a12e18cea0618729160eb83c28723af53e7c9776659c355d8cb6fd5113294808ab31b97d3 SHA512 c59698facd7abd9c0f40769fdf2c5e4093c8ce45d1da3f1192723850d88c125a446e2ff8d7930386a8bbe2c913b16f73f5bde50754cf4ea3c21f4c33f0d61fb3
+DIST firefox-117.0-tl.xpi 512485 BLAKE2B a7b690013b4b9611ae6b569d7e9da16fbb9765ba6fc67e91d1174f312938474389977a0792653cb74edcd32a3f64e2ba25fa3ab454115641ece729b7f324e8ad SHA512 16b43a593090b8a6b7c117ddd0d0ba2c6677563a1b7372bd4cad11870087b6f6190c364c7f9549cf87c9cb3bc87ea6a3a663decc7a731261de770f42ea4688ad
+DIST firefox-117.0-tr.xpi 575930 BLAKE2B b725e9c17528f90923c6459d74ca254c822d53a3dbc3b6c13bebc25cb2a62791750b6f6f265f2ba5c67eef240ed717318ddcf4a8129474bb293c6bf7f29edd1e SHA512 9d0840537ee81c434587cde73512ae97ec0c417950e3572b68406380ab4f66853f5c50ab12c199dfb9e865f6938de6eed7a2038a3b07a93f0b05a6838b2f7042
+DIST firefox-117.0-trs.xpi 484144 BLAKE2B 2ee8e46896acea22707c9e6e0f5a919c3aeefc46dd10ca8eca2ff88a0cfd6c42432cec82f3caabdbbeb9b032c0eb9449cd8b5ae0188fde5ec8dab09e515d9328 SHA512 e41432b8365c399abd0ca0b60e956ea9f444c3f584d89f4e7ab41722655d44b21428f692d7f853601503dfd0b7c6220893afd3c49bae88e8600b9ac8337ba03e
+DIST firefox-117.0-uk.xpi 649504 BLAKE2B d61079a384655e29126dd251245c3d46acd08b164fdbfccf8f381c90c8f1e24d446d6ef6bdc2223bfebfe35ffee697f640d6f4a69c3c3fe7f1c8e5f1497bd086 SHA512 45c26f9b5ddaaeff02f68cf46315edd2085335ae79aa7fce83b993ae1d3cccaed1323f26f03f909de10d4461c162b1bbb1141b5da96a112c09b9181a0696998d
+DIST firefox-117.0-ur.xpi 539405 BLAKE2B aa36e6cea30e14bbb6e1b88f0ede4a02a2a3c0c655abfab14be330a59f890ce9c38751b4b8b67e6940267a5ecd8eaef53995d0bf939bb16b96c9eaae16382194 SHA512 5d923dc42466a823a6d9883f44403f35ee563b3b470b5c6cdd32fdbc14e5e4994c8509a8b91a6858d5a5013381bb57a483caa19928b4085969bfbed49360d290
+DIST firefox-117.0-uz.xpi 461426 BLAKE2B e68737adedd49c367e4b45a6c008fee24bb89b85af471ceda05eee91d162245a443b50e8b0a4257404e40905e1d5cb345e0532dafcfd2a1672116f8afe1e2ecd SHA512 30e7b757c35af09c5e981a8d2e8fb1cbba820ad88e9c524fb9fe3edcb58afa572aaab729384fb0b2ee287b79520b799d9c8a00067591f5b6776227e38522157e
+DIST firefox-117.0-vi.xpi 599835 BLAKE2B cb583ebdd0521764dfbff76abff238df4372a08e7f6a029eff5bbe6e763a62008a5c70f63707c02780fb5389615eb67eee9a69c9e20e83ed142a2ccc52c497b8 SHA512 f377dfab162f411bbd05dd3a0d037300efc49aa8d3b4c0e76d87a572d6d3b28882967846dd63818bcdf2e89dec44750c2c92dafd9a40163ddbb5f55849aa2c96
+DIST firefox-117.0-xh.xpi 401970 BLAKE2B 1e5fc872ada80753c66a44c96e7da7945861152343ac416e3f8a9e670ca04c05014edeaaf8744134551aa76da7ed251d6a392404cacd4cbc3da39940beae44a6 SHA512 116e372c13611d0e8140dd289a20fd8161c6b96220c9e27f7bea6a0cc8e23b5e827a7eb3fe8203cea3e1421bff710a72a8b34554f1004d5223baab0890029a6a
+DIST firefox-117.0-zh-CN.xpi 599269 BLAKE2B 7a46e06909c11dc5818c6f4bb8b5cce49ceba8c7dd6b7451c0830ce040db1a63f7464e82813ef841fccc2fe9f7cee8c7e33d5faf217a2822ab68cc5b55dd879b SHA512 e4585672100ba500f89d38571188149ff78d3f50156dfaf2ca4193bb08863ef28e914d04bf51152f7f0ea9f4b0d8c953957c7101cb6f2b9d15f9eca803f31eb9
+DIST firefox-117.0-zh-TW.xpi 601287 BLAKE2B 67415b4ebab0ba268053ffc680bd802587c4589163f43f39b9cfa5d31a9040a300ceb73be2a5b97dee94ad87eb78d76f8c1dcf62f59ba6df6d218c46392e3326 SHA512 5bf793f26c63e48f2ff831eb74d1272039093682298060dd72c442874ab1e56b0f959f65ce9569b64106f6eb0febc15b7f8dfbdf6ca490ea62cc1271d601f952
 DIST firefox-bin_i686-102.14.0.tar.bz2 80683162 BLAKE2B 69be60f6e087d5ef070f1b1a51c471fb388ed28afd0e50bb62e65560ef74097d968371b70afaf6a7f91f18ffd17e24376e50d0e000781a54c5b8c3419ba1e903 SHA512 eb1eb847b5710d924d01016b4ad8f0abed60ce68897819704e8984b21a299de7ec67cdb984be174fed1a1230e1d281e7243e6f58ff7df6970568d7844cd5d186
 DIST firefox-bin_i686-116.0.3.tar.bz2 80137961 BLAKE2B d6fc0b03b9df8327c98d616ab676cbcfd299983232db5fbc5f4123a0c400915e493150026407eeec30731ae60194c774d672a492f99b37aa09e22a9f25f35ad8 SHA512 375b88a59d8b0c42becd5367fcc00debd9660472c5052c691f9ea90478b1fdbd791f622e2195ddb02361ce2c4c359178115bd8e1cf84bf6251f5ebd92add3c8e
+DIST firefox-bin_i686-117.0.tar.bz2 79833553 BLAKE2B c4d8631da299e188b79cf8f99d613cf60f24156c6f76c7853afe79e89236bc9cf8d59e1fa0b06cb54df06e1c94cbaabf55818ab3db9e189dcf7a174fe0b099c2 SHA512 565544cdd937fcc5a3a2cc8cfd8447a63faa3f23165987971e52c02b47ea5cd3873c37b3f7c2ea91741fccb61478384d27f7a92ae3e7d30ea232b4bf7c852334
 DIST firefox-bin_x86_64-102.14.0.tar.bz2 77559785 BLAKE2B 330ffc9bff4b23ca43c49d63756172f42463aaf529680563f0bb94efc6e138b62cb712ffd2912530531c93fad99e8483a5fc50f23f47cf632ef73a3f3c912abb SHA512 616deac46afeb13e092b59939443d6f3d8488c30d7cc46c96e08c1560a235c53968a5315b581183943dc2efeab5e02f19ec98a895ab4785ab42b9b7db795a7bd
 DIST firefox-bin_x86_64-116.0.3.tar.bz2 76367321 BLAKE2B 978c20165aa5d6ca43bccd128820216d5b4503555233f090e2d7767489e19a36ff335f97bd969cff0f1edfd7385a271497199b8aaee7f33c9eeec0b5b4a42923 SHA512 d4b10656148fdb9f14e7cd6f393fcd7841a98508582b01800640a6121fe1be1f9db1c0812554481925b1c350b29d00291c0ab2b8c64a26acbd5d78163e8c9645
+DIST firefox-bin_x86_64-117.0.tar.bz2 78163541 BLAKE2B be703dfd0634fe682103c5b1918c2ad2269f504f2e8a2e41c3f04b92c6b8cf16ec8fd292f6176515788ffad8d67f213d89cba4e62b38b8b68eab2f2348c699c4 SHA512 737bb26a12ab8cda7ba56b30a75d77f4c7e228f958ba4970704cfbb01621e185723a32ab038424b7893926de8d77b1b247ce7a6f02cdc1fd87ff846080e2849e
 EBUILD firefox-bin-102.14.0-r2.ebuild 10924 BLAKE2B 7a1058b0ce053f2ee1e88d16ae4190df9d5d85d69a17d84540916fedff8e0e912fc36a2b0da958d2fb52380cdb1d9a076bc9e8ab3180b04f9dd53c7a0d6c6108 SHA512 4851d1b204c4d6f26fea7b167a4877089ca87e538382ebd57ad7695b6c7c9bb476b72b9449bfde29331e643a9a3f5698f58627f9cb641ab7d5ccadd9bf123e27
 EBUILD firefox-bin-116.0.3.ebuild 10949 BLAKE2B ffedddb41d31a1a428eb7a4adc359b1cc9f7d061dde3bd287bcece4fddcedc2a1e4480848a1bed726cbaee0e5b4ac7de3805a62161a73af4157d451f1c8da060 SHA512 04c89c492fefa6004e42ed3301b14fe790990ae8f64919c04f59d09d5948d1a5ee34bae38e7d80394cda6286626493370354f77ae430bd6dca6e5e3497b712a3
+EBUILD firefox-bin-117.0.ebuild 10949 BLAKE2B ffedddb41d31a1a428eb7a4adc359b1cc9f7d061dde3bd287bcece4fddcedc2a1e4480848a1bed726cbaee0e5b4ac7de3805a62161a73af4157d451f1c8da060 SHA512 04c89c492fefa6004e42ed3301b14fe790990ae8f64919c04f59d09d5948d1a5ee34bae38e7d80394cda6286626493370354f77ae430bd6dca6e5e3497b712a3
 MISC metadata.xml 520 BLAKE2B 4b540dd2d9ac3840061de8a73117f2859db156944826d22c1f74cbc0c35f6d305aa10ff45708eab016df725cfc741c99dec46f0078a29162982431892e86e477 SHA512 0c7183e35a4b0ca2ddd092786ebdeb5b41a431adf918f0c2e541a5ef1c235066586a46a50fa29c25e5a522930824f8662fa2fa7eed8c3895f74d85bef93cecb4
diff --git a/www-client/firefox-bin/firefox-bin-117.0.ebuild b/www-client/firefox-bin/firefox-bin-117.0.ebuild
new file mode 100644
index 000000000000..41fcc84b3f19
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-117.0.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="rapid"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+COMMON_DEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!www-client/firefox-bin:0
+	!www-client/firefox-bin:esr
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	alsa? (
+		!pulseaudio? ( media-sound/apulse )
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-libs/libpulse )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "desktop notifications" x11-libs/libnotify
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-08-29 10:04:55 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-08-29 10:04:55 +0100
commit	20325cfc3bd40d48d3c7034afaac4f5193d9c704 (patch)
tree	b8e6ff7fc02271595e20f956b32cef56c41dafca
parent	14a6858a7d8bc085420a1430b3a3f67885019f27 (diff)