gentoo auto-resync : 18:05:2023 - 10:12:16

author: V3n3RiX <venerix@koprulu.sector> 2023-05-18 10:12:16 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-18 10:12:16 +0100
commit: 8ea6e43d2f65acbfda614dbd4635823d7605b6d8 (patch)
tree: 06f832bd17f7282b5cd87dbec9f023e550afcc04
parent: 75b7b7da41881995754ded71c9c029cb1686096d (diff)
319 files changed, 4513 insertions, 729 deletions
diff --git a/Manifest b/Manifest
index fc007d75a345..58c732f044be 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29484 BLAKE2B bca7366dbae5cae583ea8751075195be91e8f5b72c5cce9f4b07976bf9b4817c2d12d00ea8982673352e88b80bd481dde90b3c889a336746c2dfbf6f0a8d1998 SHA512 092b15a9e066009af63b04ca989682aa80fdde3ef7f8242d4b0285d60b62a6c22713abad79edca4faec9d68a50aee7f6414581356c10a00ee86378438022225e
-TIMESTAMP 2023-05-18T02:40:13Z
+MANIFEST Manifest.files.gz 29484 BLAKE2B 6b8abbc829bbad96f02eb79994c939753cfe8dad3edafa5430a3ae138c94216a4cfd4be94244d14745f57a6b984d41020528f7458e468a9c4ff262088de6db54 SHA512 a7d1c13cbd4ddf48f10e13cfac6f7fb36af9fab93c87593bfb8d4ae06697b07ffc4dcb351eb690f2a0f024c4e184ea32823e833b677697a5b5eb1696ac003caf
+TIMESTAMP 2023-05-18T08:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlkA1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRl5EdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCErg//T2Bk/8PsV+JmTZ0w5HjuG6xMFktNADmAoEN6ceTXs5ux8iK1TpsQZe87
-M17Yca0g7AJoA1FYoBeTHnwf2DqHPmS151pFDdloDQaNhBM4lWTXFq5GY8lvYGtD
-8GRIyiMfnm/KjJ7WjDTQTJjxibDv9fkEKDnAbbcTE4zqQJhGrSRYrMDKkkKnNAlw
-Feot4spkwDO0ytLBoQtgyTyJLeibQP5tOISSzvDbRL1eHBlzJeG8F7P5BSNgRgCO
-ZjTm3nkuNtGNmnoSrX5pGj70fHENoNHzpxmLeRyqDMZt2JMcqD/Umso6piHR0MVm
-FIaa+WKjO/ZbCJk+HDPesZ3+Ze54rEXdrGgb3sSrIqV9+0sCqAVy3v/WKqPUlL92
-TVrU5s2zM4y19aM5B0uMHIavNxlVUOFaB8BkU1XNvmi4GXHMHjIlQkSjB4wxuB94
-QippOaQ6Lcb8ncobJraOo0ZR7hqMkblj1c+zwpZzjZk0a5XaRF1BHjL6aqeGnRvn
-omqEBTcwtOy6LNEUndl1o5D5/2zq31z2ZFKOX+E4d4lvwhquHZoE7LU3eYis56+x
-h5cpkSVphrWW9Rj7vTTAjsByhTbH7Kw8L6BFvlKRVdc2Sq4xUv/pirB6o28rNtpE
-5bMgy3m3V+wHPNLE+tVZ8u/XwtRhj0PNIK3FdbY5AEqwq8fzDms=
-=TgTB
+klAVBg//XeckSimFFxjbr62Yoq6Ebh0P1XjQhIorgdCchUDRylEl9IorKqbH9znX
+uO97Z3CV8PvMcRCyoueU+CMit019dwSGstm/b4p3tQFBFdrkCQLANsn7vcaudfLV
+J9RwjC/LJyYWFzRttxUw6OpTZhkooVs9+XAL3JGrSEGjg1gv7iUBTSFhaj2Km+wN
+H5S2SVqGFzZDKuj675nBs8VhrZLIBV11ykTPTrCjjEIXxrPGtW2yPS1GnvQ3GU/u
+rFgMm2kdPY2ezkc7+GvR3RHobXn9hj4otY0A7gLRwCAc/Z95V66oqekthToC6Iu9
+UJF0EJexvSFTqiBLUcZmlP1Z0JMtF/slvFWOWfaNKePblwFIgXqXvrBUMVnutWP+
+ns1U3UjLql1JWgwGAUEC1YUhFlbjKWwuizVnL3VjBF7FBTV0+dyRHFk9IC6l+apz
+cfTHEMFgBTRNgW+DgVlW9BdFczBnav+37BY93t1gLyXmY5QjrDXtTjv/sd7tKZuQ
+f6TONUk+II1M9xybK3vcz5G3qcXZbwaFCShd57QNbfusQEYxh+6Snfyeh8aRIDbq
+kabZ0+lwaZ+Aoew4dXctMrXNDIhtyKtxiQcXo6lYOQ+2n8nNg/whEr6NhjVvw0Fm
+AsiDGc2sWLbwuD4zgZy+7KKzTge9aPyNjC07hZn5TogzXrg0YD4=
+=Oqw4
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6e7ebf09254f..4db86252570c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 00228a41950c..77afc44e690a 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index 55ba46e267fb..2fce1fb194a0 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,8 +1,6 @@
 AUX crun-1.4.5-glibc-2.36.patch 2631 BLAKE2B 6f37b02f2c87d056af84c1dc146ba5b9915ae95492aea6d1d2f6e708b70bc37d2d48d666fb7d63ce2a07c594dc76cea3dd6892b7356cea56a3568d93d9f5a7d1 SHA512 1f54d6c1bfd3e4fcbd39e0c4651d43d21e7902309d3b844acdb6f908ea3b3d364b01f90b6ecb81bd98ce8f0f035061399fea781a8e76acf07ce32824b72960cc
-DIST crun-1.4.4.tar.xz 877892 BLAKE2B 57e48c0a229db3f54212177cef3fdb3f59b4bb1d1cc865da956f026a35837d839489bd126f880d7a9ceb18f5cffbf0e32ac9ae59a4cd39c34e3aff5b32c0559a SHA512 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd
-DIST crun-1.4.5.tar.xz 879044 BLAKE2B c80cae28c23140086682493a7dddb40640491e3ea827f0a7376d9be12570111d056022f50b8d7c574ca07790753d20de2314db5b89463994c4fffbc7576c372d SHA512 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153
 DIST crun-1.8.1.tar.xz 692152 BLAKE2B b5dce1a454641221c591f50ac8519d4e9e9d892ea56232fa3fc9916934c19eba5853019238b1837cd5fb61f0dec5e0e6a11c02f628bece3b69c9c4f5750addae SHA512 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042
-EBUILD crun-1.4.4.ebuild 1624 BLAKE2B eaea46a12c688834557c9f7c18ca10fd16123f2dd7970b49c70a3f484a1e7129db2e86f2d5ce9764d9a9987b7edac72f21e75ceb68857199281737ee03ccb581 SHA512 d06c536c71b70c356a7f3ea7b90041abcd7a8d9cd6ab9e9fae1b8ade416520bc9f266a804cd2dae61e0057c092fa2d4f7de492311a13344b834ecc070317c558
-EBUILD crun-1.4.5.ebuild 1804 BLAKE2B a3fead6bce9658b926cf0f69a57c47c81682d79bea3ee6436e28ba238ca3735325b7f956df4400e4107677260a99843dbb27fcdb4b3533b51c48920ffb3ef025 SHA512 ca1e53476cf2fdd2c0a64cb579def04826c936faa69066d22c89987677314d209e4271586e5eb02641a07f47b45d410936ead2e2a80d253ad3b9b8f3f309568c
-EBUILD crun-1.8.1.ebuild 1598 BLAKE2B e82a86e3ec80a9a3a6d873edb65d27e4d02dae62611e66a09faf25cdb272740572781a40efa384947ad78145c7c8a50dd21895e7b3a48311bd8b5417846ba81d SHA512 b5622996d32559542103f3d7f52ecc4ca8cc51b644de235ed27aae93eb03a0252dcd3672629eea38bf88e0412780dc8bd98da1a3229e3540151639b8efb23509
+DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
+EBUILD crun-1.8.1.ebuild 1672 BLAKE2B 388b4daf7cc6fb32e33e9114253cab94281abff7a17d260dcfa255042ba57489e2dff0b95bfa6f5d700fac01066c9d2cb282becc8ac90458ed7c10d5f967aa90 SHA512 69077ea7f94586489abf3b16d0cef1f793569ab2db7a3334c89c7af7e2d4561479de456838da9f5aa1a9eaa5c3f51471436aa66a8595f643ed8a60eda7f8a0eb
+EBUILD crun-1.8.4.ebuild 1675 BLAKE2B c84bbaf331c48cdc5788ad59ebcdfe969fbb7e063903d7b4b952d5e9fcf23d7085fd7ab4e5e63c250bdf4ae9879ecb77bd8ae77c062a2e3e969c131f69903217 SHA512 b2658e783ff21441b68971b9150edc8733842c0645c11c4c2bdfc049f19e8571ebbd2a99c65cfc6cc3dfd625138851b051e5817b6e3d52693ce4e167d1c20851
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.4.4.ebuild b/app-containers/crun/crun-1.4.4.ebuild
deleted file mode 100644
index f3c0ba5f4670..000000000000
--- a/app-containers/crun/crun-1.4.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
-IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
-
-DEPEND="
-	dev-libs/yajl:=
-	sys-kernel/linux-headers
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	# Need https://github.com/containers/libocispec/pull/107 to be merged & land in
-	# a crun release that syncs up w/ latest version, then can drop CONFIG_SHELL
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-}
diff --git a/app-containers/crun/crun-1.8.1.ebuild b/app-containers/crun/crun-1.8.1.ebuild
index e2322d175643..c0e0200e403c 100644
--- a/app-containers/crun/crun-1.8.1.ebuild
+++ b/app-containers/crun/crun-1.8.1.ebuild
@@ -67,4 +67,7 @@ src_install() {
 	emake "DESTDIR=${D}" install-exec
 	doman crun.1
 	einstalldocs
+
+	einfo "Cleaning up .la files"
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-containers/crun/crun-1.4.5.ebuild b/app-containers/crun/crun-1.8.4.ebuild
index a9b7febcd5b9..b508a2fd08ff 100644
--- a/app-containers/crun/crun-1.4.5.ebuild
+++ b/app-containers/crun/crun-1.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 # Can drop autotools/eautoreconf after next release & glibc patch gone
 inherit autotools python-any-r1
@@ -14,10 +14,11 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
 
 DEPEND="
+	dev-libs/libgcrypt:=
 	dev-libs/yajl:=
 	sys-kernel/linux-headers
 	caps? ( sys-libs/libcap )
@@ -37,10 +38,6 @@ BDEPEND="
 # required to create linux "containers".
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.5-glibc-2.36.patch
-)
-
 src_prepare() {
 	default
 
@@ -57,12 +54,11 @@ src_configure() {
 		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
 	)
 
-	# Need https://github.com/containers/libocispec/pull/107 to be merged & land in
-	# a crun release that syncs up w/ latest version, then can drop CONFIG_SHELL
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
+	emake git-version.h
 	emake -C libocispec
 	emake crun
 }
@@ -71,4 +67,7 @@ src_install() {
 	emake "DESTDIR=${D}" install-exec
 	doman crun.1
 	einstalldocs
+
+	einfo "Cleaning up .la files"
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9da84ad89ab0..3f707db53344 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index 8265046c7ded..18384f8b5dbb 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -2,6 +2,9 @@ DIST firecracker-v1.2.0-aarch64.tgz 4060245 BLAKE2B 28434aa623eb473b1886e5a6da2a
 DIST firecracker-v1.2.0-x86_64.tgz 3932475 BLAKE2B 3db4b5f0746db48e8cd6e00735ba859e16b1bec94a23854cdc3af65d032773c596e8b52cf0a0cd40e363de1a5c67817176a5287af9c692167e8f4681a6b07e9a SHA512 67fcd8b898ebc3207de8f93a466430261c923d27bce97bb32636bd243957cb757da1fc72ebec2751c14205e111d2ffb80c94cfa033aecf715962e59b813fbe5f
 DIST firecracker-v1.3.1-aarch64.tgz 4178577 BLAKE2B 80636ee5878acce741f12647c7107b111430ee4a6f1da9e09af44d30bce16ac8e69d11ebc59b6220cbf145882876b38f4ee0e0a7c0050830ee93b6c925c0bd7e SHA512 f82ab276bac1d8187d33b4b0b07e871122170199025ca693d2eaf3a02d93e03dcbfe50af87584a69ac2c00868e0c02a8a7350f5e1b1e9cb196dc52d7c677f539
 DIST firecracker-v1.3.1-x86_64.tgz 4105205 BLAKE2B ab40e91c641c34b621542a991c642be61404aaa77d861341827d0555e5128773f7407277355a342fdc7c4c26d6a604e357901672175ef0a6578b25c9207c2e45 SHA512 272f3579f2943ee32663590e99658ee52cf7b8693b402d2f342e1de8a55fa4c05db5fb4b6a0495c88dfb51f0830640c3e6ef9e1569264f6c2eb9ab99c84bc2b5
+DIST firecracker-v1.3.2-aarch64.tgz 4192631 BLAKE2B b1a44c7fb0458f8e9298eddebc047cb4582ca4164926b29b23961a3c9decba26278bd70117365b89e29c414561aed1e79f4e2c248d362ea3e389d58bc5a60235 SHA512 9e88396270da04f8b0ee92c0b15f4abb8e05674c97b2dc9233ea181e9ce5a9c96400d2cc870279d9dd3fd5763cbefc3e74db01cb0ecacd1d84c966eb9c7d39d9
+DIST firecracker-v1.3.2-x86_64.tgz 4152061 BLAKE2B f9025e827b53b482bd0f44918533ad0834eaa2ca4e4d13bedda5899ba3790e9bd0bf31793d2d6e53b7791b988a2fe0b5c69b5c08eba94d865660ee4e6c2ce282 SHA512 ff5c8ed9c7a200c87436ea5f952ecf584476030a2153eaa6d753624a324fa980687249a2a3351cb120f984b86c13395c611dbb44029072f2a961d79c54dbe731
 EBUILD firecracker-bin-1.2.0.ebuild 2595 BLAKE2B 9cd3c8dcda4729aca3b2cf97a7198973ebe51c136a81f01b90a06e061144814db63319653cbed5be36baba5a025321801b11329f12298af860769659a86aca19 SHA512 53e9eff94c97db469a679d73954a7786a2a962775f98e0dd5b031f12ae3d9c56022398f257d3fa991e96bf79ff0396684288159b14b41a38e179820ff16fc267
 EBUILD firecracker-bin-1.3.1.ebuild 2595 BLAKE2B 4345c2baa20a8018d3ad6621fa0e424cde734ba75b479bb2dce86b013325f47e4644b56e89a85c77beec6f2417b54a63523c689e9f46dd7beeb7e2d52d5a77b9 SHA512 63c14567ce066eb05a4da7b452c9546c3e0601722436aa5639fd1f5486f9e7bce4b8be3e4fd834888bd61daec035696cc6f3ae4d7f827ec86b43909e610680f4
+EBUILD firecracker-bin-1.3.2.ebuild 2595 BLAKE2B 4345c2baa20a8018d3ad6621fa0e424cde734ba75b479bb2dce86b013325f47e4644b56e89a85c77beec6f2417b54a63523c689e9f46dd7beeb7e2d52d5a77b9 SHA512 63c14567ce066eb05a4da7b452c9546c3e0601722436aa5639fd1f5486f9e7bce4b8be3e4fd834888bd61daec035696cc6f3ae4d7f827ec86b43909e610680f4
 MISC metadata.xml 512 BLAKE2B 5088571672374708995301bad5f1427c9f33d89104ca971134bc5fc1afb70a6513a27ec88b938716c538db7ef8ff15b74fc7fce3aa70de49574fdbcd00a81a72 SHA512 dcb061c53e06929eb8ff6850a610ad8df17364089575b7d0f7f7e0a7ff2becb6cd446a666b2015745460f5a33f67e0a6f8df534bb03081866c0fb35bddb3460d
diff --git a/app-emulation/firecracker-bin/firecracker-bin-1.3.2.ebuild b/app-emulation/firecracker-bin/firecracker-bin-1.3.2.ebuild
new file mode 100644
index 000000000000..ec091124b7ad
--- /dev/null
+++ b/app-emulation/firecracker-bin/firecracker-bin-1.3.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="
+	amd64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
+	)
+	arm64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
+	)"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RESTRICT="test strip"
+
+RDEPEND="acct-group/kvm"
+
+QA_PREBUILT="usr/bin/firecracker
+	usr/bin/jailer
+	usr/bin/rebase-snap
+	usr/bin/seccompiler-bin"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 4 14; then
+		eerror "Firecracker requires a host kernel of 4.14 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use"
+			ERROR_TUN+=" virtual network devices."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+
+			if use amd64 || use amd64-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	if use amd64; then
+		my_arch=x86_64
+	elif use arm64; then
+		my_arch=aarch64
+	fi
+
+	dodoc "release-v${PV}-${my_arch}/firecracker_spec-v${PV}.yaml"
+	dodoc "release-v${PV}-${my_arch}/seccomp-filter-v${PV}-${my_arch}.json"
+
+	newbin "release-v${PV}-${my_arch}/firecracker-v${PV}-${my_arch}" firecracker
+	newbin "release-v${PV}-${my_arch}/jailer-v${PV}-${my_arch}" jailer
+	newbin "release-v${PV}-${my_arch}/rebase-snap-v${PV}-${my_arch}" rebase-snap
+	newbin "release-v${PV}-${my_arch}/seccompiler-bin-v${PV}-${my_arch}" seccompiler-bin
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 42e6e76bb21f..230ba8ccbd27 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index d5c97717ab39..a19daaf73b10 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,3 +1,3 @@
 DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f
-EBUILD mdbtools-1.0.0.ebuild 1137 BLAKE2B 014531d3faf967cc304bc714fb91bc85ae2dd3aa1b6247495d69312be44173c2b9437857997188353a2deb00893ee991be04d1f2649d5191c8d011dd167d6357 SHA512 42fcfb7da6608937a84efcb0ad4c3a27620b8419d77c1e5eaf76a82239c34246c82e4aaa7a4eee22bdd16dd8897333b0a641fa911802911e4503695316fb42d6
+EBUILD mdbtools-1.0.0.ebuild 1144 BLAKE2B 731e72a82eb6cb7f56e18f6c2f440adf0655b0b0b81196fee6cfcffb1c4dd86034ed3f8fc1ffec3be8711f31820e5172b6d736289c96f32d7432c6fe1e697c02 SHA512 a3a3e6b8b96119e0298fcd0ec6f4c2fe41a95cd0f91bb8e4ae66c660b94336eba50705fb1afb460e9934ac4452468597e0772c9f57af1fe450505c62876550f4
 MISC metadata.xml 357 BLAKE2B 3c1784fd2c40e530ec162e14d3cc9bac4824c0cecc0e15866f45937ed27f6aca9136640e0345b10bdf7e748be89455d4223532b2c4c28751c9d3fc57f1ce5f1b SHA512 0ae8b8f0ebce22a546c0dd083dd95f48833a648d4c6d28016ae0c96073e9943d82a2a6ce295d7b411c1a63c548467102e5e2c562b4da9c2395d3c0d3bbfa8be9
diff --git a/app-office/mdbtools/mdbtools-1.0.0.ebuild b/app-office/mdbtools/mdbtools-1.0.0.ebuild
index c92cfbe13867..e0793e6a91d9 100644
--- a/app-office/mdbtools/mdbtools-1.0.0.ebuild
+++ b/app-office/mdbtools/mdbtools-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mdbtools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="glib iconv odbc"
 
 BDEPEND="
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 604d8cbaa6ac..12019fa538c1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index b28e418fbe6f..e6e6fe24c831 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -3,7 +3,7 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
-EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
+EBUILD eclipse-ecj-4.22-r1.ebuild 1692 BLAKE2B 8277b80a91ca9910e0794a06bd7ccc801a8d60dc47ee9f6a64a8abe0e2051722bce2c500b4043369719ed932791c0f68e710762e7bf680f177e1f921be1daaa5 SHA512 6ead4e8a59aa6e65a981801badd3cdbe0e4c930639769b91e87eada6228eb8d49321b1c9bcaef8d9b8a10632bca1c25a29f590d58591480ba4dc3d2b59275a6f
 EBUILD eclipse-ecj-4.25.ebuild 1693 BLAKE2B f8aa316f2e366fcf65564005f11c256c3b52608b027981ef93dc344aaba0ab1a7bbd8bc0ccc7b0ddb026c1f1fdafbc5764014069ac6802739382f1b6b0234209 SHA512 9d178cc5e5ec4f5ca35badf455186dd4071ab5b67a53536b9f03ef73c66320c5cdb064b39e3dbc3771a63ad69a8071dc6d8311d682b35b1889ada2c7a3c71e8e
 EBUILD eclipse-ecj-4.26.ebuild 1693 BLAKE2B 86b7cf9cf8adfaae807828bcc9a65dd9783bcd886dace6ab47819e6e8f0dc64497ac51312632a0d597f93fac2c203c3b2e3d9b3a8b120c3c76e5c833f9ba4a73 SHA512 05bca27bf56ee0dc5bfd9ead8248a37b6436f005646912a5e1d36af5d093a01be0050f86c5721e372f2bda648ecf5aee0e2fa6a3afc8fc133afeea0035da9aa3
-MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
+MISC metadata.xml 747 BLAKE2B 734d84847d4c2670a042e4636188d5c0e6f333a653933fa9365ae87477adc439a9a77362307b144c72077b68cfa6e9e8068989f021147ea9fa68a86a989f4c62 SHA512 22d6f55ee210dc62f7463692726b82b4ea30a67fe4debb6860fab53b227b7254874b8c3364add8ff9d9b62dc3e35b500b61faa7f999fa61460b2a94d56759cc0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index c98b01d949da..f869a2c5af31 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
index de58dba6e94e..218c1eb894a3 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -12,6 +12,9 @@ as a batch-compiler by running the ecj-3.x script, or it can be
 used with Ant by using the -lib option to and and setting
 -Dbuild.compiler=ecj
 </longdescription>
+<upstream>
+	<remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id>
+</upstream>
 <use>
 	<flag name="ant">Support using ecj in Ant builds via <pkg>dev-java/ant-eclipse-ecj</pkg></flag>
 </use>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2db231e00639..d033831ebc52 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index af424bf7dee8..d3ae8fed85b7 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,5 +1,6 @@
+AUX c-blosc2-2.9.1-header.patch 882 BLAKE2B e1537c56f56aba3ba7012c1bad8460514e4d41cccf73394986fc4389b431d51934380d0ce674922c5c3c6f7c43f626ee2dce41ed7dca0f72aef52fb8cba6f735 SHA512 645c6e3ee1178b292341eb6758e9c49377ad1571cb222dd270eb88c8664ed3c290c6295733c265a3397008899f67b407a0af330a65d0e9f86fdf5c2cc5ba1842
 DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0
 DIST c-blosc2-2.9.1.gh.tar.gz 2793299 BLAKE2B 1853611566f081f5c6236ade1882b07aa6d596f65bb303823f418faaf0e971c1850e3e78ca501650880d4611110200c302896e81a5b13cdf05bc43c81b81dd3a SHA512 9430c026f9d7a98e38915e3d308402989073aa6fa1e8e1d5b9bdb155c70c5cc24ca118cdb5b3584647f72ae80a13be0a8467250af7ef336a1ac72eb8ec8a67f5
 EBUILD c-blosc2-2.6.1.ebuild 1391 BLAKE2B 2b44bfc10ec112298f66cbf8d681ff7396b37378c021d4c43492c6ec02a5483c3e04971b9c4d8aa21ec6fea0b96cefc7918c71dfef1381ef0daab64e2c400afc SHA512 bd4aee3783cc1fac740df283629054fdb83a5c98406b7f39efb9aff412aac0387a1adfbed9c3506e66bf5d826df2cddd89350a7b54fc15f8af91aeff53841fac
-EBUILD c-blosc2-2.9.1.ebuild 1394 BLAKE2B 8a147114436734249aee396ab2f0e0a57e84d741fa104baf21b88bd79daae253018e19713628eaa4caae86fa74c0dee7e3e9f9efd6ff14bae1f11ca2d4ae6778 SHA512 232708c46657997be859a9a1f545fc4235165a371633ae09dd4aac9e4a87bfab706741471904ff3e9537b4917c9ccb29fd1fb9b039667e12dd1bd8f83b8a01fa
+EBUILD c-blosc2-2.9.1-r1.ebuild 1474 BLAKE2B 72fc3e552d5a38bac4fe8e0b81ef8295dda1c1de8a470a8652a745e42f480b5d642856ea9e242a656ed4d8a5591e4e65f7f51106ea2ce988b6cb10238cd07afa SHA512 bbfe7a2bdd3a7effe2ba2b6b30cdd0d7d016f7b1829373315d8b522b53f4d9b21c04c07a3b80d82464ddb2174b48b26543b9c5aa87b7d883d2231bb8f84bec31
 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
index 1a7c40ef0f55..842752b8909c 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
@@ -31,6 +31,11 @@ RDEPEND="
 	${DEPEND}
 "
 
+PATCHES=(
+	# https://bugs.gentoo.org/906644
+	"${FILESDIR}/${P}-header.patch"
+)
+
 src_configure() {
 	# remove bundled libs (just in case)
 	rm -rf internal-complibs || die
diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch
new file mode 100644
index 000000000000..5ec28e936de7
--- /dev/null
+++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch
@@ -0,0 +1,26 @@
+From 04035a3759b8c100e4808918e44a3eaef4969875 Mon Sep 17 00:00:00 2001
+From: Dimitri Papadopoulos
+ <3234522+DimitriPapadopoulos@users.noreply.github.com>
+Date: Sat, 13 May 2023 21:40:32 +0200
+Subject: [PATCH] BLOSC_STUNE is not defined in c-blosc
+
+Therefore, do not guard it with BLOSC_H, the include guard of blosc.h
+from previous version c-blosc.
+---
+ include/blosc2.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/blosc2.h b/include/blosc2.h
+index dc6d1fc7..ef035f07 100644
+--- a/include/blosc2.h
++++ b/include/blosc2.h
+@@ -211,9 +211,7 @@ enum {
+  * @brief Codes for the different tunes shipped with Blosc
+  */
+ enum {
+-#ifndef BLOSC_H
+     BLOSC_STUNE = 0,
+-#endif // BLOSC_H
+     BLOSC_LAST_TUNE = 1,
+     //!< Determine the last tune defined by Blosc.
+     BLOSC_LAST_REGISTERED_TUNE = BLOSC2_GLOBAL_REGISTERED_TUNE_START + BLOSC2_GLOBAL_REGISTERED_TUNES - 1,
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 18af9ac2d94f..e445e9997674 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.3.ebuild 1665 BLAKE2B 7868cebbbe8646b753b31cd1e3722b6d6bdc339302da7929c312792aca1a8310eb170c9c4e9322fff4fd432cd543b48d840649619aec64a14d4b77cfb575c3df SHA512 260fa8e90774c7d168815ce2a48826cb72cb73d5bda725db087a2b2ed5a71a5d0529633b89c9bdfaca2552bedc85a84ca48cc9dde243f14c0158ea758fd5f6ed
+EBUILD libclc-16.0.4.ebuild 1665 BLAKE2B 7868cebbbe8646b753b31cd1e3722b6d6bdc339302da7929c312792aca1a8310eb170c9c4e9322fff4fd432cd543b48d840649619aec64a14d4b77cfb575c3df SHA512 260fa8e90774c7d168815ce2a48826cb72cb73d5bda725db087a2b2ed5a71a5d0529633b89c9bdfaca2552bedc85a84ca48cc9dde243f14c0158ea758fd5f6ed
 EBUILD libclc-16.0.5.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 EBUILD libclc-17.0.0_pre20230502.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
diff --git a/dev-libs/libclc/libclc-16.0.4.ebuild b/dev-libs/libclc/libclc-16.0.4.ebuild
new file mode 100644
index 000000000000..e3f8c7873aba
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			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 6f9364e75b00..6d38552703a7 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 d31ab8059f57..3893df9b6cfb 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
+EBUILD llvm-ocaml-16.0.4.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
 EBUILD llvm-ocaml-16.0.5.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2517 BLAKE2B 1d5ca75f0e7b2a163b022e61ffa8d23a0de3f5d6f9f35e28010d2cd74f0cd46e1184359ae4751b4b7b4c33f15688e7405bd9424be13e054a64e9373315b91210 SHA512 70252ca918832aaf4c9069c2f20a484fcd649be55a7a316de57e3ac36e7a8816eb299f415343f6ab0c0040d387225e89c5e75a5b3f43112b13a10f496fc6f0a8
 EBUILD llvm-ocaml-17.0.0_pre20230502.ebuild 2517 BLAKE2B 1d5ca75f0e7b2a163b022e61ffa8d23a0de3f5d6f9f35e28010d2cd74f0cd46e1184359ae4751b4b7b4c33f15688e7405bd9424be13e054a64e9373315b91210 SHA512 70252ca918832aaf4c9069c2f20a484fcd649be55a7a316de57e3ac36e7a8816eb299f415343f6ab0c0040d387225e89c5e75a5b3f43112b13a10f496fc6f0a8
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.4.ebuild
new file mode 100644
index 000000000000..d5f0179fb951
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d36ef6f983d6..2587b4e96966 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 847d1b0cea97..776a924cea69 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,7 @@
 DIST alembic-1.10.4.tar.gz 1152769 BLAKE2B f940dec295f362cdb63bdb0326c5438734189518188e9de01d2aa164b3d51ac6d00ca960bae9fc539ac19b2c82982e907fa705efd02d30cd08d5a9f8d0ab2ae3 SHA512 bf49aff7d04fbbc966df351451dacd921c3b292313c1077d6b02a2679aeeef086313cd11ede8880c056950f8359bd9ab6e3f5219ae859e48d0298aeb8ea9e398
 DIST alembic-1.11.0.tar.gz 1172377 BLAKE2B ec29af312516a6d2cf9168994efbfa89e2bc3d11294573138f5e145c51587f1ab5dd07f9da95ae7d8885de2618159b5566dbfbdec9c64495cc086d0d157c9105 SHA512 d3d38887835a632e3129e8fde1449f91c60ffba575b7e0c568303ac4e1fd6ddeecf8c93540b65fd827ce2c08e377820278ed8ce1a80df69968145fc16267e266
+DIST alembic-1.11.1.tar.gz 1176522 BLAKE2B 5a4185cb59b48301d350db3c44487408ca6c8d88b47ddd22e4c19fad57d0961cb3968652ba15986cf42adb9bb38542a79b11ddd980c9841a071844d26fed56fd SHA512 d068d581df952c2d304534218bd8f948407e288005514501816e60600b186bf03bcc60f485c4c6d5c80caf718210c2bf619f1758327bc592663f160c3bd21e65
 EBUILD alembic-1.10.4.ebuild 821 BLAKE2B 1e242919afebea6135741c1a7d7beebc24345972ad244d68b604071b9e93f6e76721aa6f0973fad9865b30ed8dbf2e1d7dcf392b15f8edf91b47d7c9dd521c9d SHA512 f0e382643b109ef55dbe161d972552f355a4b2474aed88a85258fcfce067ddff956a149ab9cc94dfccceaa66d4b6c47554cbc6777d26f04d579dec0f44d66fb9
 EBUILD alembic-1.11.0.ebuild 824 BLAKE2B fdf273e45eb9fd65948d7fe688404785ac1469cb8e953680110ab5520905ac94eec46d5a504c533f2dd50073899249c0720df5474d288f4751394a25d7877f09 SHA512 663eced7f21af4dd4de7c50c580174c1b314336f0f6516e6f700f5309b40563c052e75b22c2fe1af24a5a32658970974c9b0652e225df9e6b285e4d0d3c9c3a2
+EBUILD alembic-1.11.1.ebuild 824 BLAKE2B fdf273e45eb9fd65948d7fe688404785ac1469cb8e953680110ab5520905ac94eec46d5a504c533f2dd50073899249c0720df5474d288f4751394a25d7877f09 SHA512 663eced7f21af4dd4de7c50c580174c1b314336f0f6516e6f700f5309b40563c052e75b22c2fe1af24a5a32658970974c9b0652e225df9e6b285e4d0d3c9c3a2
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.11.1.ebuild b/dev-python/alembic/alembic-1.11.1.ebuild
new file mode 100644
index 000000000000..8abd48cc9bb7
--- /dev/null
+++ b/dev-python/alembic/alembic-1.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index f255eb39aeed..d91e432d0879 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,5 +1,7 @@
 DIST argparse-manpage-4.1.gh.tar.gz 52576 BLAKE2B ee1a44d5cdbdd992796ffd1603988a96322d8ed3063a9e9f025c413ce9820bcc8b3ea77ee8bc2f878cf689c873806c7fbf740d1899d1b72b6e5faa8475d5c8b8 SHA512 e0bbdf49eec13572201bc38e51b5ff9d95356b04980ac8d0afcad9af33a9eae35e9c0c16543ba3b91f4ea5d8e6ea62940acab4342f79601582c8c3adaf8e3f95
+DIST argparse-manpage-4.3.gh.tar.gz 54479 BLAKE2B de6b6a5c449eebbd4aae207cfeadc6b16baf33e4ed0b6cc886921ee2e2dcdb48ae25f160dd6679da26fc6566fa483a864bc6dd4a0af800b853452405007f58c0 SHA512 9541ddcbddbd12c2fd0d72cc229d453d5d1d25eb915123c26b9040c6a97db6a72bb4002ada5a86620e9caff7c9bc588f1ee7d0c8241b6369cfb28b0271afdbc3
 DIST argparse-manpage-4.gh.tar.gz 50506 BLAKE2B b291e4e77a076e87659bea611baf96d9a258deb8d9fe5e8d1a9278d4daa80d108d6bc7280aa351f1f7b5fa725a5a6508dd3d74bfc1dd226d24653645066173f2 SHA512 51b3cd10569b0bbd28587172cbb2818375c904c89c51a075e2f641c4d158a7a047ff939977c3ee0f164ace18ebccc0037f8c0e74e23b41fbcd990cacedcbee6a
 EBUILD argparse-manpage-4.1.ebuild 682 BLAKE2B 68f911e5b2b8d74e1d016dd62e07ef5cc3326bffab2495d92e54985b30bcb42e39bad73af5132f1452a9d275ee576e3c34264c66860ece6ce8e63c708d976fe1 SHA512 ee43140e2dd7dd7da54d31ca0a59cda24a83a9cca95ddc54ffc62ab929dc0fc07bdc59ffc1611d03e8a954662f0621bd743d8173affd1394632a96bba80e094a
+EBUILD argparse-manpage-4.3.ebuild 771 BLAKE2B 24e30c4c67b710155285fa97e8d5c700fe34ce8d285d348687c1bc0cdc621a2394409ff15ea877e62d990f841f978c010ebb63827fb562d386576cd8ab0e103c SHA512 94d93ee270a1c5092438a07dc231a8386951502d5c8d9d52a73b8344f2403b01c82f6f66ca8723320484b99a0a10a1c74703eaa2bb670f6bb0b99213a2370126
 EBUILD argparse-manpage-4.ebuild 682 BLAKE2B 68f911e5b2b8d74e1d016dd62e07ef5cc3326bffab2495d92e54985b30bcb42e39bad73af5132f1452a9d275ee576e3c34264c66860ece6ce8e63c708d976fe1 SHA512 ee43140e2dd7dd7da54d31ca0a59cda24a83a9cca95ddc54ffc62ab929dc0fc07bdc59ffc1611d03e8a954662f0621bd743d8173affd1394632a96bba80e094a
 MISC metadata.xml 519 BLAKE2B 00b4602e0a0c0b614c6f98133a0651ac75938c09fc19987fa86f725d05d6f94e91e3c7a2dfeab29f1875db096b34575d3ce628bfbcbaabc8d91f65ca83840b2c SHA512 bca860e8471e486b4fe3e3f003b02de5b93643fb916b7550372b5c46f310eb887999ee49beb6d3f3dd7c72f0b8ca7f5d2f62a25807cf54a224494f65497a9377
diff --git a/dev-python/argparse-manpage/argparse-manpage-4.3.ebuild b/dev-python/argparse-manpage/argparse-manpage-4.3.ebuild
new file mode 100644
index 000000000000..b11255bac332
--- /dev/null
+++ b/dev-python/argparse-manpage/argparse-manpage-4.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically build man-pages for your Python project"
+HOMEPAGE="
+	https://github.com/praiskup/argparse-manpage/
+	https://pypi.org/project/argparse-manpage/
+"
+SRC_URI="
+	https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index a536103fd8ff..d24fd923f806 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,7 +1,9 @@
 DIST awx-22.0.0.gh.tar.gz 16988159 BLAKE2B 88b2e8a1f035ca34c7dfd6ddb83ca9b72824153611861286c771a0493bf6c9fefa593d9e92116e9adf1968ee39c128af318fb7d5ef542e1d4603e235a7471412 SHA512 5ce0ea43d758e63ace024cee1c67e19a154104508dea2b67bdb275189e1f993b3b0c782e704d319196dcaabcf09db12ff36fcf73a35e5c4fdd5076a7e0649e10
 DIST awx-22.1.0.gh.tar.gz 16995197 BLAKE2B 4a455219a7be93c5e85fafb2108162ef6745d835a18ad6ff842fda3e82c51e789d6a512a51275a8c169a7a480e242b2043400c641e7c950a84138cab41560758 SHA512 8a1bea58d24f6240d713d95a0389e434c242efda2e8eea10b3c9baa49174e93861558e4d80983aadc3d762f5b7f8c71f7440c057e1f00d4ac33619a68ab4a51a
 DIST awx-22.2.0.gh.tar.gz 16997478 BLAKE2B 62fda5250b62c517f5374ab9d6ec6e1e5c57ba8e904626404e54b01b34dfddc006651801424092415e7d4f78f3d1d130432665cafadec5e8af1f72336bdcaf6c SHA512 d8b318d5a2e2bf0fbd4c09e09655b4960fb93f95749149be6542fe426874971ffcdc866c0ea5dc2a7a71ba57d3928aa6ff7f87982a085a3c2f8f92d04645f246
+DIST awx-22.3.0.gh.tar.gz 16620136 BLAKE2B 23a84f6ca8971325d7a0d7b072f28275158906832cdeaef15906495a1c20b03999a32776cd92b5ce09f6f14c1a83db7c2978eb4697ff5cb41214ba0b5d10fefc SHA512 65e3284abd07eb25ec013be94627ac20b0613071a00697ba380e2bd754dbc18d45089de61d7caa37f604c92f0d47cd640544b9bc69de1dfb3511678e9d80334a
 EBUILD awxkit-22.0.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
 EBUILD awxkit-22.1.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
 EBUILD awxkit-22.2.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
+EBUILD awxkit-22.3.0.ebuild 1115 BLAKE2B 06875923a355fd67ca89751f59a0de48b508d8b00ebf8c06eb5962baca7c30263b2d7b4e24fec3c34462b6fdd478b34d5c333a56dc2f98c67aa47ccdc8304dbc SHA512 534cfedbaff49df3d506b8d00a7b9153a27dd93d7430dac8effb572c59655cd513692d72f435b2dc9bba1a459afdcb7c30d4c1d6ccf6daf2ae52be288b7c17e7
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-22.3.0.ebuild b/dev-python/awxkit/awxkit-22.3.0.ebuild
new file mode 100644
index 000000000000..52670ed68dde
--- /dev/null
+++ b/dev-python/awxkit/awxkit-22.3.0.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+# no sdist, as of 22.0.0
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/browser-cookie3/Manifest b/dev-python/browser-cookie3/Manifest
index 96a05bf2e7dc..72dba14f47f1 100644
--- a/dev-python/browser-cookie3/Manifest
+++ b/dev-python/browser-cookie3/Manifest
@@ -1,5 +1,7 @@
 DIST browser-cookie3-0.17.1.tar.gz 15882 BLAKE2B 76dbe885a21bc904eb53a2c9360f998d6b5d63b06b8025330d8960e07b630f13946f543a48cd9f3a24498e857e6245171fd7805bc403bae437caebd7209519bf SHA512 cf677a6cb8db32144dbced235fcd581743d997bcac77fe89a0d7c0b6400ff92d078cd04159f7819a8358128155cd105d44d4cde06cb345514e43d33dba931240
 DIST browser-cookie3-0.18.0.tar.gz 15607 BLAKE2B 51d815d2231331e48681dcb90f4499f2b701c8a1058e83d7591465e6cfbcdc9a6b9f6bcd569eca7b3468541cea12b02840fceacaba4545ea0f704dcfc054c755 SHA512 7686fc7c943a09f039e42454ccd184cd0540ece1095469149c363f907f3f50f232b6a5f1a2a14f923963d5b46320293ad42b3bdd1089e26b1a17f52960f4f7de
+DIST browser-cookie3-0.18.1.tar.gz 16073 BLAKE2B 1520e53919105e796e9210bf00abd90889f7f10ffaec1bb749005c339556a5aaba4f5d465225b7afcaa4d61f775855029a99ce76a2c90fa16274c2a0e3d42be9 SHA512 673d3268473b45f12469ba86223d0de302f8f3e6282da318e8adb138848953982e1a59740dd90b3b63746f4c29c649abed9d4e06e5e89303931ba7a395732df5
 EBUILD browser-cookie3-0.17.1.ebuild 764 BLAKE2B 3719e453a4535c6b42d518b26ebe109c03a88925af1a3c5647076776be8ab81ac75189d411e61f083b08cb0f922f6f911f732e615455ac0951e67037fda74782 SHA512 83f5a6cdc5d72cc47c8c66d63219ebd659562154f465b7459126a3df6861dc8cb02d087b7486f5edc0c97ff04fc89e919f5bd967ebcbcc3418a08804facf6c13
 EBUILD browser-cookie3-0.18.0.ebuild 784 BLAKE2B b155aaf7466e97e4347aba6a71d219a86ca6aa1243352f8be5d20cb88e51f8c75edb4b8ae8b91af60fd4dd9568e1b90c0bb1ea5ea9fa974955f91072649dd1e8 SHA512 2f4bbd3b6aab7891494584c9a2a9373b36fdc2c6584f285388256d4fa63bb29ea0ae6a36f338823b8e1e25d2b5e12e7f9034259d93231bd020e9dc9ae2e0a09f
+EBUILD browser-cookie3-0.18.1.ebuild 785 BLAKE2B 1bbc40f697cec934673dcc4eff2456f8d2ae1efeddfb29d5c92e05b09f430fb6a869bcd50757031fd20bf05397d1ece031778310ae13a863ad88659d1d77c3cc SHA512 3f100bef1c47f1a4a2254115cf5fa3cf4dbb09f59f58df1a5ff9923da400833c85f772711d82e1e96834e42f234f5bc09f32c46b425f86a186cf76473cdc8b9b
 MISC metadata.xml 516 BLAKE2B cec8305c1ded26acbcbf08fa45b6247b05d20a20ea3c9463066b9a442bd8513489d51ee61325620e75e1e0b30a27c785506382285c9533d4bfb7f23344a5c297 SHA512 52157186448dcbe5d4644c518f6b8a3ebf602e0fe4ad700cc20dcac920c02f1dd2acc86ba24a63029d9a5952f025c7d5eef79821de726b42e849cd41e1155737
diff --git a/dev-python/browser-cookie3/browser-cookie3-0.18.1.ebuild b/dev-python/browser-cookie3/browser-cookie3-0.18.1.ebuild
new file mode 100644
index 000000000000..b3e06c61660a
--- /dev/null
+++ b/dev-python/browser-cookie3/browser-cookie3-0.18.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Loads cookies from your browser into a cookiejar object"
+HOMEPAGE="
+	https://github.com/borisbabic/browser_cookie3/
+	https://pypi.org/project/browser-cookie3/
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/lz4[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	sed -i -e 's:Cryptodome:Crypto:g' __init__.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 64b0983b5b4c..540c68393e05 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
+EBUILD clang-python-16.0.4.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
 EBUILD clang-python-16.0.5.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230502.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-16.0.4.ebuild b/dev-python/clang-python/clang-python-16.0.4.ebuild
new file mode 100644
index 000000000000..83f4d804e310
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/etuples/Manifest b/dev-python/etuples/Manifest
index e1fca67919c8..de190b369a34 100644
--- a/dev-python/etuples/Manifest
+++ b/dev-python/etuples/Manifest
@@ -1,3 +1,5 @@
 DIST etuples-0.3.8.gh.tar.gz 45301 BLAKE2B 56fdae84b180b9ab5a81533d4028d8271e443146a4ed456252ca15400a2afb9987c741c5e5155b9ed48eb12bcc6038e081913c49e00b4eaf67a69c52b2a981c5 SHA512 0971baa9c3038ce1bf9974b750f9e642ecaad92c59b12bc69a2beb6cf4b042302580d96d0feae80a280634f56371f681fc1efcf48741a7cd65b35d9a77b66930
+DIST etuples-0.3.9.gh.tar.gz 45310 BLAKE2B e639fd4a1a4d9a1b34b32ab2884bfe933a079d721bb8b16b225d62f63e61e5cd1f1aa0f4113769744dd2ab80e537d73efdc3bcce3d1781089746997c11f3d820 SHA512 d66fac192fe14153b3496e6baa5ee3a0ff2813c26bbf0c3293049a0a50a26f32e14b031877f36e336035bf74853e981b6f75410e1f84b4ebcc84b55331d313e0
 EBUILD etuples-0.3.8.ebuild 660 BLAKE2B 9bdbadc7493e9b52043c7ef6107316c1d538170d9731930025035989f3a49cb3420c60bcbd4a0313f27da8fad583b6c69487832a2b44c03792a62b27d69f40aa SHA512 6c438b4349f30572c182c42a401654af479c37e9b2672df564b8d567cad98d271c06538c63d2c0fccfd8315e9aefc967243e0953d44a37955c724ffacac538cc
+EBUILD etuples-0.3.9.ebuild 697 BLAKE2B c41fe15a330f1f7460e3687512774e3175668c61fc6105bf2667a39b08e7a8d5e9e5446d6130cb2356fa58bb6b854321cf24c8ef978d440d476b050c6891b9a1 SHA512 ac256777713f826f79f96e8219804cc118c473d79b78d53335894fe17015dfcfa4aa0791f07206eb9f691f69757eccef9bfae217db0891824f17fc78dafc7246
 MISC metadata.xml 395 BLAKE2B 1f931fb8859a01cebd9dc3b94c11d2105552e7b371f8dddf1028d1cb45b7db6e2b138bb753b631399c885f463cc7d7ba76ad1d43f2d70babbc01c70913191c85 SHA512 a7dc4d5a713c5ecd58ee2fb371962fff65488966a968316e4415e19e2db08381c7d5aea0997e062667123eed86c8d6bbaddadea61872e6f07726fedee463802a
diff --git a/dev-python/etuples/etuples-0.3.9.ebuild b/dev-python/etuples/etuples-0.3.9.ebuild
new file mode 100644
index 000000000000..34cfd675c882
--- /dev/null
+++ b/dev-python/etuples/etuples-0.3.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python S-expression emulation using tuple-like objects"
+HOMEPAGE="
+	https://pypi.org/project/etuples/
+	https://github.com/pythological/etuples/
+"
+# tests not in sdist, as of 0.3.9
+SRC_URI="
+	https://github.com/pythological/etuples/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index d622a993b46a..b75a42679738 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-2.17.3.tar.gz 222865 BLAKE2B 32b7a483cf458415157057fc92631ca4b822d31505b6b037dce8b9bb210982e4c6164db0b8453e5ef40c9d79c56939efaac74024e60aa95d69f843511e6399d0 SHA512 a731260cdfd74a2a095d682aecde55807727eb24fbc4c0ea0da2fb24a6b0f9eed5653cf9ce18ce2caee2e79a7bcadb7a9342aa511db30358c670afbf01c2fd4c
 DIST google-auth-2.18.0.tar.gz 224653 BLAKE2B 56de5ac899bd6f143e1e1481d787627821c4f82cd4cd94597c6dce9753a7ea9605b9647464eb42f37571e2f6cded9cea5c966416bdd6c96b6413e1ef3e2b2efe SHA512 2443c7948cb71803197dba2d57ff92f4c17981fa47ac383e9636d2ed239a7d71f43a4d8f61c7c90c651b8d13a0cfc5633a815d72bd731e92d83f3bbaa1b95118
+DIST google-auth-2.18.1.tar.gz 224714 BLAKE2B 2fa63ed18d4dfa4940c93e5f3fb099a6892a16148e5161c3e52980cdee80b7b153a60c005bd3d1d856476f85678b88315d3f4b639f693d292abbf8133dee9397 SHA512 34e53a1c0cf42ab600281d815f259bb252987f163925e357dc2e636c945fd4b74c1f4168bf7d90a6e352fe1d7343767b68bf94fdbb1bc90a92c7067b0e2f2f8f
 EBUILD google-auth-2.17.3-r1.ebuild 1502 BLAKE2B 2584d825075581b0185e33536a49f232989211770e62ba26bd89c7cb8be4f7df68dfde860418c8ab4b8e0b93972d9e1015bebe0eb44a30ea532464f53c55c0f9 SHA512 63c7d81173b43acd8543c6dd14bb6ee55ff3b583ee42f7389a0557f053fe519bd6e065e2ac9923b54d05d15c7a56114461d1d35b8b0c81c417ba77f47875c82e
 EBUILD google-auth-2.18.0.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
+EBUILD google-auth-2.18.1.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.18.1.ebuild b/dev-python/google-auth/google-auth-2.18.1.ebuild
new file mode 100644
index 000000000000..c7a6aff8ed05
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.18.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 5bb5a3db0bde..033ded0e7770 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,5 +1,7 @@
 DIST httpcore-0.16.3.gh.tar.gz 79132 BLAKE2B c06d55ce1390085db6c15d3e96160cfb037a935d1298304856defd1778783ad1954924a48653ce165dae9cde18abec157aa72865f57e97d91a564d1b823c863c SHA512 d889da0a3fee4f190ecc3981b8af34fa9b285d00f4ad92158a085c65f3ad8fa5a97a8c711bd51f8b9518b9d2c90ecd457dee1a3d7bbf853715473f4707cc421a
 DIST httpcore-0.17.0.gh.tar.gz 82103 BLAKE2B a12d2843cd19f98d86868802fbb5af37f7223e6cbdb64ec4a36bda93237543d940cc7e71647ffbee67de57b46900a9496f2d3019d9bf0ac4cb74f5d13232708d SHA512 4bec9830df75b35a470e745955058e86cb4cc59c0eacef8d67d76be91c9297009f9af2bf745bf553607a60ff5fd2eaee5b8a497bb8b48ba3daffa08e80188ef4
+DIST httpcore-0.17.1.gh.tar.gz 83752 BLAKE2B c534ce92d11a719a5049677a9d73269a991f607460d4560a3faad0917a992a0d609f91e6f98f9fed87a52e215e1a53d8287cf84268042ae17300ba7d1091e5ee SHA512 73935a22e6f91a4f9e49865066badc9b6f4ade342d294a2e419d5381ead18d2bd5f4e9cee4bfabfa66e8d0a0796d62a3def906dd0e9924b9e5c1d682ceb7edce
 EBUILD httpcore-0.16.3.ebuild 1167 BLAKE2B dd75bce8acf054670193fa690ea907bde019f17b47b9453cdc915157cce23e2e5f2216ebf9a2c1d97bfacfadc60c8fe4e3917380d48de52f2b4498d0823aa163 SHA512 e57084ca2901ae4dcba6ad4f11bcd9ad7071e7dfab3bc4398d493a8c34a45b298f02d26f916197262a1af5ed4fa5ee58531d6295cbfb0a880c67a30bb2c4bd3e
 EBUILD httpcore-0.17.0.ebuild 1167 BLAKE2B dd75bce8acf054670193fa690ea907bde019f17b47b9453cdc915157cce23e2e5f2216ebf9a2c1d97bfacfadc60c8fe4e3917380d48de52f2b4498d0823aa163 SHA512 e57084ca2901ae4dcba6ad4f11bcd9ad7071e7dfab3bc4398d493a8c34a45b298f02d26f916197262a1af5ed4fa5ee58531d6295cbfb0a880c67a30bb2c4bd3e
+EBUILD httpcore-0.17.1.ebuild 1176 BLAKE2B 68a2af27f93a4541d7198f8ffe388e967e2e5a91b2925f1b54ddbb0814a6dd04944059f20390a0adb7e76d770653f53d89d81328f1f3f2468f290f3e1b6089f1 SHA512 d218d4055e4ae42995951baa1ea2a1a6e4e993fbe8542c17ee78d033d017f8d7f69a12f826cd2dd6b8dd3bc3c9becd6cd52b1cdcd3c7eb7de05a37c31f90ccc4
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.17.1.ebuild b/dev-python/httpcore/httpcore-0.17.1.ebuild
new file mode 100644
index 000000000000..29b9667eb195
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.17.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
+SRC_URI="
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.15[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index ec2098a12cfa..31395b33382f 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1,3 +1,5 @@
 DIST keystoneauth1-5.1.2.tar.gz 269860 BLAKE2B 3c2d83c20991479b05675ce391357c26e4da2a2434f515a15aa900fe398f6fb5ae383cf6b4068a1205e49813406f632bdfe9490c435d5a8290b92c3dc0bdda8f SHA512 ff7e08114cc76d648c3879f44bb78b51e906fed2d34a9cf3e42199f1c5fc53394ad7b53f6cdfcb336436c482755d54891666369a0832ef9b846dd33dc4821791
+DIST keystoneauth1-5.2.0.tar.gz 273102 BLAKE2B ed05830fad8432c36bff41b2238f91cea69846074da9991e28d75ac2ea00744f811edf33f84a2b3e4b4476de1dee8ecf85cfc7d6dbb01ab733d48a84bed80646 SHA512 4a9818922a7f899ebfb2f80a1cde4e4e62a94c30788f7e79004a24de8f94c7d9e0ce9e15eb3a37137240bb4ae0dcc71620edc7bdc05f83323939a48a075b6031
 EBUILD keystoneauth1-5.1.2.ebuild 1865 BLAKE2B c976ca945cbb7837eb84de589225cf1e96e07e1c8d8dcc6ea636560b9caaef26724eacb81fbeb3629ba0201e3ab27d8bd021f7a51c221762ee404f7e42478868 SHA512 4810a95890cdbc7a5f3ad81fb591868a07512fc32f0493b3e49338684543f01723d5346ce01c046aaf8f689b1d73128b261f8d09409cf4324915833e920ca839
+EBUILD keystoneauth1-5.2.0.ebuild 1869 BLAKE2B 2a6526a6f5b601241d6b8c3b1bc0c8f805f5501ed0e2f40ba8f2dcb8c84ec1224afdd280d2ff35491b547d9e2f816054122a4ba243c0b53badfc03757def8eab SHA512 75041bce2a29e2929b24a69f64251b01f90a0de144e713e1467cb8538d9d8a7ca008f4ce7eefb2702d05d83c6eb101cda10fa41e3e3e9bee8d5485dc2da31dbc
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.2.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.2.0.ebuild
new file mode 100644
index 000000000000..b0f8223e4c1a
--- /dev/null
+++ b/dev-python/keystoneauth1/keystoneauth1-5.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+HOMEPAGE="
+	https://opendev.org/openstack/keystoneauth/
+	https://github.com/openstack/keystoneauth/
+	https://pypi.org/project/keystoneauth1/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	# remove the test that requires hacking
+	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index c51e9f3e6974..fb1c1af7e87d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
+EBUILD lit-16.0.4.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
 EBUILD lit-16.0.5.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230502.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-16.0.4.ebuild b/dev-python/lit/lit-16.0.4.ebuild
new file mode 100644
index 000000000000..4275151b428c
--- /dev/null
+++ b/dev-python/lit/lit-16.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 1364be30f72f..dd60c3f47026 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -6,6 +6,7 @@ DIST sentry-python-1.21.1.gh.tar.gz 349021 BLAKE2B f467ba16484d0807734deb7d2544f
 DIST sentry-python-1.22.1.gh.tar.gz 351929 BLAKE2B afcdd6293ff1e96f2a07e6d6ad5fb9bfc8715cf4d7ca30237d92cae9f48abf4cb849ad8f86f3ba3f0421198dd2fdbfe25b95c9e50c2abab36d1fed4bd71181fd SHA512 2796620223476d8996291d2f2ff88a128a86fe8ded40f44ffc575f09e8b390d9b0e77e186d153decb81f33aa050eeef5b2ce707ad381d226955ce18315a0e3ee
 DIST sentry-python-1.22.2.gh.tar.gz 352403 BLAKE2B 7dcc1583904ac7ca2349b153c13ffd2098e888fcf18a7150efa8e99e0bdc93f40c2d91a0044b85d64e21116e2503173e8a0b46dcc227f7e5cf7deaf2fe8abc64 SHA512 71d4235a0a5f6df0e18f0f0e04530ce225c218cc1018d48c7a419f3a118ea9d89df3635d62ae2a5a34632a58163ac317f41167e40b2ea172f2bd0467de3a8196
 DIST sentry-python-1.23.0.gh.tar.gz 355085 BLAKE2B a0cab2f69177325a28b6fc24aa311f3ab9bdb20b43c9cbcf809a67aaaeb51306cabc2f7ce413ec9e85de6d1283a2f0d7c3cf7c0d3f8df84c54cf8f685025e127 SHA512 6cb0fda5c73e7f3a3e33458479ab40f6f33c661b9ddf69eaf6630c22004ff8a21157a3be454e583717b7d1999bff26bbe8d8e3d719e42c42612f1c5ddf0767b5
+DIST sentry-python-1.23.1.gh.tar.gz 355099 BLAKE2B d4aea7fd4746f1ee7873382f6a8545a1e21583e12b241ecc9ccf210bab95aa07051e802199c1c225756bb4fe9b8b9ec4bb76d737f2c19216df1b30e33614f54b SHA512 3d7237c0d624c51cf7a99ea1c480fb67d0dee7ae48cefd7322d870881ecc6b25f5fa481c6cd86b75fa7f1a4acf54f9c0f576021bf75cc8e8b9be99ec05453e2f
 EBUILD sentry-sdk-1.19.1.ebuild 3785 BLAKE2B b0bce95599516c454e844283e3564e7410ae325fb9e84481bccbc15cb2e7ba340c7b566d32a0eb8cd898755aa3457d50caa38978029b1832a878fe71ce461781 SHA512 25443ddddfcc879b56e80fdf4cd82c42423218351e0ba7f7439132055c7cb2f84fa948b5941acb954f8d9b853b409f00f7547a9f435f1cca2058ffb46bc265b8
 EBUILD sentry-sdk-1.20.0.ebuild 3789 BLAKE2B 009962f6fd74173d446f55aaa0f4bb724a98d48c0653addeb9c3773dd8b181c6e785d9e40f7a04034aa39bc6e172a713387f98aa07bcbe97d35e0dbcedfa23bd SHA512 acdcf371dbdebc6919cef5a04cb8d48f5f3b3a15076f58998f8b3c08aecc791f01ed6f6443e59195aac598f03db02f1256ac2fe04cb6490e2ccfe125b0d98e43
 EBUILD sentry-sdk-1.21.0.ebuild 3844 BLAKE2B 28cacac502e9f418183fb9fc6ebd05b4936adac8beff8ef5b8d23b27034c24017ce1f053e2319d2b0376947a0726372ecc861fe552e37d61951630ee7e17dd05 SHA512 5fc3080b88a1eabfef8c2caded123abd163695b702fc14b5edca76ef3a2bbd2eaeae8991993952440cf71971aaf6e88f60b251cc6803d17c0463a50a9132a9cd
@@ -13,4 +14,5 @@ EBUILD sentry-sdk-1.21.1.ebuild 3857 BLAKE2B 0aca4439f366af80e91727e6decd8fe3e05
 EBUILD sentry-sdk-1.22.1.ebuild 3857 BLAKE2B 0aca4439f366af80e91727e6decd8fe3e0526078eb2a82ca0f402bb1359005b4bb9ad7ecdc1769c99a5cf82e6fd693aa7a008bb9052f9079c3c31807f5e2b4a0 SHA512 bcaff968684aa92df08da63f6fbea954e25586185b08d0cc602ce498e5e114becb1c5bed198676397df2bce7129a85d34a14427a5ede512514b47a97f12cdf65
 EBUILD sentry-sdk-1.22.2.ebuild 3857 BLAKE2B 0aca4439f366af80e91727e6decd8fe3e0526078eb2a82ca0f402bb1359005b4bb9ad7ecdc1769c99a5cf82e6fd693aa7a008bb9052f9079c3c31807f5e2b4a0 SHA512 bcaff968684aa92df08da63f6fbea954e25586185b08d0cc602ce498e5e114becb1c5bed198676397df2bce7129a85d34a14427a5ede512514b47a97f12cdf65
 EBUILD sentry-sdk-1.23.0.ebuild 3937 BLAKE2B b370faf396fc337e0486b51cfff1814ea1274f57004298c52c156ed3ddfffee188641033c4880f5f59f28697c6e13cd10e497b66a48a72904a1eb2d6cbee6ee4 SHA512 737349bca5887c5302f8a5048637f5d027812c884be3ad277768350eea4f99313f6cf69495b796df18a196376de99e9a18637c1c38edbd44735a57e8c4d3befd
+EBUILD sentry-sdk-1.23.1.ebuild 3937 BLAKE2B b370faf396fc337e0486b51cfff1814ea1274f57004298c52c156ed3ddfffee188641033c4880f5f59f28697c6e13cd10e497b66a48a72904a1eb2d6cbee6ee4 SHA512 737349bca5887c5302f8a5048637f5d027812c884be3ad277768350eea4f99313f6cf69495b796df18a196376de99e9a18637c1c38edbd44735a57e8c4d3befd
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.23.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.23.1.ebuild
new file mode 100644
index 000000000000..8095ec3baba2
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.23.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
+)
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	tests/integrations/socket/test_socket.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
+	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
+	tests/test_scrubber.py::test_span_data_scrubbing
+)
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 54b0079ddf68..b8f676668cdb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 9fec1ab71591..b1538ed0aefd 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
+EBUILD lldb-16.0.4.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
 EBUILD lldb-16.0.5.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0.9999.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 EBUILD lldb-17.0.0_pre20230502.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
diff --git a/dev-util/lldb/lldb-16.0.4.ebuild b/dev-util/lldb/lldb-16.0.4.ebuild
new file mode 100644
index 000000000000..e4e43bb0ef2f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-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/eclass/Manifest.gz b/eclass/Manifest.gz
index 2f153a65bbef..e6395bd15cb6 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 0bc981b77118..8b1c074ac97d 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -63,7 +63,7 @@ _LLVM_MASTER_MAJOR=17
 # @INTERNAL
 # @DESCRIPTION:
 # The newest release of LLVM for which manpages were generated.
-_LLVM_NEWEST_MANPAGE_RELEASE=16.0.3
+_LLVM_NEWEST_MANPAGE_RELEASE=16.0.4
 
 # @ECLASS_VARIABLE: _LLVM_SOURCE_TYPE
 # @INTERNAL
@@ -248,7 +248,7 @@ llvm.org_set_globals() {
 			"
 			BDEPEND+="
 				verify-sig? (
-					>=sec-keys/openpgp-keys-llvm-15
+					>=sec-keys/openpgp-keys-llvm-16.0.4
 				)
 			"
 			VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7084266b4e01..5b4809128cc8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 43d4e0d35f0b..cba2266e91c3 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -4,5 +4,5 @@ DIST libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 426626 BLAKE2B efae
 DIST tg_owt-0_pre20230105.tar.gz 13822416 BLAKE2B 05004dafaefd748d836f3508d3800bcb15d0bc9894b83340746e85763bff4b77d3dd1fb732eeaf86324b9afbec69be49b172ae7f70d959a7a65ce01b64fb6205 SHA512 70b4ada620cf19acf981abcefcbac1609fe04c51deef0332e288d59c4e7efe98625817c641b92967b4f37217f94e49aa0fc296fcfbb214c08cb63030b1427f54
 DIST tg_owt-0_pre20230428.tar.gz 13725816 BLAKE2B c854de42696e397ea7101b7536f940c5424ebeae4105b84c9d3ef39242409b450e3cf38b7319ede7eb185667b78f4d4fb72c046880495f300205dff4d553be3a SHA512 883be1ba54db10462dadf0ef0e03270535972eed37d7fec745bd660faa67eabc539bfa88122a9c64a895cba97fb1d1a67ff6ee590ad002480ad327736f07284e
 EBUILD tg_owt-0_pre20230105.ebuild 3684 BLAKE2B fea2495d1ef234f4184c4ceb0a7e854277cc2105f55efe1c503d6b230eb25543ee587c91684ef65d2942e319d0d1a8b7aca4689cac9f7d372dea9125a3e20d30 SHA512 71da9849ec86c08e95c30d26cfddbed879abf798aa246b2ca01cddaf724ce49b3cac2fa1f5e6bc73df4b024957c460ba39f070be4662f4d4336bee08f45b2ee8
-EBUILD tg_owt-0_pre20230428.ebuild 3962 BLAKE2B 360b96e2f164df0585041201f5d61d76942555e340ea364d4d42d5a1a76602567750a12a98e316b5e12f8af018c449fb509c3fe1936b8b97deafcca8279a6be2 SHA512 c8043be10ee48e15f4494ad7f2cbcf2c722adee5b563369e66e16b7f75776ed8263a1ddeef802af1b4d0bc5e1c693881b07c69a950972687f5534b598e309fab
+EBUILD tg_owt-0_pre20230428.ebuild 3989 BLAKE2B 4cc8dd4bb0d2a0eeb66771da0c847b126356b4d01bc0213e502f7d1a6e5a795eb9a60da275765c41acd46122bd4bb0d0135381d8e20fe5934a3ba47424908545 SHA512 ad7643fc36405afa3be78bab62e2a9285ea61c6a009873bb33c5b41fcffd2f7b1ffbb86cb8b24665857c2bf34bff54b7034508178d5df9e03805c08f6d78e6f7
 MISC metadata.xml 493 BLAKE2B ce75939609c6fdef8bce490ca81ba5a011c0a44746e9d813651c2dad5e29e66cc529789b90a61e484c1b13c4d51f0a6cc18988bc7992f9a68e532b6bec9906f2 SHA512 d7aa16d810350f42fb07d47a020363fa77f2a2bab07bd78b49f22afd1ddffc51bf0b55b9ac84ebd208dfc85779494144a75f33e209032c0db15567eb8ba4ebf1
diff --git a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild b/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
index 03a1cd70a5c9..aa2f3437b3fc 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
@@ -63,6 +63,7 @@ DEPEND="${RDEPEND}
 		media-libs/mesa
 		x11-libs/libdrm
 	)
+	X? ( x11-base/xorg-proto )
 "
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 16a828558082..3a98a2e2bc70 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 72cf2dc907e6..2478924ef2cf 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,8 +1,8 @@
 AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99
-AUX motion.initd-r5 1090 BLAKE2B f8977384cb4bb39a75364688fe863e926d22cb8a6c3b1ae9363144e21b81561bc225a169c3750d9aba3f3c7e81fd17545c0b773285e0c5dc5c42d4f909c1327e SHA512 feaefc140a9d3e13ebb05c00ff148753cca4880daf3780aae18314ac778235ed85f169bf138bb2b19dcd9ef53da5de799ea489fc86892a0983c6dd935b4d1462
-AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
+AUX motion.initd-r5 1392 BLAKE2B 87ac71a1e75ace73ac28c52ff0b1d6bbce364e6d43ef8604f3b90c08646fcf4a66abb4d7b16170eb63e7f7f65e5155382c9bf12ff074feffd2c6f3f16479518c SHA512 0060c062e7ce7f3b9c6ae70d0d6830a1676d9a173072bb3464b42fc2bd595d6237524a1ea916f60268533087647e81eef3b39a1b086cf8e8970837d96e48146c
+AUX motion.service-r4 497 BLAKE2B 8941424317635d214e74d5d558a443212129c38fed9921b101bd3689d743ed6bd68e30748075ae8c5d26aa10732fc6ce1f08707c9ed559eb89a27322e57e0995 SHA512 44e0fa13e4d93af517a06bac5191d16d528648c6b3eb9d56f80e447db7ef46b311acf6fd1d2159a24fa22200be41bdc62eeef8670ddba918bdd28f6d710f90c0
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
 DIST motion-release-4.5.1.tar.gz 856665 BLAKE2B 59ae638113c7f08ced4b18d7c4f19e3b3f1850ba0cd4c224b300be5ac65ae3b45aa391f26f506a91bb4c38a47b552c71db846d2b3217ccf0b2f5799873ab7ddb SHA512 3b8b60ad4f41c37cc215aa575b0295ee99b15f2d32cbf3393c0f7cdd8d87616cca1c00e11cb7bf74e4afa285caa094f08df3ba62ab21dcb28a48336e3ff5803e
-EBUILD motion-4.3.2-r2.ebuild 2243 BLAKE2B b1fde23db8979ee80015afdfcde2b71f5a6e6ef6b53ffbbf75ca6a968c7a366e4c2a426acae41419e8b5395c63af556d0f12973272a75bde9ddc8b8eca030b1c SHA512 c75db500acadfe4fcfc9bb01d68e6add38335b24fb61c0864101f1115622023e60ce684e39d0b3368a2935c00eec42c6e51a3ba63f732221abe45c46f2d783da
-EBUILD motion-4.5.1-r1.ebuild 2233 BLAKE2B eb765999b481dbec18f37c9356c5a01100332bb2a473bdd64e61294d2b317eb5732f75f0c4394240d1b3af8f91f0f78b0b33916d8578eb334ea7528d8f417c69 SHA512 da2d28c108e8cdba0a193fef8d495d79e893490fb98eb2c221f5906cf6d8911dc28adddabb637e2eb6378e3ca046e2591aeb97504a3d2008e0e1b5a9064605ab
+EBUILD motion-4.3.2-r3.ebuild 2243 BLAKE2B b1fde23db8979ee80015afdfcde2b71f5a6e6ef6b53ffbbf75ca6a968c7a366e4c2a426acae41419e8b5395c63af556d0f12973272a75bde9ddc8b8eca030b1c SHA512 c75db500acadfe4fcfc9bb01d68e6add38335b24fb61c0864101f1115622023e60ce684e39d0b3368a2935c00eec42c6e51a3ba63f732221abe45c46f2d783da
+EBUILD motion-4.5.1-r2.ebuild 2233 BLAKE2B eb765999b481dbec18f37c9356c5a01100332bb2a473bdd64e61294d2b317eb5732f75f0c4394240d1b3af8f91f0f78b0b33916d8578eb334ea7528d8f417c69 SHA512 da2d28c108e8cdba0a193fef8d495d79e893490fb98eb2c221f5906cf6d8911dc28adddabb637e2eb6378e3ca046e2591aeb97504a3d2008e0e1b5a9064605ab
 MISC metadata.xml 766 BLAKE2B 1385dc89a2d67fc06b0c430b7cb6a606ce22af15c633edc78382e48bc14e423a2a4ff1553531e0e373151e48d2fed1ab78f9da67680fda3eea6b3d717b077d22 SHA512 8c944d3b1bb54b25597bae085b3fdc3da3ff3677eb97fee314558597917355a2fa4db4216720dc51aa171bb032eb426ae8b1d3c9bc5efed3662af75d8d49cc54
diff --git a/media-video/motion/files/motion.initd-r5 b/media-video/motion/files/motion.initd-r5
index 315bda6c2e7f..4d7b43af585b 100644
--- a/media-video/motion/files/motion.initd-r5
+++ b/media-video/motion/files/motion.initd-r5
@@ -13,6 +13,8 @@
 
 command=/usr/bin/motion
 command_user="${MOTION_USER}:${MOTION_GROUP}"
+extra_started_commands="reload"
+description_reload="Reread the config file"
 
 start_pre() {
   if [ "${MOTION_DIR}" ] ; then
@@ -35,3 +37,13 @@ depend() {
   after bootmisc
   use mysql postgresq
 }
+
+reload() {
+  ebegin "Reloading ${RC_SVCNAME}"
+  if [ "${MOTION_PIDFILE}" ] ; then
+    start-stop-daemon --signal SIGHUP --pidfile "${MOTION_PIDFILE}"
+  else
+    supervise-daemon ${RC_SVCNAME} --signal SIGHUP
+  fi
+  eend $?
+}
diff --git a/media-video/motion/files/motion.service-r4 b/media-video/motion/files/motion.service-r4
index 1564fb2699c4..66143f0e204b 100644
--- a/media-video/motion/files/motion.service-r4
+++ b/media-video/motion/files/motion.service-r4
@@ -13,6 +13,7 @@ Documentation=man:motion(1)
 Type=simple
 ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
 StandardError=null
+ExecReload=/bin/kill -HUP $MAINPID
 
 User=motion
 Group=motion
diff --git a/media-video/motion/motion-4.3.2-r2.ebuild b/media-video/motion/motion-4.3.2-r3.ebuild
index 68f6f12d35cc..68f6f12d35cc 100644
--- a/media-video/motion/motion-4.3.2-r2.ebuild
+++ b/media-video/motion/motion-4.3.2-r3.ebuild
diff --git a/media-video/motion/motion-4.5.1-r1.ebuild b/media-video/motion/motion-4.5.1-r2.ebuild
index ee5f5d8492c9..ee5f5d8492c9 100644
--- a/media-video/motion/motion-4.5.1-r1.ebuild
+++ b/media-video/motion/motion-4.5.1-r2.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4925d7150775..70b34ac7790a 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index db2b94b13460..ee8725d50a3f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 18 May 2023 02:40:09 +0000
+Thu, 18 May 2023 08:39:32 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3bd06d348f84..589741357ebf 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-18T02:40:12Z
+TIMESTAMP 2023-05-18T08:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlkAxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRl5EdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBPxA//d621NZBwO6tn5TEmfHvDhVMmef3QN9oCFIho/dKfW4yk9qRwB1NbggVo
-fpJhXAgJBhWa+RSoNvh7hYmS8ofBd4sZCs2oYhSYK37lA4Y2Wq6RohD1iRyaekGu
-Si3A3Wej/SMeb0ZiqNXWRgkPrxyqKRtOoIg4bfPkYtXLzQe/Mit+0UkQhB4is9mo
-BqBI1Dr/WaOlc8zBMWrzWC5VhoWIUGR5QlXdttgYm0thBMRnkD6RFc95MTG7pPJy
-bTCe1TAAvsNMi7UAZHf2yXV0Q3PRRdU8Vj5sUB93up9msgRxEbgpbLAyLli0HNWE
-dxel/igpxDXC+oHd/hGZ/XKm0dq/q6jFp4mNtIZptVqsG6dTW01BlYsc3XWIbm1y
-QkPInyPnHzIJLXXpD8k7dw+fh/l1vGPhgCC9Ejstr81i4rsWUkt3LNZ3d4aWDxUx
-OaHLhkCFYq/iM4PFL3DiS4ylp71k6IDQI8HVYzJhwQnmlYDwVAZg2OLDrXEnql+r
-TX5kZJL572nPr+KAfW2pLwugAJxm8WVU5SD69DA9bfOrHDPAKe5HEVo165H2Tvew
-wUvGtnzIxcukJvnR2CJLpW1RUqBczSXzkTwpNa8Uc028C04+gUtj6AB/WINQT/1D
-G2Csew6DXdT6vY9ZaoRNE05+AiG8T2KutZ7xXGSKOvPxFECoQ24=
-=FIUO
+klBurBAAg3RbYxQUEy98vlh1v2ApqzpcNwgP+x6vnxECJsld0xfYVmD/O5hsdoJ3
+tEU+CN0/eUexgeV0+2dKwzObhX/7Ws/UVdrqmfIEviWDLtlSgFNUVd19bqApnlvX
+VNNx5rP9BswUj+nNpZMbynCbDJ6+OA9UTzSNeJa/ocHCbORcYvUUERe6ck0Eqd+y
+TFS2Utj/4SU6+vGL1WihjLlSWgfBcAidbX9dLO/D4TOpqPUx/zulKDpI9fFqbbIU
+dbhfssmmJu5IsTsrYKEL98FrCyu1OxWPOZKSpy3NJqaybE6ktsOALpXM8xY4KydB
+cWuUdZNXfCjSTH12fTGQ9AWRP7oNSgEcMopbKH2T6bJ2pZvZq7//RcAqmobaLycW
+G7zLCHMilT6MXPsdjNxYkInydzXKxtQZEUpyHkmGbfifaM98b3WwxBgA8e5VTy8a
+UxxKqqNuXW2A75Zym69ndtrXm1ZF+eORPU6qcogRzGEUpp68Eq+ek0cYhImEJz+A
+ShjN0SO66ZbA4UWQui7HwEz7NnicBNMtnNQvQgarJMUl5mVKHuHlumiNvUVz27Fu
+uAfQDNnkEmzcZ7JVsaZyhLXDBmCczPNZbgx2rj0B5brjHm5eoyQnKGYKplXI8mUq
+S5IJ2n7jm29xSpUo3LnZ6BtYq1vlmSQ/M9p5Lq8Z0FVb48nEqIM=
+=hx5s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index db2b94b13460..ee8725d50a3f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 18 May 2023 02:40:09 +0000
+Thu, 18 May 2023 08:39:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ca03e51bd154..5dee9a76d8ac 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 1594add7f49a..d9a5b3b95df8 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/crun-1.4.4 b/metadata/md5-cache/app-containers/crun-1.4.4
deleted file mode 100644
index 8d0dcff4566b..000000000000
--- a/metadata/md5-cache/app-containers/crun-1.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup
-DEPEND=dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=8
-HOMEPAGE=https://github.com/containers/crun
-INHERIT=python-any-r1
-IUSE=+bpf +caps criu +seccomp selinux systemd static-libs
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) selinux? ( sec-policy/selinux-container )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/1.4.4/crun-1.4.4.tar.xz
-_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ab0f8f408081bef6715acb61fc958454
diff --git a/metadata/md5-cache/app-containers/crun-1.4.5 b/metadata/md5-cache/app-containers/crun-1.4.5
deleted file mode 100644
index bb106eafc975..000000000000
--- a/metadata/md5-cache/app-containers/crun-1.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=8
-HOMEPAGE=https://github.com/containers/crun
-INHERIT=autotools python-any-r1
-IUSE=+bpf +caps criu +seccomp selinux systemd static-libs
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) selinux? ( sec-policy/selinux-container )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/1.4.5/crun-1.4.5.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=966979ec0e50e58db7e84817642f44ca
diff --git a/metadata/md5-cache/app-containers/crun-1.8.1 b/metadata/md5-cache/app-containers/crun-1.8.1
index 323dcb662279..12926071425a 100644
--- a/metadata/md5-cache/app-containers/crun-1.8.1
+++ b/metadata/md5-cache/app-containers/crun-1.8.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/crun/releases/download/1.8.1/crun-1.8.1.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=275401db195461a05e35ca3e70d9ebfb
+_md5_=dbfbe1dd279cbba39454971233f08b3d
diff --git a/metadata/md5-cache/app-containers/crun-1.8.4 b/metadata/md5-cache/app-containers/crun-1.8.4
new file mode 100644
index 000000000000..611b37aa64c3
--- /dev/null
+++ b/metadata/md5-cache/app-containers/crun-1.8.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
+EAPI=8
+HOMEPAGE=https://github.com/containers/crun
+INHERIT=autotools python-any-r1
+IUSE=+bpf +caps criu +seccomp selinux systemd static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/libgcrypt:= dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) selinux? ( sec-policy/selinux-container )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/crun/releases/download/1.8.4/crun-1.8.4.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=cd574d1c2ad82b5041d805c434e528f0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9c343b751456..46f5b60d4aec 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/firecracker-bin-1.3.2 b/metadata/md5-cache/app-emulation/firecracker-bin-1.3.2
new file mode 100644
index 000000000000..c52f1df55b21
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/firecracker-bin-1.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install pretend setup
+DESCRIPTION=Secure and fast microVMs for serverless computing (static build)
+EAPI=8
+HOMEPAGE=https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker
+INHERIT=linux-info
+KEYWORDS=~amd64 ~arm64
+LICENSE=|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0
+RDEPEND=acct-group/kvm
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v1.3.2/firecracker-v1.3.2-x86_64.tgz ) arm64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v1.3.2/firecracker-v1.3.2-aarch64.tgz )
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ac4d8f4b3a23abb90821bd155d35f12d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 5e9b31d2a1ec..2aab4b5d0fc7 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/mdbtools-1.0.0 b/metadata/md5-cache/app-office/mdbtools-1.0.0
index ff3139e02885..e55305a8b879 100644
--- a/metadata/md5-cache/app-office/mdbtools-1.0.0
+++ b/metadata/md5-cache/app-office/mdbtools-1.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/mdbtools/mdbtools
 INHERIT=autotools
 IUSE=glib iconv odbc
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= glib? ( dev-libs/glib:2 ) iconv? ( virtual/libiconv ) odbc? ( >=dev-db/unixODBC-2.0 )
 SLOT=0/3
 SRC_URI=https://github.com/mdbtools/mdbtools/archive/v1.0.0.tar.gz -> mdbtools-1.0.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=96ca937414a1c6f87374017086ff7e31
+_md5_=f97e6c452447499b7507a343b4f5b413
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 6abac76b60bb..dc63e9fd9d7d 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
index 5ad55bda711b..788dca2961ab 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
@@ -10,6 +10,6 @@ LICENSE=EPL-1.0
 PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
-SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
+SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=631d5cd55d963525b62dcecdd68515dd
+_md5_=d6ffdbb5870cf8fb0cb864efe0474db8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6e0862a7d227..50e072ef3c42 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/c-blosc2-2.9.1 b/metadata/md5-cache/dev-libs/c-blosc2-2.9.1-r1
index 658c55593191..9532e73a615f 100644
--- a/metadata/md5-cache/dev-libs/c-blosc2-2.9.1
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.9.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.9.1.tar.gz -> c-blosc2-2.9.1.gh.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b816b33f2039e8e7a5d0a4eca3b61ed9
+_md5_=8b2460534b3746eb9cf07889d8027c56
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index 8b0baef054bd..c86b4f9e26b6 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) || ( sys-devel/clang:14 sys-devel/clang:13 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) || ( sys-devel/clang:14 sys-devel/clang: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
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index 7b18e6c8843a..4bdcf4d95fb3 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( 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-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( 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
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.3 b/metadata/md5-cache/dev-libs/libclc-16.0.3
index 65ed5d1ed6a3..8e954c7c19fe 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.3
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( 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-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( 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
@@ -10,5 +10,5 @@ KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af1bd058edd8c60f49e0841ecf0f40bc
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.4 b/metadata/md5-cache/dev-libs/libclc-16.0.4
new file mode 100644
index 000000000000..5b56d70b122c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.4
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=af1bd058edd8c60f49e0841ecf0f40bc
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.5.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.5.9999
index 9966de38c081..a1ace91ba5c7 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.5.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.5.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
index 8440e20c0f85..8f15940b4853 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230502 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230502
index 33a87f1f1907..1fd1e173d0d4 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230502
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230502
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230512 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230512
index 7abd0c406675..b2196b583b00 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230512
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230512
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 849a32aaed2e..8b7cd243057d 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 5d762d8132a2..8e6402966ff7 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.10.9-r1: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-14.0.6:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index 0d8f09260cd1..077266366f9c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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-15.0.7:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.7[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.7[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.7[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.7[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3
index d942474a0b20..599c14b61b8a 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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-16.0.3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bb054ccbb72b406130928bc4c24b2faa
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.4 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.4
new file mode 100644
index 000000000000..36215c060d69
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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-16.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.4[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.4[llvm_targets_Xtensa] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.4
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bb054ccbb72b406130928bc4c24b2faa
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.5.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.5.9999
index 3668fee4818b..24caa4ddcb60 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.5.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.5.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.5.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
index 6c4a632450e0..bf54a256f340 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7627d6d7d4810ada8a9a656eb003e9b1
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230502 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230502
index f09cb3dcac7e..30e22d8ac2f6 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230502
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7627d6d7d4810ada8a9a656eb003e9b1
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230512 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230512
index 8bab81ffb4fe..fc9143749373 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230512
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7627d6d7d4810ada8a9a656eb003e9b1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 534d43d01603..91df7885c661 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/alembic-1.11.1 b/metadata/md5-cache/dev-python/alembic-1.11.1
new file mode 100644
index 000000000000..81cdd208ec48
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alembic-1.11.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.11.1.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c2eb2a90af1e23a1f38b7d9e9586d63b
diff --git a/metadata/md5-cache/dev-python/argparse-manpage-4.3 b/metadata/md5-cache/dev-python/argparse-manpage-4.3
new file mode 100644
index 000000000000..08270c04c31a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argparse-manpage-4.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically build man-pages for your Python project
+EAPI=8
+HOMEPAGE=https://github.com/praiskup/argparse-manpage/ https://pypi.org/project/argparse-manpage/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/praiskup/argparse-manpage/archive/v4.3.tar.gz -> argparse-manpage-4.3.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ea9b07b407c6ec3031c9b76f43f06d26
diff --git a/metadata/md5-cache/dev-python/awxkit-22.3.0 b/metadata/md5-cache/dev-python/awxkit-22.3.0
new file mode 100644
index 000000000000..059f0760e9ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awxkit-22.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command line interface for Ansible AWX
+EAPI=8
+HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cryptography[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ansible/awx/archive/22.3.0.tar.gz -> awx-22.3.0.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1a688f45cd5432d4308a1eb7ae57768b
diff --git a/metadata/md5-cache/dev-python/browser-cookie3-0.18.1 b/metadata/md5-cache/dev-python/browser-cookie3-0.18.1
new file mode 100644
index 000000000000..1545409c0313
--- /dev/null
+++ b/metadata/md5-cache/dev-python/browser-cookie3-0.18.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Loads cookies from your browser into a cookiejar object
+EAPI=8
+HOMEPAGE=https://github.com/borisbabic/browser_cookie3/ https://pypi.org/project/browser-cookie3/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/browser-cookie3/browser-cookie3-0.18.1.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6a0685f988a3e91bce40295e75b49887
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index 555708435185..5f1675c79a47 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) 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-14.0.6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
 DESCRIPTION=Python bindings for sys-devel/clang
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=df1bc02b22483edeca144370d496a934
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index 69f9eda8c86e..88779bc41f99 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:15 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:15 ) 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-15.0.7:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
 DESCRIPTION=Python bindings for sys-devel/clang
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.3 b/metadata/md5-cache/dev-python/clang-python-16.0.3
index 624efc76e261..2c35fda1821e 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.3
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) 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-16.0.3:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
 DESCRIPTION=Python bindings for sys-devel/clang
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=54870a9d47888a4dcba05e8fffb23186
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.4 b/metadata/md5-cache/dev-python/clang-python-16.0.4
new file mode 100644
index 000000000000..9725095174cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) 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-16.0.4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test verify-sig python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-16.0.4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=54870a9d47888a4dcba05e8fffb23186
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.5.9999 b/metadata/md5-cache/dev-python/clang-python-16.0.5.9999
index 47e0dad6e18a..b8ac97f8cde7 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.5.9999
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-16.0.5.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
index 75fedf227da6..6b05f3a7c982 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-17.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230502 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230502
index 2962c3222084..3e92a9e761a3 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230502
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230512 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230512
index 43517f7e7b05..fc4f3d158637 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230512
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/etuples-0.3.9 b/metadata/md5-cache/dev-python/etuples-0.3.9
new file mode 100644
index 000000000000..7164bb9b3af5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/etuples-0.3.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/multipledispatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python S-expression emulation using tuple-like objects
+EAPI=8
+HOMEPAGE=https://pypi.org/project/etuples/ https://github.com/pythological/etuples/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/multipledispatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pythological/etuples/archive/v0.3.9.tar.gz -> etuples-0.3.9.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=869e89d440f1b70d76e792bf94087845
diff --git a/metadata/md5-cache/dev-python/google-auth-2.18.1 b/metadata/md5-cache/dev-python/google-auth-2.18.1
new file mode 100644
index 000000000000..168b53211227
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.18.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/grpcio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyu2f[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-2.18.1.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=566e8a27cd5ca41435cdb49e57c04064
diff --git a/metadata/md5-cache/dev-python/httpcore-0.17.1 b/metadata/md5-cache/dev-python/httpcore-0.17.1
new file mode 100644
index 000000000000..1b3cacabebd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/httpcore-0.17.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h11-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/sniffio-1*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A minimal low-level HTTP client
+EAPI=8
+HOMEPAGE=https://www.encode.io/httpcore/ https://github.com/encode/httpcore/ https://pypi.org/project/httpcore/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h11-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/sniffio-1*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/encode/httpcore/archive/0.17.1.tar.gz -> httpcore-0.17.1.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e7c547a515891cc090794b6eedf6576c
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.2.0 b/metadata/md5-cache/dev-python/keystoneauth1-5.2.0
new file mode 100644
index 000000000000..ad6675ad136f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keystoneauth1-5.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/betamax-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-kerberos-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/k/keystoneauth1/keystoneauth1-5.2.0.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e2e9a8217f44c152ea9f7f631ab5df49
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 202a4002839e..6a1fdd2ef519 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?] 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
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=67d902868be793a5cb25a3d9aae6cdef
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index d003658d7405..b996b254c03a 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=05fe9b9d4b376809fb1d6ef6ed35e15b
diff --git a/metadata/md5-cache/dev-python/lit-16.0.3 b/metadata/md5-cache/dev-python/lit-16.0.3
index 9f04e2d1af1c..bd623409ba09 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.3
+++ b/metadata/md5-cache/dev-python/lit-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=997bc0ae1ca46b80dad712ff6f6827ba
diff --git a/metadata/md5-cache/dev-python/lit-16.0.4 b/metadata/md5-cache/dev-python/lit-16.0.4
new file mode 100644
index 000000000000..ff6d2bec1cdb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-16.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=997bc0ae1ca46b80dad712ff6f6827ba
diff --git a/metadata/md5-cache/dev-python/lit-16.0.5.9999 b/metadata/md5-cache/dev-python/lit-16.0.5.9999
index 2245527b8ea1..5ca173f77610 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.5.9999
+++ b/metadata/md5-cache/dev-python/lit-16.0.5.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0.9999 b/metadata/md5-cache/dev-python/lit-17.0.0.9999
index 2245527b8ea1..5ca173f77610 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-17.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230502 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230502
index 8e7a9fb7c888..200fd1e901b8 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230502
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230502
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230512 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230512
index b27dce79c288..87068df04970 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230512
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230512
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.23.1 b/metadata/md5-cache/dev-python/sentry-sdk-1.23.1
new file mode 100644
index 000000000000..5fb51a53f8b3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.23.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/1.23.1.tar.gz -> sentry-python-1.23.1.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=afe58a42050377e5660b82522cdc1375
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e54da8dc143f..9d99d4fada5b 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 5d0a313e1560..4acb0a53b8fe 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-14.0.6[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-14.0.6[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) 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-14.0.6 ~sys-devel/llvm-14.0.6 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM debugger
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index a3eb81acfdc0..34d676bdb447 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-15.0.7[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-15.0.7[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-15.0.7[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-15.0.7[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) 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-15.0.7 ~sys-devel/llvm-15.0.7 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM debugger
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.3 b/metadata/md5-cache/dev-util/lldb-16.0.3
index 38155376e846..3e8d0c3bcd3d 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.3
+++ b/metadata/md5-cache/dev-util/lldb-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-16.0.3[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.3[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-16.0.3[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.3[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) 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-16.0.3 ~sys-devel/llvm-16.0.3 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM debugger
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90254b661bcbc72db1b72b17f80eefd8
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.4 b/metadata/md5-cache/dev-util/lldb-16.0.4
new file mode 100644
index 000000000000..1bd112f0aa13
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-16.0.4[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.4[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) 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-16.0.4 ~sys-devel/llvm-16.0.4 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.4 ~sys-devel/llvm-16.0.4 python? ( python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=90254b661bcbc72db1b72b17f80eefd8
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.5.9999 b/metadata/md5-cache/dev-util/lldb-16.0.5.9999
index 0cabce5df7df..f4661812a821 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.5.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index 7ab15465e0f3..073ce92dd221 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1224da88d806807f4e40a79ee4ef006c
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230502 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230502
index 35eb5341ef10..7423bd6f4aac 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230502
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1224da88d806807f4e40a79ee4ef006c
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230512 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230512
index 4ebaa07afc49..a374aef90f9d 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230512
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1224da88d806807f4e40a79ee4ef006c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7182b59f7266..bff16cdada8e 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20230428 b/metadata/md5-cache/media-libs/tg_owt-0_pre20230428
index 8284ef633a75..c9a5c032af74 100644
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20230428
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20230428
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-cpp/abseil-cpp-20220623.1:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst ) screencast? ( media-libs/libglvnd media-libs/mesa x11-libs/libdrm )
+DEPEND=>=dev-cpp/abseil-cpp-20220623.1:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst ) screencast? ( media-libs/libglvnd media-libs/mesa x11-libs/libdrm ) X? ( x11-base/xorg-proto )
 DESCRIPTION=WebRTC build for Telegram
 EAPI=8
 HOMEPAGE=https://github.com/desktop-app/tg_owt
 INHERIT=cmake flag-o-matic
 IUSE=screencast +X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=BSD
 RDEPEND=>=dev-cpp/abseil-cpp-20220623.1:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
 SLOT=0/20230428
 SRC_URI=https://github.com/desktop-app/tg_owt/archive/9d120195334db4f232c925529aa7601656dc59d7.tar.gz -> tg_owt-0_pre20230428.tar.gz https://gitlab.com/chromiumsrc/libyuv/-/archive/00950840d1c9bcbb3eb6ebc5aac5793e71166c8b/libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 https://github.com/cisco/libsrtp/archive/a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz -> libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=db6b8fa251baa134b7488efe1a205f27
+_md5_=ab1d2f90d3fae3277ffe222ea59ad0d3
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 432df7354bc8..487c1b32e055 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/motion-4.3.2-r2 b/metadata/md5-cache/media-video/motion-4.3.2-r3
index 37f98becbb0a..37f98becbb0a 100644
--- a/metadata/md5-cache/media-video/motion-4.3.2-r2
+++ b/metadata/md5-cache/media-video/motion-4.3.2-r3
diff --git a/metadata/md5-cache/media-video/motion-4.5.1-r1 b/metadata/md5-cache/media-video/motion-4.5.1-r2
index 47c786bb22d2..47c786bb22d2 100644
--- a/metadata/md5-cache/media-video/motion-4.5.1-r1
+++ b/metadata/md5-cache/media-video/motion-4.5.1-r2
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 6f8a33dba342..356923bbdbfb 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1a b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1a
new file mode 100644
index 000000000000..a89363235416
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1a
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Arno's iptables firewall script
+EAPI=8
+HOMEPAGE=https://rocky.eld.leidenuniv.nl https://github.com/arno-iptables-firewall/aif
+INHERIT=readme.gentoo-r1 systemd
+IUSE=+plugins rsyslog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-firewall/ipset net-firewall/iptables sys-apps/coreutils sys-apps/iproute2 plugins? ( net-dns/bind-tools )
+SLOT=0
+SRC_URI=https://github.com/arno-iptables-firewall/aif/archive/2.1.1a.tar.gz -> arno-iptables-firewall-2.1.1a.tar.gz
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0feb95dda67759a227a63e24bc5ddd56
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d120e36306c5..5a317e8ba22b 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2 b/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2
index f712e32bb5c4..8e9060462c41 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2
+++ b/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://desktop.telegram.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake python-any-r1 optfeature flag-o-matic
 IUSE=+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
 RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/protobuf dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( >=dev-cpp/glibmm-2.76:2.68 ) !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms )
 REQUIRED_USE=qt6-imageformats? ( qt6 )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.1/tdesktop-4.8.1-full.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fe4996721ff39012be15662737cb23f3
+_md5_=ea9eb5cf52b5c68ecd5147d4f1ed1e87
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b9cbb993f7ee..ecdc96d915c8 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3-r1 b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3-r1
new file mode 100644
index 000000000000..40bbca3fdbf5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3-r1
@@ -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=Signal Protocol C Library
+EAPI=8
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/libsignal-protocol-c
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.3.tar.gz -> libsignal-protocol-c-2.3.3.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ed72e5e503df049a1c529d2b23dd5da9
diff --git a/metadata/md5-cache/net-libs/libsignal-protocol-c-9999 b/metadata/md5-cache/net-libs/libsignal-protocol-c-9999
deleted file mode 100644
index 4a5b13c5bd37..000000000000
--- a/metadata/md5-cache/net-libs/libsignal-protocol-c-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Signal Protocol C Library
-EAPI=7
-HOMEPAGE=https://www.whispersystems.org/
-INHERIT=git-r3 cmake
-LICENSE=GPL-3
-PROPERTIES=live
-SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6f2f7a3e2ce2c8c5d11005f3766c66c8
diff --git a/metadata/md5-cache/net-libs/pjproject-2.12.1-r2 b/metadata/md5-cache/net-libs/pjproject-2.12.1-r2
deleted file mode 100644
index ff146129017e..000000000000
--- a/metadata/md5-cache/net-libs/pjproject-2.12.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( <dev-libs/openssl-3.0.0:0= )
-DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
-EAPI=8
-HOMEPAGE=https://www.pjsip.org/
-INHERIT=autotools flag-o-matic toolchain-funcs
-IUSE=amr debug epoll examples opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( <dev-libs/openssl-3.0.0:0= )
-SLOT=0/2.12.1
-SRC_URI=https://github.com/pjsip/pjproject/archive/2.12.1.tar.gz -> pjproject-2.12.1.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a6be0e1247729186c30a2d102ab4db4
diff --git a/metadata/md5-cache/net-libs/pjproject-2.13 b/metadata/md5-cache/net-libs/pjproject-2.13
deleted file mode 100644
index a6f08ba4e50d..000000000000
--- a/metadata/md5-cache/net-libs/pjproject-2.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
-EAPI=8
-HOMEPAGE=https://github.com/pjsip/pjproject https://www.pjsip.org/
-INHERIT=autotools flag-o-matic toolchain-funcs
-IUSE=amr debug epoll examples opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
-SLOT=0/2.13
-SRC_URI=https://github.com/pjsip/pjproject/archive/2.13.tar.gz -> pjproject-2.13.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d3281dd0d49d7926fd82c67acd24b4f1
diff --git a/metadata/md5-cache/net-libs/pjproject-2.13-r1 b/metadata/md5-cache/net-libs/pjproject-2.13-r2
index edc0e24dd5a2..fb9f2a6eed5d 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.13-r1
+++ b/metadata/md5-cache/net-libs/pjproject-2.13-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+DEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl2 ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=8
 HOMEPAGE=https://github.com/pjsip/pjproject https://www.pjsip.org/
@@ -8,8 +8,8 @@ INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=amr debug epoll examples opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl2 ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
 SLOT=0/2.13
 SRC_URI=https://github.com/pjsip/pjproject/archive/2.13.tar.gz -> pjproject-2.13.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=215c88115c6e501fbd5c84bca76abf40
+_md5_=c9e4a1041d0c2dce19dd80b54a075f75
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 9149c433946a..3e1a533ccbf7 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.20.2 b/metadata/md5-cache/net-vpn/openfortivpn-1.20.2
new file mode 100644
index 000000000000..101588e2e9b5
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.20.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare setup
+DEPEND=dev-libs/openssl:0= <net-dialup/ppp-2.5.0
+DESCRIPTION=Fortinet compatible VPN client
+EAPI=8
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+INHERIT=autotools linux-info
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=dev-libs/openssl:0= <net-dialup/ppp-2.5.0
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.20.2.tar.gz -> openfortivpn-1.20.2.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1fd72f8ffc8e50b7d8ad52e2f7747279
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index b015f2837458..ade997fee0a2 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/sirilic-1.15.0 b/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
index 9b42ce04415e..a5d6c7242100 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/wxpython-4.2:4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_15_0/sirilic-V1_15_0.tar.bz2
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27195fd5be17ee2aa5ba0c111dfccbac
+_md5_=0c6d48527a7341be532b8398e3b74619
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 458a3579da37..f984b028547b 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-llvm-16.0.4 b/metadata/md5-cache/sec-keys/openpgp-keys-llvm-16.0.4
new file mode 100644
index 000000000000..6d08c034b2e1
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-llvm-16.0.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used to sign LLVM releases
+EAPI=8
+HOMEPAGE=https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.4/
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://pgp.mit.edu/pks/lookup?op=get&search=0xA2C794A986419D8A -> openpgp-keys-llvm-16.0.4-tstellar.asc https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xd574bd5d1d0e98895e3bf90044f2485e45d59042 -> openpgp-keys-llvm-16.0.4-tobiashieta.asc
+_md5_=8250aeabce92504c8902dc7c4d24dd5f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 927b49f68db2..8e9c1f7d65d6 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-1.1.1.1 b/metadata/md5-cache/sys-apps/s6-linux-init-1.1.1.1
new file mode 100644
index 000000000000..01a74a56eb84
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-1.1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-lang/execline:= >=dev-libs/skalibs-2.13.0.0:= sys-apps/s6:=[execline] sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+DESCRIPTION=Generates an init binary for s6-based init systems
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
+INHERIT=toolchain-funcs
+IUSE=+sysv-utils
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/execline:= >=dev-libs/skalibs-2.13.0.0:= sys-apps/s6:=[execline] sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+SLOT=0/1.1
+SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-1.1.1.1.tar.gz
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=65fbfe389801e461221b182f607e60de
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 0b400e8d9368..332bf069dd78 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index 00af65136876..b9e58a78dfe8 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-14.0.6:14=[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-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 ) || ( llvm_targets_AArch64 ll
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=86c93692eb7f156cf22a7a103b6e1bea
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r4 b/metadata/md5-cache/sys-devel/clang-14.0.6-r4
index d0600abf1085..3e2e3edcd9e6 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r4
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r4
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-14.0.6:14=[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-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 ) || ( llvm_targets_AArch64 ll
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r4.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a559bc134d198d28e03607e461498195
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 9c30df2f29dd..52ddbfff6fb1 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-15.0.7:15=[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-15.0.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.7[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.7[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.7[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.7[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b69921e3360c0c617082db23bde2927a
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r3 b/metadata/md5-cache/sys-devel/clang-15.0.7-r3
index 67d269066650..18633efc4422 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r3
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-15.0.7:15=[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-15.0.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.7[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.7[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.7[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.7[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r3.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=094b32f0941932fd000b51e96a537263
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.3 b/metadata/md5-cache/sys-devel/clang-16.0.3
index 93ace8aa5a6e..ba2725abb2ec 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.3
+++ b/metadata/md5-cache/sys-devel/clang-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-16.0.3:16=[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-16.0.3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.3-manpages.tar.bz2 )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ce313cda79e8a52cb3fa776cdd29bd63
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.4 b/metadata/md5-cache/sys-devel/clang-16.0.4
new file mode 100644
index 000000000000..93df391e90fb
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-16.0.4
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.4:16=[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-16.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.4[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
+IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=~sys-devel/clang-runtime-16.0.4 sys-devel/clang-toolchain-symlinks:16
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.4:16=[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-16.0.4 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.4[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.4[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.4[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.4[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.4[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.4[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.4[llvm_targets_Xtensa] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.4-manpages.tar.bz2 )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4bce1155b8a2dfca0902d05614407fcc
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.5.9999 b/metadata/md5-cache/sys-devel/clang-16.0.5.9999
index 5725e399f5cf..762292304815 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.5.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.5.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) py
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25f57e6693b0bca6372d9286bc45eeaa
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index 56f1d68bf8ed..f2f4f3ef5832 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) py
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=75679fa9e90a93b81a8bcc5e1e09ba70
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230502 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230502
index 4a33d421ff80..c5a73dbc4e81 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230502
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c74707a3d677b57eb1a9baeb8d859a65
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230512 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230512
index 25025df64cab..0fffd9c3db8b 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230512
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c74707a3d677b57eb1a9baeb8d859a65
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index 05e1fc0e0b36..56838b8afa4e 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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 clang
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
index 3e974942be1a..c24f66017322 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=9d88a62b4082774b870bb8a60799139d
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.3 b/metadata/md5-cache/sys-devel/clang-common-16.0.3
index aadc78a939d1..90b4a3cdaf49 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.3
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=fbe67c5003dabfb1f92b8b52cb06dfa1
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.3-r1 b/metadata/md5-cache/sys-devel/clang-common-16.0.3-r1
index a07ae3797215..929a3be623e4 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.3-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=80cd74a54e67e2f0ed89fa3de9b93a43
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.4 b/metadata/md5-cache/sys-devel/clang-common-16.0.4
new file mode 100644
index 000000000000..a119e10919dd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.4
@@ -0,0 +1,15 @@
+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
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.4 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=fbe67c5003dabfb1f92b8b52cb06dfa1
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.5.9999 b/metadata/md5-cache/sys-devel/clang-common-16.0.5.9999
index 66711511546e..25bba62419c9 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.5.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.5.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.5.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=855301ffd5b0993e89501581c6845bc4
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
index b01354275755..d32023f7edb5 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=855301ffd5b0993e89501581c6845bc4
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230502 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230502
index fcdd4cb3bd56..1c764e730142 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230502
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230502 ) !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/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=855301ffd5b0993e89501581c6845bc4
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230512 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230512
index 49bb21db34b9..27c8e0c438b7 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230512
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230512 ) !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/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=855301ffd5b0993e89501581c6845bc4
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.4 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.4
new file mode 100644
index 000000000000..d9b313db2cbd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=pretend
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build toolchain-funcs
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.4:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.4:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=16
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=26ee675f9dafad522d218d7d39c9454f
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index 230567d9979b..b017bd06deda 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-14.0.6[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-14.0.6[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-14.0.6 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index bb674c142bbf..72cedb21e137 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/llvm:15 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15.0.7[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15.0.7[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/llvm:15 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15.0.7[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15.0.7[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-15.0.7 sys-libs/zlib:= !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.3 b/metadata/md5-cache/sys-devel/lld-16.0.3
index a1c73d4b9097..4c86ee32961a 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.3
+++ b/metadata/md5-cache/sys-devel/lld-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.3[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.3[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-16.0.3[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-16.0.3[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=67393891fb7b536eee357f74739193b9
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.4 b/metadata/md5-cache/sys-devel/lld-16.0.4
new file mode 100644
index 000000000000..3acea0b67300
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.4[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.4[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.4[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 test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
+RDEPEND=~sys-devel/llvm-16.0.4[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=67393891fb7b536eee357f74739193b9
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.5.9999 b/metadata/md5-cache/sys-devel/lld-16.0.5.9999
index eb3b87bda47e..0bda9846f3a9 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.5.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.5.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-16.0.5.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index 0019e6a7468a..66c6007b8cda 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-17.0.0.9999[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fc43231aa4865b2b18d03408e73ab5b5
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230502 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230502
index 63ead04be036..73dee9f6ea26 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230502
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230502[debug=,zstd=] sys-libs/zlib:= zstd? (
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fc43231aa4865b2b18d03408e73ab5b5
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230512 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230512
index 11d8bb99ca20..4e004a119a44 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230512
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230512[debug=,zstd=] sys-libs/zlib:= zstd? (
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fc43231aa4865b2b18d03408e73ab5b5
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index c2f8d5763c7f..6a1615ee9f79 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c85b453ff2e87bedb11e6b27dbbb787f
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r4 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
index 84c0825a32a2..6a302eec7cb4 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r4.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2f2f629c5afd38cf5e9ba9f8cfaf2975
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index ce2b20f7bbad..a9778ee8d70c 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.7.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.7.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a76072a74390bba744b933db44e6111c
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7-r3 b/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
index 4330a5335f7e..29ce56f48da0 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.7.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.7.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r3.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=df406201f15783add6c9105e5fc85506
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.3 b/metadata/md5-cache/sys-devel/llvm-16.0.3
index 2166a09232ac..ca79dcef4f0b 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.3.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.3.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.3-manpages.tar.bz2 )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e9c515f238c8e01a8d0fa263d2823287
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.4 b/metadata/md5-cache/sys-devel/llvm-16.0.4
new file mode 100644
index 000000000000..7f0e95afdce0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.4.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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 doc exegesis libedit +libffi ncurses test xar xml z3 zstd 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
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
+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(-)?] 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 ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.4-manpages.tar.bz2 )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7e0790b82174dbf1619204378ccf608f
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.5.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.5.9999
index bf382b1aec60..7e1f0843e999 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.5.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.5.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=58ec0f59cb067466b1f793b47cd98b45
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index 3dab13b1b401..a99c599f58d0 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b4001bd3135b88384fe085a04a7ed171
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230502 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230502
index 2dd78f15c7de..696890095432 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230502
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=be25c9c4d7503fa1ffd9219cd498e2d1
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230512 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230512
index be5d52ee6b40..ec595c9085f5 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230512
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=be25c9c4d7503fa1ffd9219cd498e2d1
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index c7e469e71bd8..012831f00f42 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index 4bab39354d61..9de6d1501283 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.3 b/metadata/md5-cache/sys-devel/llvm-common-16.0.3
index 087e14640cb6..e8bfdf027b1b 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=4b406f98226318955c090ac02aec5138
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.4 b/metadata/md5-cache/sys-devel/llvm-common-16.0.4
new file mode 100644
index 000000000000..215d9686009f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.4
@@ -0,0 +1,14 @@
+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
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=4b406f98226318955c090ac02aec5138
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.5.9999 b/metadata/md5-cache/sys-devel/llvm-common-16.0.5.9999
index 2dbb321a48b7..8a2243d860f8 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.5.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.5.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
index 2dbb321a48b7..8a2243d860f8 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230502 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230502
index 50d2c2dcb7b9..9e43044f4271 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230502
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230512 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230512
index d89e470fd1c6..6e2f41e350dc 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230512
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	e8674561452c689a1723efaaf953b551	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2a3ef10da33b..d02dae05a2b7 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 444bff56ab63..eeab8aef718b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ) =sys-devel/clang-14.0.6*:14 ) !test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ) =sys-devel/clang-14.0.6*:14 ) !test? ( || ( >=dev-lang/python-3.10.9-r1: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:14 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f541873204a80a70f69b34092750b75d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index c0f6c8b087e4..e8c7938199b6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-15.0.7*:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-15.0.7*:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:15 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00933d3bb15ec9382379ccab1da56544
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.3 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.3
index a6802378ea07..b11ed6805ae8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.3*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.3*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e11a0826fd0a98907657995ace17948
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.4
new file mode 100644
index 000000000000..a2d77e57bb4f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.4*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8e11a0826fd0a98907657995ace17948
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.5.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.5.9999
index 97548b841de1..d02e442b7896 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.5.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=937f480d6f34d4d8afd91781d18537cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
index 4bee5582c932..87f6b74e2eb1 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dd6652395e90dcab96538fc793aa5321
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230502
index 7a082fe46083..ea47af99ea32 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230502
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dd6652395e90dcab96538fc793aa5321
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230512
index d403803644e1..007d4ae3859b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230512
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dd6652395e90dcab96538fc793aa5321
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index 19e7d1b32e16..65cfdf7c5fbc 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ) =sys-devel/clang-14.0.6*:14 sys-libs/compiler-rt:14.0.6 ) !test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ) =sys-devel/clang-14.0.6*:14 sys-libs/compiler-rt:14.0.6 ) !test? ( || ( >=dev-lang/python-3.10.9-r1: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:14 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1c1c912e6047d4dbf13b18213c38e789
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index ff5244180741..78d407475e2d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-15.0.7*:15 sys-libs/compiler-rt:15.0.7 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-15.0.7*:15 sys-libs/compiler-rt:15.0.7 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:15 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=073adf97b984c7834ca31d3d6fe4093c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3
index 914c03cd6b63..9dee1a65c9c0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.3*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.3*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5e86c8a095c456e604a05f5ebefd11e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.4
new file mode 100644
index 000000000000..995fb4162137
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-16.0.4*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1: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:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5e86c8a095c456e604a05f5ebefd11e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.5.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.5.9999
index 32e7ef932c33..ecec49ac67ba 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
index 30372b521f0c..1d1ae569eb04 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a14b95644166d44930fd33ad8094527
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230502
index 89655b9fa9cb..4901d443d82e 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230502
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a14b95644166d44930fd33ad8094527
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230512
index 62ba6b7196f0..533aedb513fe 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230512
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a14b95644166d44930fd33ad8094527
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 0d50a484e761..42a1fb02cadc 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.10.9-r1: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 postinst prepare setup test unpack
 DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.6[libunwind=,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-6 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=40053cea23101c5d660398cf97045038
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 2247e3af88b0..4b8a10d6c290 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-15.0.7[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:15 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bf73ff84b34d3321dab6eea4bfd4f08
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index 0dfc5904b7d5..8575afe16a1c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-15.0.7[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:15 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c415047838316b6921b40e0d66ed4aa0
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.3 b/metadata/md5-cache/sys-libs/libcxx-16.0.3
index 4547b264a653..62136f26423c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.3
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-16.0.3[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:16 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fd7c42169ca32c9cedf32100d0a56aec
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.4 b/metadata/md5-cache/sys-libs/libcxx-16.0.4
new file mode 100644
index 000000000000..9f0b72a96ac0
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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-16.0.4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=8
+HOMEPAGE=https://libcxx.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fd7c42169ca32c9cedf32100d0a56aec
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.5.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.5.9999
index e38ca44b8e4e..656abc731e76 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.5.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
index 42d9ab76b8e6..b51aa7054abf 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230502
index 8036ef0ad534..157dca8061fa 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230512
index e5e0a4c331b0..87c0de5b492d 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 06d21ab542ca..8792bbfa0003 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -1,4 +1,4 @@
-BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.9-r1: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=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-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(-)?] >=sys-libs/llvm-libunwind-3.9.0-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(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=Low level support for a standard C++ library
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00c7e2cea0ff0c7d843b9d8560e1e855
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 5d188c8e75ae..005714da846e 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:15 !!sys-devel/llvm:0
 DESCRIPTION=Low level support for a standard C++ library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7caa8da5e3680e5172ba7e29f5004e58
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.3 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.3
index e5f711e9a84e..e703175ef75b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
 DESCRIPTION=Low level support for a standard C++ library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8eca3feceb803430599b9e66d61b5a6c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.4 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.4
new file mode 100644
index 000000000000..3a6d9ff5120a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!<sys-libs/libcxx-15
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8eca3feceb803430599b9e66d61b5a6c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.5.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.5.9999
index 4f569b75de13..1ec4a1298004 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
index e203cf4dca2d..eade1211cc07 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230502
index 0fed6f92dbba..18d0eaae256e 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230512
index 04ce2e0fa2c2..30c152b08bda 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index d009632232ea..abd3d6df268b 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) 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=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? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/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-14.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
index c20d35f6b94d..ce3b266cf20d 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) 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=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? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/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-15.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -12,5 +12,5 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=919fc31c2f3e10e592ad25fa7fc1b724
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.3 b/metadata/md5-cache/sys-libs/libomp-16.0.3
index bc02a5e4177f..c4c8aa99cc74 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.3
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.3
@@ -1,4 +1,4 @@
-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.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) 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.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) 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-16.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=851d5b8a0334588b10b7546fa4e838c9
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.4 b/metadata/md5-cache/sys-libs/libomp-16.0.4
new file mode 100644
index 000000000000..900d76bf4ee5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.4
@@ -0,0 +1,17 @@
+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.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) 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.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) 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-16.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
+IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) 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-16.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
+REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=851d5b8a0334588b10b7546fa4e838c9
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.5.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.5.9999
index 5904626d663f..de2e0c387b19 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a834663f3fa2fb5dcb371c76b2f4195
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index 5dc7bba2e978..1c0fd8088eac 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d0fae097b3badc1813b6a0d2cbdcea70
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230502
index d6ac0c427172..659753e3c37f 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230502
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d0fae097b3badc1813b6a0d2cbdcea70
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230512
index 9b130ab0774b..c2abc986b812 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_ta
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230512
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d0fae097b3badc1813b6a0d2cbdcea70
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index 20a8a9860668..1b50722ee40c 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.9-r1: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-6 !!sys-devel/llvm:0
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index f9e8a930e1f7..d1a84f94529b 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:15 !!sys-devel/llvm:0
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3
index c5e83d77df15..378ddcd84180 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.3/llvm-project-16.0.3.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f7ba76b42c0124510879b1ca8649d2dd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.4 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.4
new file mode 100644
index 000000000000..3aafdf9f2ed5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.4
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1: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:16 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/llvm-project-16.0.4.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f7ba76b42c0124510879b1ca8649d2dd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.5.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.5.9999
index f125dde994b3..283b90624983 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.5.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.5.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
index 9eb3a47e0659..a751a888872b 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=311379a6a3f0136f51886f5c00e9f222
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230502 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230502
index f86e62dd87e9..80e9728e7362 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230502
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230502
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/52882de0e641487329c9e093a90ea3dad01842c8.tar.gz -> llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=311379a6a3f0136f51886f5c00e9f222
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230512 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230512
index cd1dbe95e96c..d704dc99336d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230512
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230512
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz -> llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	c8b6f48c8cc34af6c663429edf706fb6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	e8674561452c689a1723efaaf953b551	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=311379a6a3f0136f51886f5c00e9f222
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index ac841055fb41..db8ce8182657 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20230404 b/metadata/md5-cache/www-apps/dokuwiki-20230404a
index 22d9d99cf254..7d51bbb821e0 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20230404
+++ b/metadata/md5-cache/www-apps/dokuwiki-20230404a
@@ -8,7 +8,7 @@ IUSE=gd vhosts
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-7.4[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) app-admin/webapp-config
-SLOT=20230404
-SRC_URI=https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2023-04-04.tgz
+SLOT=20230404a
+SRC_URI=https://download.dokuwiki.org/src/dokuwiki/dokuwiki-2023-04-04a.tgz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=b273be010bce3d522a94c35fcaf0c692
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 58f1cef2ac28..e73640344d7d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-18T02:40:12Z
+TIMESTAMP 2023-05-18T08:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRlkAxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRl5EdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0ehAAqWsrxOWZmCkJjT6z/T+/Zg0FG1/bo4r1Zi1MToZFsrXffSHgLx1bIbsP
-RsHZKuwhhQUa3WxDNzdZD+og6AinNw8oX25L5MU8iU8C43oQfbi92Eraljg2Gken
-kzs0fTkYxjbkB3yjCy6WvUBLvyH4Zes+GQVCDmql9+1x24Cng/kXR/37gKQGEFI1
-kXgE5vaGEdXgBcfGgckMGmAVXq3KDUdTDanz//bh7A91LEeKcqgsUZAX7xLlLqi3
-vE5xcYvRVhIKi2Cx/bY2rLsNmuYPEx0rnvRO9Fz1m/JbhwgxESGxujvPyip78EV+
-5YvyUsOu7+iO26WJkEHowYJnhdx3I9WM4/OWizEwdnqKfDAgizO74+iVQ4/AfT7P
-KRZR9WYDK1bM2dd+iEGhZBsxqWl5NdWEF5gaL7DyTAz0bSOK3tD9hiA6+T2ZLurK
-HHanJQrDKdI0MQungRJ+F29bQbPeFWBx5uEkqsFaDVq9KIiTGivOJflHw3pAwCty
-jEzipYuGxhWQOxq3x1QAxR5aIgKU0ddKqneCuNacnZkLM7C78cFjqvFVCW4FuqrC
-0LZT0sLwDrqk9QjFOF4efIHslfLB3nsyj/oC5bgwpDE8p2fP6MUNfAaNVJbf1+jL
-q/AikZYRcduN8Z+VI/o/7e+8a3ET9YBhBhAOIfD/MP5hVekjgdA=
-=DNaO
+klCWqxAAkwpdnUgX+mTU5DYZU+DOioncRzFZ9yzoVSnJqaryNFOmuCxQCJdL4s2X
+FpZlWDublcCUmHeSS1Df1sGFwZhnhBkLlDKxBK4b65BnrkIb3m+Y/MuSxI7qex99
+uQZvyImxgg9jbuLAbq8g/vuUYJ22TbOj54i6Y2PMdhwUetuhFZsl/ktPvJBdMqbD
+O9bOytjuvF8dwQyYwHbY/ZwzRlaD/g5Rwc+gcavOdEpPMXTsN7CnHqwom1GaXjIi
+9OLmrC1yJqlHUnA6UywUBgi5iSA8UBJN0sZ/RirEqLtiNOZ2Ywbdfdgc9Jsos4tE
+0+rEkmcRTVy5Y7nJGBmksRvVKBG3MruxIlOspvXOfLoy0L1fw7aZAoH3lvlvdLOm
+TNH0C9wErE9X9HneYPBSjwD2KCjqwO4vDbVwYeg8CQxzUZetvqLyQbbO0PknAgv7
+EyvFgCtqlCus1mbfAFqVkBIhILaNCM/mX0JY9U/wPpVscHqQwvQQsYR/yIMqa3Og
+29tyQUkELtNFhl7MSGmJeTU+joiQuIamjVHRLW2aD01yKrjv1HnCmJH86xCq1SfE
+TrdFjJV+eUFO0vMmOOLDzAIntQZizN6BQVHuYNLWPE+GMXwKDDo3lwKzJ4PVtu8a
+qQtkDLhM5EqJnGXu/LSOS2k17edcQRlUEJigOfC2A84Vs2j1JN0=
+=D5tG
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index db2b94b13460..ee8725d50a3f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 18 May 2023 02:40:09 +0000
+Thu, 18 May 2023 08:39:32 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a4fd41366a47..6d84c4221959 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu May 18 02:40:09 AM UTC 2023
+Thu May 18 08:39:32 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 69410f607203..5f44e60ab0a3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 18 May 2023 02:45:01 +0000
+Thu, 18 May 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index de1e74734996..f338481ad957 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c005cd4a65fe113ec8dda052270f3a1137b0e73b 1684375815 2023-05-18T02:10:15+00:00
+83203f70b05e5af1ab51414bf61a4fad17a7e82e 1684396260 2023-05-18T07:51:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8fc3d1e3b661..d1f94e75a672 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684377601 Thu 18 May 2023 02:40:01 AM UTC
+1684399201 Thu 18 May 2023 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index db2b94b13460..ee8725d50a3f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 18 May 2023 02:40:09 +0000
+Thu, 18 May 2023 08:39:32 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index e272537be650..3ee51f4cb0f1 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 45b4ba2f699a..d884cf439f5e 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,4 +1,6 @@
 AUX arno-iptables-firewall 404 BLAKE2B 20ae4750d99c8edd3edf4f0e96354aa6a3f0df151bbbfe46f27fa3b1e0c8aaa5bdd7e3292b2e1fc1b5c735ae2b3d512117a5457b42593848829cc2808e7b6ec7 SHA512 3491c556150ac4c39447f17cb48caa2542c42c632d960f604ccdd475cbec239b8fec8523606c146427e644a929b2c5522f3c21a47712fd67880ac3815d3ab983
 DIST arno-iptables-firewall-2.1.1.tar.gz 141076 BLAKE2B d3f78767a3ac447841aa01becfd73434cfddc9f56142d5c6ac86072527c17a30449434b8cddba74bb45f8234268ba589ab2ea932db462317a2dfb714f31f2450 SHA512 55494c8a214c0b2dacfef23170ea596bf9ecdfc73d1a6b2bd703183278569f68103eb63580d1b18cae97a9460b95373f0091bbf5decf275c80803a1331555d79
+DIST arno-iptables-firewall-2.1.1a.tar.gz 141116 BLAKE2B db6a4b5bfc94d69bbc8f6eb6b15485ae030e62ff26b00aa88e0426fdc711dadfc641a3a3fe55ce1c35ab61900f2d2235fca3d7359879d7255e44c3b19f8bf13f SHA512 1af2bd82434a530d44d2a511ce7416d2c5387ae1fe215e0db47cb72d6517a64c7d4366bfed33e0446d48ed403d55b09306d34aa8528d666f088d9557632b5756
 EBUILD arno-iptables-firewall-2.1.1.ebuild 2665 BLAKE2B 41e15cc68ba3ba5b70a883e0f75060f578ebe3a47b28493efe8e71b99d621b4095d47ca63ed3041e4da02c2ed8e29fe140556edca41550f09d26bef90b8b3524 SHA512 14655be7f1370924e8441e5a5858ddc162009b64890da86036c722a212a0bafd7b4becb6a1ba38cd139c631cc78ce51f757a26e0bf2e643b7d6cf63e5a131437
-MISC metadata.xml 546 BLAKE2B 1c3d4d2d69e47dab6b4aafaf185973ad3b80b89995e3f11690f4ed0200364e78037e0930504a2c386437bbab0617557a78c60ac540418cb5ed9e17f419c74495 SHA512 092c096838fd0001b44073374adb5a96c4c4543e025df5b29a8ecf1709cb4ecd9ebab35dca27a8d6dab00a2e1d15bc6428ca32b72eb749c749eef1b941175775
+EBUILD arno-iptables-firewall-2.1.1a.ebuild 2691 BLAKE2B 972db186e17fd66ba9998a40bd6f6a8b4c4248d1d6b05aafe259f7505c868d9d97aef30b0b37df1ad703ad39f068019d135b1d22631548e26a529771935b1ef7 SHA512 a6a624db4d58c1aa578cddb746e8dc7a8ed2840dfe24abf5444c54f03116bd9c1826bdea099f1f01a4c0364e5a10709fce518be1e0563eea255e73081a60b286
+MISC metadata.xml 558 BLAKE2B 41f2473944ab7e098b2c87fadb72a8f71b6411fc1a1a957b0f97b6802d58d5fbdd5c3b533746803a05617bd8871bb68687d7a3e59ca61fcfc134aedb12f7727f SHA512 3a054d186337787b9c601f7e100983ca9519d7b097dc79b065b9422f1ccb522392028e898739d33cf84d9a30fa8af131040e955a9e3c59278ab2cce7fd849f62
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1a.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1a.ebuild
new file mode 100644
index 000000000000..cf8812e2cb2b
--- /dev/null
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1a.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Arno's iptables firewall script"
+HOMEPAGE="https://rocky.eld.leidenuniv.nl https://github.com/arno-iptables-firewall/aif"
+
+SRC_URI="https://github.com/${PN}/aif/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins rsyslog"
+
+RDEPEND="
+	net-firewall/ipset
+	net-firewall/iptables
+	sys-apps/coreutils
+	sys-apps/iproute2
+	plugins? ( net-dns/bind-tools )
+"
+
+S="${WORKDIR}/aif-${PV}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
+before using this package. To start the script, run:
+
+/etc/init.d/${PN} start (for OpenRC)
+systemctl start ${PN} (for systemd)
+
+If you want to start this script at boot, run:
+
+rc-update add ${PN} default (for OpenRC)
+systemctl enable ${PN} (for systemd)"
+
+src_prepare() {
+	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
+		bin/"${PN}" share/"${PN}"/environment || die "Sed failed!"
+	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
+		lib/systemd/system/"${PN}.service" || die "Sed failed!"
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/"${PN}"
+	doins etc/"${PN}"/firewall.conf
+	doins etc/"${PN}"/custom-rules
+
+	doinitd "${FILESDIR}/${PN}"
+	systemd_dounit lib/systemd/system/"${PN}.service"
+
+	dobin bin/arno-fwfilter
+	dosbin bin/"${PN}"
+
+	insinto /usr/libexec/"${PN}"
+	doins share/"${PN}"/environment
+
+	exeinto /usr/libexec/"${PN}"
+	doexe share/"${PN}"/aif-job-execute
+	doexe share/"${PN}"/aif-job-processor
+
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/"${PN}"
+
+	dodoc CHANGELOG README
+	readme.gentoo_create_doc
+
+	if use plugins
+	then
+		insinto /etc/"${PN}"/plugins
+		doins etc/"${PN}"/plugins/*
+
+		insinto /usr/libexec/"${PN}"/plugins
+		doins share/"${PN}"/plugins/*.plugin
+		doins share/"${PN}"/plugins/adaptive-ban-helper
+		doins share/"${PN}"/plugins/dyndns-host-open-helper
+		doins share/"${PN}"/plugins/parasitic-net-helper
+		doins share/"${PN}"/plugins/traffic-accounting-helper
+
+		exeinto /usr/libexec/"${PN}"/plugins
+		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
+		doexe share/"${PN}"/plugins/traffic-accounting-show
+
+		docinto plugins
+		dodoc share/"${PN}"/plugins/*.CHANGELOG
+	fi
+
+	if use rsyslog
+	then
+		insinto /etc/rsyslog.d
+		newins etc/rsyslog.d/"${PN}".conf 20-"${PN}".conf
+	fi
+
+	doman share/man/man1/arno-fwfilter.1 \
+		share/man/man8/"${PN}".8
+}
+
+pkg_postinst() {
+	ewarn "When you stop this script, all firewall rules are flushed!"
+	ewarn "Make sure to not use multiple firewall scripts simultaneously"
+	ewarn "unless you know what you are doing!"
+	readme.gentoo_print_elog
+}
diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 31e73d0b2363..6f83b9325a36 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>erkiferenc@gmail.com</email>
-	<name>Ferenc Erki</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<use>
-	<flag name="plugins">Install optional plugins</flag>
-	<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
-</use>
+	<maintainer type="person" proxied="yes">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="plugins">Install optional plugins</flag>
+		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 778626e6bb17..1e93e0b4714e 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 73cb9377e4ae..ff5b51968c92 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -5,5 +5,5 @@ DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7c
 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
 EBUILD telegram-desktop-4.6.5-r2.ebuild 6477 BLAKE2B 811b7eb3e8d91ecfa505af28caf7d5350259f746e10ec90ae2f4aabadb223c51b01898a8265e99a95a9d02828c60b649b85523b12057e3d2935b6ca5719a4d2f SHA512 512bfe912a43c6a614039067e6cadb4a94d851fa9895d5c25cb162c81ee5e6b5752f2915bd62189edbd34f1ec8cd44cbfabc216d6b670eb712dc21c2f6e96fa5
 EBUILD telegram-desktop-4.6.5.ebuild 6473 BLAKE2B 1d7eb299b8d73fced8f786fc125b9de39855e04d016871a0cecf4f7c299d10c028e4a6f3a0de0fe7b104264c4eb06cede3f850b88a144e95d9ac183a46241a99 SHA512 86e54a6a8909d5123f3fef8d1e209d9e824fe7cbb345520a0f80c670fec6ea7be8d3456e23c69386af0e34fc563438cb446d1e96dff26f4402982340304caad8
-EBUILD telegram-desktop-4.8.1-r2.ebuild 6503 BLAKE2B 330b95538269a3371fe3d063ad83f5d735209df7ffad5aefb5272a13e21444626d7bf9e835bb135dc0223cd69294ff940dd87e5729708749559498892eedf1e3 SHA512 07cfd0a5155b05a9efcbccfa65572c0e439abede6de8bde346f2c3457e00f2d73024efca712a63f96573fbf304c5b81c7c61628c7b1de3d71136435fa1618c54
+EBUILD telegram-desktop-4.8.1-r2.ebuild 6502 BLAKE2B 97677472923a77720a1be13ca921ed1e33bd57cf594988e6408e201555665d4ed1689bb4e074feacd1d48dc9e97e580d45651cd585dac86690efd756711b2167 SHA512 dbaed713e5a546538257c7f305d9a44e51b7045b01cdcf9fc53611ed05d82a3551c641a545ab2cdfdacfc2876b9f6055d9b0672d59e4c383295b37fbe047a073
 MISC metadata.xml 1055 BLAKE2B a8f873793835f741c0a5efef1c4ef7231b0d2b90b6237093625e351de26e230c6ce5a0eedfb36706bb266ae472370034bbb60a6ef90d05e0f7b4f847c9f0116a SHA512 72d90db2dd9e96ff0f6e6ea2d078242ae6cc6c8ec0afed4df8c84acf100706bbd7cb3bff4d5603a11718250c43ae8d22b18687f4c16676173ca84527f53a5c1d
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
index dee0c3c1cc2f..22674e426296 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
 REQUIRED_USE="
 	qt6-imageformats? ( qt6 )
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a445b7349712..60780f4c2750 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 5f94a23f658c..28cf908b1f63 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,4 +1,5 @@
+AUX libsignal-protocol-c-2.3.3-CVE-2022-48468.patch 1931 BLAKE2B 1e76d3bc4d4abad0440f3043475949de0d6bac7978f090e4b500c945ad93cfd400d363a7d81732dceb2853ad18da3d10d57e81e6daf2f0155a8fd9790cd21e9d SHA512 9e62354dc98ac8292df8485a1e6861867372d1625d49400fbb6503f1f34e3824f48c1e80d0bc9ec7878c4b341dabcdbc35acd740d21b59d67e13a0be403cbe32
 DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
+EBUILD libsignal-protocol-c-2.3.3-r1.ebuild 448 BLAKE2B 5d7f5bbae4c2d36fae47f57b9ff3f2af04ae7a93fcbf2368b9d34f3769b73df1b5565a02c387d07fe0b6e88451dc73d2d597d661f30e49f194faff07e79a97e6 SHA512 80b935e6a3a58a32dd727e5e45c003821d39e68a3a0469a48a905021f0e0df6c275e5e701b9019ac5020e53537958c75556a340c204e7a61f35c8ea04fe3aa35
 EBUILD libsignal-protocol-c-2.3.3.ebuild 346 BLAKE2B cfa3bb04e96f7fb558250e8c97da2dfcc5d066370aefd966e734303531e9527a8772365cfd593f904547f5d16ca98268f537fb14f45032fcf677f5fb4817dd3b SHA512 e1153a01732b51c103d8efc23ca49c2bc2292ed64d7d9fe04e8c65819a211a6f35f42e7b4ea971a503a5cc85c6803d45c2a828e266052ff6bbdc2df6d186c57a
-EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 659 BLAKE2B f4a2ca5360a22ee74952638cfe61ef8b2d3351c5838ba130b5344d2362f946b2bdda5b58b2ed887fa8c5d2425c3d431e9d954752e7c3c36e7f0ae4d66a5bf706 SHA512 681673e2b407848e5abefaeb39159e0fa950720d6dc47992a6d11cfd8bb4d121995d4b247789afebf953d327a632bbaceccdd862232dac7f256e0f787ee6da5e
diff --git a/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch b/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch
new file mode 100644
index 000000000000..8b3706dd8829
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/files/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch
@@ -0,0 +1,53 @@
+From 478dfe51552243b367cf2e9c5d047cbbd3c21635 Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Fri, 18 Mar 2022 12:42:57 -0400
+Subject: [PATCH] CVE-2022-48468: unsigned integer overflow
+
+This commit combines two upstream commits from protobuf-c[0][1].
+The first fixes an unsigned integer overflow, and the second fixes a
+regression introduced by the first. I originally decided to amend the
+commit message of the first to mention that it fixes a CVE, but then I
+realized it would be better to bring the fix for the regression together
+with it.
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-48468
+https://bugzilla.redhat.com/show_bug.cgi?id=2186673
+
+[0]
+https://github.com/protobuf-c/protobuf-c/pull/513/commits/289f5c18b195aa43d46a619d1188709abbfa9c82
+[1]
+https://github.com/protobuf-c/protobuf-c/pull/513/commits/0d1fd124a4e0a07b524989f6e64410ff648fba61
+
+Co-authored-by: 10054172 <hui.zhang@thalesgroup.com>
+Co-authored-by: "Todd C. Miller" <Todd.Miller@sudo.ws>
+Signed-off-by: 10054172 <hui.zhang@thalesgroup.com>
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ src/protobuf-c/protobuf-c.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/protobuf-c/protobuf-c.c b/src/protobuf-c/protobuf-c.c
+index 4f2f5bc..6ae5287 100644
+--- a/src/protobuf-c/protobuf-c.c
++++ b/src/protobuf-c/protobuf-c.c
+@@ -2456,10 +2456,13 @@ parse_required_member(ScannedMember *scanned_member,
+ 			return FALSE;
+ 
+ 		def_mess = scanned_member->field->default_value;
+-		subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
+-						 allocator,
+-						 len - pref_len,
+-						 data + pref_len);
++		if (len >= pref_len)
++			subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
++							 allocator,
++							 len - pref_len,
++							 data + pref_len);
++		else
++			subm = NULL;
+ 
+ 		if (maybe_clear &&
+ 		    *pmessage != NULL &&
+-- 
+2.39.2
+
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..894d6fc41d30
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Signal Protocol C Library"
+HOMEPAGE="https://signal.org/ https://github.com/signalapp/libsignal-protocol-c"
+SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-CVE-2022-48468.patch
+)
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
deleted file mode 100644
index 07a69138ceed..000000000000
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 cmake
-
-DESCRIPTION="Signal Protocol C Library"
-HOMEPAGE="https://www.whispersystems.org/"
-
-EGIT_REPO_URI="https://github.com/signalapp/libsignal-protocol-c"
-
-LICENSE="GPL-3"
-SLOT="0"
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 69b9a858527b..41aeccf00e5a 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -7,9 +7,6 @@ AUX pjproject-2.12.1-r2-musl.patch 2941 BLAKE2B 58eab3d88a503e36fd1dee26593805e0
 AUX pjproject-2.13-r1-CVE-2022-23537-buffer-overread-on-STUN-error-decode.patch 2895 BLAKE2B 59aa55426eb7ffe90fdbecd5005bed3bfc8f72b4abadb2a48e5bc0c03205005fe73e76d6a4c4640a22c72c1f6f7e201bee29ee426788aa0dd3942d85ebaca1d1 SHA512 2556e9b69ed71324686ca32d7bf7312386ea433af984b929084c44d060989c4631de815f27ef64a7e4082b6a62686bdaf70cbac56df3f81165b2200177d2b95c
 AUX pjproject-2.13-r1-CVE-2022-23547-buffer-overread-on-STUN-decode.patch 1665 BLAKE2B 6351b770947a5487e8f1c59ab8ae09a9e8e7eb9c3ab25975e58e04349505b26af5a8917e4044f4d48c5d04001a3f276182328505e1976f829a6dab51e0fd0160 SHA512 a3bdf959f199db105eca701d0b8d9f1e6bce495436277670bad0b6cd60f4718b41e35bcad86f338b9b919de7121d5610af0d5a5f33fa48767b761fc2e4b515da
 AUX pjproject-2.13-r1-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new.patch 1662 BLAKE2B 48f4b7113ecd0b539b1a8449a3493dbd8459af70566867b5a1c70b794b2ca0136a496f45d24d97602787082cc8bf61c25138fcfe448115bf5215b329888df686 SHA512 de77f0d4f4a6dc2e57ab46727944191fc050fd423b659c26c9d4f4dd7f23ba7cc1d9a55fe63317caaf66b5ea58ac410997bae57a6d3ac28ab7cb6dde47ce9b15
-DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa SHA512 9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
 DIST pjproject-2.13.tar.gz 9744716 BLAKE2B 947fe076089b3cd0826a554db3cda9939e228b9e7bb5ed2d01242e44e5e5b0d9d2ddc52b378f141efb89fcbfbd628fcdff341e54bc3615280e23f30ea58daf56 SHA512 df184511d554e5f77ca1a551bdf6b22c4c8ae2b6ad61be0e7e459e2d7db50f496af66c37e080f178019a509ea25847e70a342ac48c820a6b9302b4cbf174c520
-EBUILD pjproject-2.12.1-r2.ebuild 4025 BLAKE2B cddb1dcd63188583805cf1148e4609afed9d0ccc678de9916a06581cb39df7003fe9a5566db18d9d7d3203ca93181803c10ee4ab86a96b2a17c70fa99c972493 SHA512 c41fddabe06fd84000f617520f50aec5550219d0c4d2616854d5fa9a68786f6078f9e893485ee9b6c225451ea00a117ffbea4818ff031579fb0b318b369671cb
-EBUILD pjproject-2.13-r1.ebuild 4029 BLAKE2B 9bca1bd2e8da9eda2f17391cc8d697cf8f6ddebb4a9de9c233f08d425e02d096480e784fd7effdf4ba0d5aacfb41274cb7166ed7b9846bd8966636caeef87f63 SHA512 49588cbef5dd70adb44593d1344d83c47a41cdc25dbc39c15522e2c48f1a2a00febe1d0422259344199e016eb685a4d49af6b5b02af531602297a6561ea439d2
-EBUILD pjproject-2.13.ebuild 3757 BLAKE2B 9d2e158bb348083c80ccd38375cd05369b784ffd5262c1105cf89bba1899cf71a5c984dff5148b54076a0736afea7e86dfb8630df5179b2a9287906c950d3789 SHA512 24fc4ef06f687b5462ea31a7bacef524457640ef04dce2a82b16929de0ebbaebd054bd356035f9e500c423d130cdfe92cf0e480f9f9d0c3d901fd1c114c6670b
+EBUILD pjproject-2.13-r2.ebuild 4030 BLAKE2B 6eff6a7456727ffd6427b477f48291770aff6395fa69ba849e5106173c5de8768a11de75194b839053d803a659abbe40f089c79dd043c7f3b66d57f109876b70 SHA512 8c1c3f0014bf99173d2161a82dade22fdc29abfa0595f2f3948a59f7958f379af82feba4c6bd9fc4ee48b691b056d2e616b69c9a9f3f6ee718dfc457f8f08892
 MISC metadata.xml 1459 BLAKE2B e35f9c8621ea7c1c2670d90f69c341b53b20501ece6fcb41fefdec9f328a6c2b88f2f9d2fd2a77938b802fc74c36f2e3387cad3be7c9126767f28d32b42d19ed SHA512 498a94fb2bf3692b60c644e9d3e341761b20e8a4e0215e1c14c4444a199f9abb085f3421e143e7b944bac54a4f774c0b47af76c6fae5fc2cda4da13d1781a9b0
diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
deleted file mode 100644
index 5d6d6c7a9b1f..000000000000
--- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# TODO: Figure out a way to disable SRTP from pjproject entirely.
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://www.pjsip.org/"
-SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-
-# g729 not included due to special bcg729 handling.
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
-SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc
-	${CODEC_FLAGS} g729
-	${VIDEO_FLAGS}
-	${SOUND_FLAGS}"
-
-RDEPEND=">=net-libs/libsrtp-2.3.0:=
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ffmpeg? ( media-video/ffmpeg:= )
-	g729? ( media-libs/bcg729 )
-	gsm? ( media-sound/gsm )
-	ilbc? ( media-libs/libilbc )
-	openh264? ( media-libs/openh264 )
-	opus? ( media-libs/opus )
-	portaudio? ( media-libs/portaudio )
-	resample? ( media-libs/libsamplerate )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	ssl? (
-		<dev-libs/openssl-3.0.0:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/pjproject-2.12.1-CVE-2022-31031.patch"
-	"${FILESDIR}/pjproject-2.12.1-r2-CVE-2022-39244.patch" # 875863
-	"${FILESDIR}/pjproject-2.12.1-r2-CVE-2022-39269.patch" # 875863
-	"${FILESDIR}/pjproject-2.12.1-r2-bashism.patch" # 865719
-	"${FILESDIR}/pjproject-2.12.1-r2-musl.patch" # 867343
-)
-
-src_prepare() {
-	default
-	rm configure || die "Unable to remove unwanted wrapper"
-	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
-	eautoreconf
-
-	cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
-}
-
-_pj_enable() {
-	usex "$1" '' "--disable-${2:-$1}"
-}
-
-_pj_get_define() {
-	local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")"
-	[[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h"
-	echo "$r"
-}
-
-_pj_set_define() {
-	local c=$(_pj_get_define "$1")
-	[[ "$c" = "$2" ]] && return 0
-	sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" || die "sed failed updating $1 to $2."
-	[[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2."
-}
-
-_pj_use_set_define() {
-	_pj_set_define "$2" $(usex "$1" 1 0)
-}
-
-src_configure() {
-	local myconf=()
-	local videnable="--disable-video"
-	local t
-
-	use debug || append-cflags -DNDEBUG=1
-
-	for t in ${CODEC_FLAGS}; do
-		myconf+=( $(_pj_enable ${t} ${t}-codec) )
-	done
-	myconf+=( $(_pj_enable g729 bcg729) )
-
-	for t in ${VIDEO_FLAGS}; do
-		myconf+=( $(_pj_enable ${t}) )
-		use "${t}" && videnable="--enable-video"
-	done
-
-	[ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0
-
-	LD="$(tc-getCC)" econf \
-		--enable-shared \
-		--with-external-srtp \
-		${videnable} \
-		$(_pj_enable alsa sound) \
-		$(_pj_enable amr opencore-amr) \
-		$(_pj_enable epoll) \
-		$(_pj_enable opus) \
-		$(_pj_enable portaudio ext-sound) \
-		$(_pj_enable resample libsamplerate) \
-		$(_pj_enable resample resample-dll) \
-		$(_pj_enable resample) \
-		$(_pj_enable silk) \
-		$(_pj_enable speex speex-aec) \
-		$(_pj_enable ssl) \
-		$(_pj_enable webrtc libwebrtc) \
-		$(use_with gsm external-gsm) \
-		$(use_with portaudio external-pa) \
-		$(use_with speex external-speex) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake dep LD="$(tc-getCC)"
-	emake LD="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
-	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r pjsip-apps/src/samples
-	fi
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
-}
diff --git a/net-libs/pjproject/pjproject-2.13-r1.ebuild b/net-libs/pjproject/pjproject-2.13-r2.ebuild
index a1e87c86eca9..a252ce354257 100644
--- a/net-libs/pjproject/pjproject-2.13-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.13-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=net-libs/libsrtp-2.3.0:=
 	opus? ( media-libs/opus )
 	portaudio? ( media-libs/portaudio )
 	resample? ( media-libs/libsamplerate )
-	sdl? ( media-libs/libsdl )
+	sdl? ( media-libs/libsdl2 )
 	speex? (
 		media-libs/speex
 		media-libs/speexdsp
diff --git a/net-libs/pjproject/pjproject-2.13.ebuild b/net-libs/pjproject/pjproject-2.13.ebuild
deleted file mode 100644
index 67e6269fd001..000000000000
--- a/net-libs/pjproject/pjproject-2.13.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# TODO: Figure out a way to disable SRTP from pjproject entirely.
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
-HOMEPAGE="https://github.com/pjsip/pjproject https://www.pjsip.org/"
-SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-
-# g729 not included due to special bcg729 handling.
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
-SOUND_FLAGS="alsa portaudio"
-IUSE="amr debug epoll examples opus resample silk ssl static-libs webrtc
-	${CODEC_FLAGS} g729
-	${VIDEO_FLAGS}
-	${SOUND_FLAGS}"
-
-RDEPEND=">=net-libs/libsrtp-2.3.0:=
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ffmpeg? ( media-video/ffmpeg:= )
-	g729? ( media-libs/bcg729 )
-	gsm? ( media-sound/gsm )
-	ilbc? ( media-libs/libilbc )
-	openh264? ( media-libs/openh264 )
-	opus? ( media-libs/opus )
-	portaudio? ( media-libs/portaudio )
-	resample? ( media-libs/libsamplerate )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-	rm configure || die "Unable to remove unwanted wrapper"
-	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
-	eautoreconf
-
-	cp "${FILESDIR}/pjproject-2.12.1-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
-}
-
-_pj_enable() {
-	usex "$1" '' "--disable-${2:-$1}"
-}
-
-_pj_get_define() {
-	local r="$(sed -nre "s/^#define[[:space:]]+$1[[:space:]]+//p" "${S}/pjlib/include/pj/config_site.h")"
-	[[ -z "${r}" ]] && die "Unable to fine #define $1 in config_site.h"
-	echo "$r"
-}
-
-_pj_set_define() {
-	local c=$(_pj_get_define "$1")
-	[[ "$c" = "$2" ]] && return 0
-	sed -re "s/^#define[[:space:]]+$1[[:space:]].*/#define $1 $2/" -i "${S}/pjlib/include/pj/config_site.h" || die "sed failed updating $1 to $2."
-	[[ "$(_pj_get_define "$1")" != "$2" ]] && die "sed failed to perform update for $1 to $2."
-}
-
-_pj_use_set_define() {
-	_pj_set_define "$2" $(usex "$1" 1 0)
-}
-
-src_configure() {
-	local myconf=()
-	local videnable="--disable-video"
-	local t
-
-	use debug || append-cflags -DNDEBUG=1
-
-	for t in ${CODEC_FLAGS}; do
-		myconf+=( $(_pj_enable ${t} ${t}-codec) )
-	done
-	myconf+=( $(_pj_enable g729 bcg729) )
-
-	for t in ${VIDEO_FLAGS}; do
-		myconf+=( $(_pj_enable ${t}) )
-		use "${t}" && videnable="--enable-video"
-	done
-
-	[ "${videnable}" = "--enable-video" ] && _pj_set_define PJMEDIA_HAS_VIDEO 1 || _pj_set_define PJMEDIA_HAS_VIDEO 0
-
-	LD="$(tc-getCC)" econf \
-		--enable-shared \
-		--with-external-srtp \
-		${videnable} \
-		$(_pj_enable alsa sound) \
-		$(_pj_enable amr opencore-amr) \
-		$(_pj_enable epoll) \
-		$(_pj_enable opus) \
-		$(_pj_enable portaudio ext-sound) \
-		$(_pj_enable resample libsamplerate) \
-		$(_pj_enable resample resample-dll) \
-		$(_pj_enable resample) \
-		$(_pj_enable silk) \
-		$(_pj_enable speex speex-aec) \
-		$(_pj_enable ssl) \
-		$(_pj_enable webrtc libwebrtc) \
-		$(use_with gsm external-gsm) \
-		$(use_with portaudio external-pa) \
-		$(use_with speex external-speex) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake dep LD="$(tc-getCC)"
-	emake LD="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
-	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r pjsip-apps/src/samples
-	fi
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 52c8400ae495..1073950163b6 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 5a285bb2f13c..74586a91bb87 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,4 +1,6 @@
 AUX systemd_substitute_bin_and_sysconfig_dirs.patch 490 BLAKE2B 071747a713f2b155959768d827b9b256842a6f587d23992a06be9ab7a701a6b4bc6b86b56fe0853f04ff81dc43f739d07f8cf60ba37c0bc9da2712a23d8a7f5a SHA512 511e8179a7f36a5e5bd2b4a07e62812aac8065b34b767992b823b5f4135addaf662f8a6061215898281dc128b8386b166f614307680416aaeba183db3ef5e2cb
 DIST openfortivpn-1.19.0.tar.gz 168962 BLAKE2B f2cff6f89a0662aca5911f6c3ef5953181383d4a66a41df83916c551338f07364436a174de39874cb654d6538955ac5d0a57a875facf2cc9b8c8a27a48df7fbf SHA512 4f4179178cbf2fc03ddebdfd4197c03a7108ecfa5216d5f11d80b2e3b840816f0a9a59714f58ecdcf966b76eb9b459e0bf78901940120ed1aa1cf69021385a53
+DIST openfortivpn-1.20.2.tar.gz 167680 BLAKE2B fec9ef5f38af6cf32283cb281d0871115c3ddface35bbbe5fb96cd132cf2f586bd21ddaf55424bc902ea3984472109ec40ee4fd16706d10cc1795b4d68216b1d SHA512 e3ad8e74f7ba05f61df464af8a6ff6ba41e0c73ad52fbb9eaa9485814788a4636800b91cdd88f88caecbc9e305b2759a628b02fbe2eaf12d33c7912bb3ce065b
 EBUILD openfortivpn-1.19.0.ebuild 770 BLAKE2B 0f33dcaffec9c6bae497dcc1dbbf5df3aa351d710fee6cfc063ee0c54e050ee65b40241eca6a59fcb73be855219f72d0969cee7044796c036a90df6993956af9 SHA512 2ec2a815ce97035a001f8d515936e596da08bafc029b09cd1490aa4d05c7f80de43ec5e6e67a19d1ae9d296eda4f8ce86677ecfeeb18d5f5ecd8f339c99fe303
+EBUILD openfortivpn-1.20.2.ebuild 778 BLAKE2B c362d5cf4cd9ab9bf65f8cae934408e3e4e062ead844729fbfa957d5c6a7b39b3a8348f7dcc16a4c3790af8c33c8be591aa3a839b2a93c73ebe7e367e8d128e8 SHA512 f7059b4e5af2b16f0572626b2c8ad60587975995f3fb7a0c70a2e0a02dab78d3a3a21608608fd987a1828bfd64f0240a3a025a43ab4816f0ef1d75790cb84354
 MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
diff --git a/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild b/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild
new file mode 100644
index 000000000000..807cee798b75
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/openssl:0=
+	<net-dialup/ppp-2.5.0
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+PATCHES=(
+	"${FILESDIR}/systemd_substitute_bin_and_sysconfig_dirs.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index cbeb7213c823..8d14bf749c4b 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/sirilic/Manifest b/sci-astronomy/sirilic/Manifest
index af61aa9ad734..36198ac05247 100644
--- a/sci-astronomy/sirilic/Manifest
+++ b/sci-astronomy/sirilic/Manifest
@@ -3,6 +3,6 @@ DIST sirilic-V1_14_3.tar.bz2 100939 BLAKE2B 3eabbde3e0884d793c2b2f87464cbf4acac5
 DIST sirilic-V1_15_0.tar.bz2 119272 BLAKE2B 0ded20e019e5f5be73f0b362b5b14712c242a99efab0a77cb60f3ad5835214b82e26a278dc23d185130f0ffbc4c243da792cda3ff10574cf9189d4162099e83f SHA512 2922b4a418310cd1bffd25ef9b61cb8be83834dfc0625b249fec2af9d08bdc73c63c2dcb9c74326ed0641ebcd8deba38e225ba5d455683ce5aa3fcd61dfec1cc
 EBUILD sirilic-1.14.3-r1.ebuild 587 BLAKE2B 428562edbe69e252b8057604ff3e05ed2fd5597ba9f9aa37420371e1860e20cc71be46405721b432ca58b35c6ae9e13efd26d0cef41ce12ac907fb42c7fa81f3 SHA512 7809e0e180ab1d930c1e25608d9988fb2a53a6a125d59f865883c448c24242d25ae70a8e9a6144ef2721cc7f81669da3a4e770e954c9127fa1e71e8f4d4961ca
 EBUILD sirilic-1.14.3.ebuild 581 BLAKE2B 7e26ea42920608d1735de44cd6a7badb8d777e5882e222fd67cfcd4504d3f6a967e864283a2f96ed31a6fc2e77c4b42d2b9fb0ea2569186ddfea0ade56d98907 SHA512 483ce59507db120c7d99de4377c4c5b25f408b352ec179e7c32d492c5da2b521165e8442f485bca42db8565aa6ec71ef312b13b415fdccdfe457232c9de92225
-EBUILD sirilic-1.15.0.ebuild 589 BLAKE2B 0f2423519f0776833031cd30200e6f087c80edb43c3f66364d762cc23e3409f70811bb7bfbc1a5ec0a677c4a3c0eb6aea7353b310f9877b50cea3db21c48d532 SHA512 1aee01db4c94c47f44c291ffd9746f004bf2b5b379abd95bb6ea1db66a1ec12d16c2507d4f3216bcb1ba1ea6990bc4784fdac278707e8f1e05ea9a2b45cdc8dd
+EBUILD sirilic-1.15.0.ebuild 587 BLAKE2B 428562edbe69e252b8057604ff3e05ed2fd5597ba9f9aa37420371e1860e20cc71be46405721b432ca58b35c6ae9e13efd26d0cef41ce12ac907fb42c7fa81f3 SHA512 7809e0e180ab1d930c1e25608d9988fb2a53a6a125d59f865883c448c24242d25ae70a8e9a6144ef2721cc7f81669da3a4e770e954c9127fa1e71e8f4d4961ca
 EBUILD sirilic-1.15.2.ebuild 574 BLAKE2B ed62f1434af9ab3f3782e090bd8ed566562bd23fc5f575ca79388cdf2c4b5d130d45989b5f225c3f3da227249155071b04796d92bd8266cc02d4f73db8c92637 SHA512 66de082c8a6b8cd8ff2e5ccef1ee368d88284b6cc040fad74ca225951a7b31b7cbfd294f7914f15423695528aa035ee80f621583fe69a3beeaa6edde2f48c6d8
 MISC metadata.xml 689 BLAKE2B 95ee65f7f16fca17c7d63dbdfe19161d6b964902502fb088a3c56b529b2f78872feccfaf1a83cf7b53ab12eb63ac257208e0603d6e09c2c6ec520a64ff7eb692 SHA512 fd1c370fb355d80372dc8e6584e9ac17f9d1f971ad7cb884d0bbb0af9dc44ccad985adfbe81b14554e76c1b7444db004563e8366cccb81a9810141467cdf45ed
diff --git a/sci-astronomy/sirilic/sirilic-1.15.0.ebuild b/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
index aa09957b96e4..bacf673c6d6a 100644
--- a/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-python/wxpython-4.2:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 6c8d5649e227..159523d51660 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-llvm/Manifest b/sec-keys/openpgp-keys-llvm/Manifest
index 90fa68fc4188..b2a4db4deab8 100644
--- a/sec-keys/openpgp-keys-llvm/Manifest
+++ b/sec-keys/openpgp-keys-llvm/Manifest
@@ -1,6 +1,9 @@
 DIST openpgp-keys-llvm-14-tstellar.asc 4738 BLAKE2B 670fbce2610686c5dd71efd8111c892adac8a8b76d3500be42711b53067f68d74a9d950574897597e6141352a9d82825e1d3980abd501794687babfc169afd35 SHA512 5774097b61bd2adb028b9366a6e5baea5919e1058a8826b52cb76f3cdc309170d0950ba2db2d4f3617f666d5bf4386917c02c84ec207419b50d60606ad345138
 DIST openpgp-keys-llvm-15-tobiashieta.asc 2511 BLAKE2B 23de0910e95549e03f77c0dabcec68c793ed03c0a03a444c14d7103a586121707bbdf7d9ade9e4d3a8aa89bf750034a876bcae6c63d54a6474375fe9e1ed15a8 SHA512 3aa58a00447f64a6f4cdfd51423916235c1c716cbc2345abc3e5e628fc5b3ee907b530c77c7a0ad1dfa3065d5f47af1f4c96a7cdaee2b42af71bafd8b85b34b9
 DIST openpgp-keys-llvm-15-tstellar.asc 4745 BLAKE2B 0a2ba731217b9948c9c6874c994bf0d6636b3085a437f2641a921def6fd0023cc09925a7d4deed154a2c2dc1e3c7b6a0d75aa1a9b690f9c0d4d5471a6575cba7 SHA512 b85ec094c2bb32e173326b40f118a17169b67ff37dbfb623156c06e42a262da24d72e605c2dd07c34774547c9c05aa2949b4cd62cac19bcb7cb1c804b54fe5a5
+DIST openpgp-keys-llvm-16.0.4-tobiashieta.asc 2511 BLAKE2B 8e1b863330b6842e9a794d836aebaadf50462bee8a715675a85d7eb378508ec91a968049ecfc4833ed9433604696da5bad3030a7604aac56c471fe61c072d11c SHA512 8fc099a8936767b53381c3ddf38daf3f982e0ef5cb16ebe0af357054159a8f14499b265da34112f9ec9aa7ca9af2314f111ec1df91da8da7f11fe3dc1dc1f5e4
+DIST openpgp-keys-llvm-16.0.4-tstellar.asc 6911 BLAKE2B 23fd4f245eb58fe7bc840b202001ab5ee6e2000b245e452fc8fc9c4ed2fa147d7445fb16554acd457b17a4b40cbdccf0758e953d8b52cfe56cc7082b9d5a6921 SHA512 2661b9af966155ecedfcc57b5ce1dc6f5263ea48fadfadd2b9df8c55cc23a727bdfce777cdf3468e03b39d7ac8130988e10955b95c33ce80f49fd3bca9b7029a
 EBUILD openpgp-keys-llvm-14.ebuild 655 BLAKE2B c0e8e062577698d65d2db87a2237dd4fb4646472dc3e1de6d80ced188bbe1d496cc65a27f636fc5706ba1623ae26677f076208d73e4d0c7828237d180d281e14 SHA512 75bc862928705cd56d0b70c912cc57f0087c04e44cf02b66bd2b633d8228ae56c8613f638b65b25f0023d1ad441155825f70f7a1ed10b552b83f098cd125be5e
 EBUILD openpgp-keys-llvm-15.ebuild 779 BLAKE2B 8c051ad82b4e742bfe7c0e302579422de8c4ed3453e7ee6687a8f35bc07b86c550ea4a6b2b351adb00e8e246d813bd2eb38a82681dbee3568da5175c5e2c764c SHA512 ab1eb097cc3ed4d2d452199deae4404945ef161fbe31b8a033ae2ad932f5a793fa705de8a33da2dcda76852e7d655dfcbaa162b04a70473488261da50aaa9f4f
+EBUILD openpgp-keys-llvm-16.0.4.ebuild 752 BLAKE2B 17eb22c5f0e345cec4024f98fd710a5a730d7a897e8eabe12db74aa040607e17d7b8b9c71b6cb75f1c87f04979ddc62e7a54780cb1cfba68bdd3858ccce6c409 SHA512 5590824a6236c44ee3f05443a31107422440e898b0a836d01d1f877fe090fecd992d846424e3d90a77136dcc296e3ed397a9a508b72897685dc0ed2132fbb81e
 MISC metadata.xml 241 BLAKE2B 74f9f8d542f030a711a4a6cc1082a31446e370d11a1c722003c6f3307f5e1731385fdd039358cd28071b9b8ae9f35a384c70ad6b9bbd9083062c28a9daa9e4d9 SHA512 212046dfe404fa0e85fd9193fcb0df22dfc3c463e3022c70cd0136d42a8e07d5491ba6c037e61cb74ef2161adc1298eb0f0e8786e0fdf326c8855bc85a82eef7
diff --git a/sec-keys/openpgp-keys-llvm/openpgp-keys-llvm-16.0.4.ebuild b/sec-keys/openpgp-keys-llvm/openpgp-keys-llvm-16.0.4.ebuild
new file mode 100644
index 000000000000..54356b0b4685
--- /dev/null
+++ b/sec-keys/openpgp-keys-llvm/openpgp-keys-llvm-16.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used to sign LLVM releases"
+HOMEPAGE="https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.4/"
+SRC_URI="
+	https://pgp.mit.edu/pks/lookup?op=get&search=0xA2C794A986419D8A
+		-> ${P}-tstellar.asc
+	https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xd574bd5d1d0e98895e3bf90044f2485e45d59042
+		-> ${P}-tobiashieta.asc
+"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - llvm.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 70b135bc8867..8c5f448cbddb 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index abca758a0828..9d82691ee7f9 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,7 +1,9 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28 SHA512 7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb
+DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566 SHA512 7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
 EBUILD s6-linux-init-1.0.8.0-r1.ebuild 1578 BLAKE2B 8678965c43548fb62e98f4c0e2627d62fb45003d2fbb1d5a7712b3a4763c2a3c8aca13be12293c2d7be58b2c12172a169798f3de0c3317ad7ead7b3439fc5413 SHA512 64fb980bbf50d0cb6144a09755e87b60e0dddfd0721b84ac809cf609f22a2e43a4e358e65ec4c80d786095ca640d38948aa304d6b08a12a296bf97cca799843a
 EBUILD s6-linux-init-1.1.0.0.ebuild 1637 BLAKE2B 4d35a2508f4e5aab6e40e2e2d2426f49d927afb5c8b1cac782585559b4e960a8b9cc3028d54c678c6583295e515c741a7d90e27a472d01570cb9a80b9d8c881e SHA512 ac7d33bd71887fc8402234fbf96fd2fd7811ce9bccf8221dd1b8f30f4bcaa8ed9cd581f354dc85db3b1a5e013aa113863c8ef7195b637f28819951fb1edd6f05
 EBUILD s6-linux-init-1.1.1.0.ebuild 1638 BLAKE2B ff3a7269815cb3aa9978942ea18d609bebd002b5cbff1e5abbad229bbc9f191fe2a07dcea612259bc78284365c4ee8f7df36159b1ed4e59a871c48e61e4e8df9 SHA512 b0bbabe29f5f3cfeabdc3f6450c5590072efb60c35c20803cc8f365213de602685e758065048d37fbba17c063b4f02bb30b846b687076911909c3d5cc3346498
+EBUILD s6-linux-init-1.1.1.1.ebuild 1640 BLAKE2B c264e71cb70a797e70977b61b9b9ed2ecfb13d84a353e1335d2cd6e43c723bb131185a704fba370da7d49e40bc45102852f7f1e2064a51cdc47a616314b6e074 SHA512 17534e767950a70b568c9edc13593e31352e7ae90112b6bf91b02cb5423f90afce2057a3b43266eaa9feb6459c0cb1d3d4899fd68db1bc24340cfdf19645c0bd
 MISC metadata.xml 762 BLAKE2B 57da7dfce946e1566ada1e25b90a5746cf60e5bfc1fb1aa1e3d0f24b5afb8475a1261dba37dbe5e256215c5e2477c1dc415872f9af1e66b08712be59f69e2b3f SHA512 6d1b096d6996c091bbadbea038fdcde9c8c20f7fa44df5355ab46e3d7b80ef0c3e8609dbf326400a0969e42f03300742887c15c6cc2edc5e6a27d35e5ab79a90
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
new file mode 100644
index 000000000000..795a17748e77
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+	dev-lang/execline:=
+	>=dev-libs/skalibs-2.13.0.0:=
+	sys-apps/s6:=[execline]
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index bc72c3675fca..02a42e0ac44d 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 92f7bbf37b1f..ca510d216f33 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,12 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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-16.0.3-r1.ebuild 5517 BLAKE2B b6ab86006359b058f3503e0686a9f9b2172c0cf8db02859213ccfa3785cd670229b174326a142817299f8ac841139eb03029430a68a46ef75388024da9303afe SHA512 e063f0a43f937ed4f173aff4fe090ba1e084bf1ecd80549a41459e0ed1ebff0d68a6617b66926e1abb4874eccb2fb4541cf6667299d33be3cb969cc1a5eb32b7
 EBUILD clang-common-16.0.3.ebuild 5158 BLAKE2B 96869b1c5b4872174e17980aa070c364675a1c3a8b0560af17e6e7530f35b8fd97a8735d3947abc75e8cc245015e585ce44b3e1d9fa418a2a4787cd1f08ef1c9 SHA512 0507f8d775a17b4272e80ee6413df400f1ecbbb0954b1cee0d0cbe97c8793ebf2a90e3ce6bbe7a0e7376b1fb4a0d30b6bdee31f1e1722d81d70cc3b79d4f14c7
+EBUILD clang-common-16.0.4.ebuild 5158 BLAKE2B 96869b1c5b4872174e17980aa070c364675a1c3a8b0560af17e6e7530f35b8fd97a8735d3947abc75e8cc245015e585ce44b3e1d9fa418a2a4787cd1f08ef1c9 SHA512 0507f8d775a17b4272e80ee6413df400f1ecbbb0954b1cee0d0cbe97c8793ebf2a90e3ce6bbe7a0e7376b1fb4a0d30b6bdee31f1e1722d81d70cc3b79d4f14c7
 EBUILD clang-common-16.0.5.9999.ebuild 5426 BLAKE2B dbab7084dcf1ec1c79c8f1c9b52733731917e8a98907891ac3498d9614b5762034f3c45ec40e137e34214c1788b5c0f24dc53d39a3ab764800edfbe61dbb7c70 SHA512 cc1a9faaa11de0b0cb484dccca330cc82ed020c21fb3872db58680411ac3f16171ed8569faf9e59eaf713238728c58f737197ebd337fd1fe797a6455a55d1328
 EBUILD clang-common-17.0.0.9999.ebuild 5426 BLAKE2B dbab7084dcf1ec1c79c8f1c9b52733731917e8a98907891ac3498d9614b5762034f3c45ec40e137e34214c1788b5c0f24dc53d39a3ab764800edfbe61dbb7c70 SHA512 cc1a9faaa11de0b0cb484dccca330cc82ed020c21fb3872db58680411ac3f16171ed8569faf9e59eaf713238728c58f737197ebd337fd1fe797a6455a55d1328
 EBUILD clang-common-17.0.0_pre20230502.ebuild 5426 BLAKE2B dbab7084dcf1ec1c79c8f1c9b52733731917e8a98907891ac3498d9614b5762034f3c45ec40e137e34214c1788b5c0f24dc53d39a3ab764800edfbe61dbb7c70 SHA512 cc1a9faaa11de0b0cb484dccca330cc82ed020c21fb3872db58680411ac3f16171ed8569faf9e59eaf713238728c58f737197ebd337fd1fe797a6455a55d1328
diff --git a/sys-devel/clang-common/clang-common-16.0.4.ebuild b/sys-devel/clang-common/clang-common-16.0.4.ebuild
new file mode 100644
index 000000000000..4acd801b683d
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-16.0.4.ebuild
@@ -0,0 +1,180 @@
+# 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="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	default-compiler-rt default-libcxx default-lld llvm-libunwind
+	hardened 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} )
+	!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
+	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
+
+	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-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 4a0bdbafd39d..83a39fa2decc 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,6 +1,7 @@
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.3.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
+EBUILD clang-runtime-16.0.4.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
 EBUILD clang-runtime-16.0.5.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0_pre20230502.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.4.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.4.ebuild
new file mode 100644
index 000000000000..6483c7c0c78e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
+
+pkg_pretend() {
+	if tc-is-clang; then
+		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
+		ewarn "upstream has turned a few warnings that commonly occur during"
+		ewarn "configure script runs into errors by default.  This causes some"
+		ewarn "configure tests to start failing, sometimes resulting in silent"
+		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
+		ewarn "not yet clear whether the change will remain or be reverted."
+		ewarn
+		ewarn "For more information, please see:"
+		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
+	fi
+}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index a5bd14e1984e..54e680931464 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,6 +1,7 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-16.0.3-manpages.tar.bz2 245859 BLAKE2B ea98ac1a777bb2fe52a576e7a733030e88debc50dbfceb70f20814fd960da6a56d06986272cb2792c86701961e4e39006e5a3aa105eefb8c59e3b99e528078ec SHA512 6669105c9ac66ec0c21ccc788635935b5133b035b97ff31af049ebb8064fa7d257d54c5d9fda79674aa6037668e3ddfd2a09f716dbfd7cd356b0e193242aa9fc
+DIST llvm-16.0.4-manpages.tar.bz2 243154 BLAKE2B 69308e3ec19d750e7249b7c8cd79224c466b879c67dd900e201339486fa7fa4dd6ef9ef5b033b2443b32c3530cc76564fe2856a76f9b466fdab2b5c64148f089 SHA512 2d2b711adbd20a233d0611f81393faa29a2f32f0e64799a9a48185876045023ca1320becd2da110fbcbfce019a38df0d7c13fcaea3770b4fc23aa732eb11321b
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-14.0.6-r4.tar.xz 19360 BLAKE2B 814dd617d237b0bd9c80bdd9d921196b8f93248b731083e79455d4609a05dd15b6847fc227359624abce683ecdaadaefea71dc9b65b7edd1fc3912123fa55054 SHA512 9ac57abc87a63cf31ecd021e6dd44f5f11cd6136fa3b92e89c52a6d13e0ed471f88e6e96160baeac4615eedff7943048a35a98c8d37387894c9c2d1f5df277ce
 DIST llvm-gentoo-patchset-15.0.7-r3.tar.xz 24268 BLAKE2B 6531ae385ecea87bc26dba8ce19b4cde8ff224c80fd81f04c6ded131e305ecfdeb8d29ebd3b68a641d240805dc83eb0ebc7cc85124f02ad0ee66e0f201b91d7e SHA512 66cb33f8b423736b990fb75d4f2d1e5f14c0b03308f403297204dd1a352d72f85f34220fd66d3de5d6df328cdf2ffce03c2a111cb0bb57791cf68a88069ac7df
@@ -11,6 +12,8 @@ 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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
@@ -18,6 +21,7 @@ EBUILD clang-14.0.6-r4.ebuild 11945 BLAKE2B 1f14f89997a862e04b0d9042c6d9c698c2cd
 EBUILD clang-15.0.7-r1.ebuild 12617 BLAKE2B 780db8dc3c92efab35280d32f6b7d4ffcea912d7839b995a18aa603d0cf59df1199eabd53eb5a475e67da7a45e10fdd08e9879b871a25672f135dbdb001a5f46 SHA512 f6302415c9a4fb8571613ff5ebea4096f1318333ba4bc0f3c0b63b04eb0d10755c4555f55186875db0d34bb5d2c0b245b758aff387b97033bc643a1a291d1195
 EBUILD clang-15.0.7-r3.ebuild 12552 BLAKE2B 1702065ffe0da6dbf809a82f0f0ec9e84daf7b0c3c4e9fb6d3c8eb320cf0034bfa6197f70f3752b3b58b841c27a7d8e00ccdd19b68f17a25fb54e203e9a66769 SHA512 f93df89921be88cd2bee7ba7d3aae0013db0b35f3f5e8cfac188fb5462a963afb9ce50b69b2046dbbe50d9bbf77532effb639e129176d986bb0c98d3106da3fb
 EBUILD clang-16.0.3.ebuild 12442 BLAKE2B 768d62dbfa26da9aa52240132b767c00f27e905bddbbd5078b507330d06c7033c7f2db06a199c74e20f8a83fcbacb94ec401ff4a7e81256a6a33f7774eaa8209 SHA512 e413717bd5191a054822daa2b8f3bc363b58de267e66046b3908edd8da6714552e039bb23e9d4c613a8e535c2d70e7add72a923f82763365dab00b5252a04be5
+EBUILD clang-16.0.4.ebuild 12373 BLAKE2B 8b0dc7d45d5204d29c4c57a5196690e06bb106d4ea36368f2d4af9eb7c5cf3cc1ddb9f72af8836ce54e709c708c0228c8c25347dee665887d194f65938fe98f3 SHA512 be98425dfb8d5cf7f1201750c46fd1c3cd870aacddf300529c6270708bc636a99cb986af8267735b8be8088184bd168f211ce6ac86c393fcc4c07880554d477d
 EBUILD clang-16.0.5.9999.ebuild 12293 BLAKE2B b854af4222caecd41ed431d560b9311e3bbc23313323cd7bd3f3fe79935d194657a48e0a64ea3303836d79f4117c28029a6b7b9c8fceaeb2551ea5300871ed23 SHA512 5672ff46c5ed3409e651243b815e5492b9d0f76ef6224860ff60f5b887bf5e1a2c77208c058b94534b1bac614bbe00b858b4d94d017c39ec6554c5e714530077
 EBUILD clang-17.0.0.9999.ebuild 12284 BLAKE2B b3ed58b37e00f030d9ab4a8d599cfbcdcb78c17a1542e8942602f360b93077997243f68b4dd441133d9aa79d3e687a3692a8ec31c4937ed4b3f1651b1d1b0d3c SHA512 530d877ab7a240de67056c59c6baad288052133c01171ce9c67d12651300cb3dda3258cd92ab8bd319c89ab9856722c54183bb32ab410201ebe778e5e36e4329
 EBUILD clang-17.0.0_pre20230502.ebuild 12353 BLAKE2B b4165aa6ea9c9e65092d93989b8681281d42ce7e27c24df4a1788c6865667f217a9d61769ee83fb4ae23b1fd9c5b6e806d70aad20bd5f97c162471447e89730c SHA512 a125b873840ef52ad77a07c62d3872936ecdb2cd80bfdc9de3c781b6f26b87f2bde70974c12ea19df181e1d996d1990b1c79dcabe2887d7b913113cd2addcbfa
diff --git a/sys-devel/clang/clang-16.0.4.ebuild b/sys-devel/clang/clang-16.0.4.ebuild
new file mode 100644
index 000000000000..a6f929936e58
--- /dev/null
+++ b/sys-devel/clang/clang-16.0.4.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake llvm llvm.org multilib multilib-minimal
+inherit prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing
+	llvm/utils
+	third-party
+)
+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
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# 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_CUDA=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_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-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
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+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/llvm/${LLVM_MAJOR}/$(get_libdir)/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 1419314aae3a..dc1542e16b05 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 2239 BLAKE2B 33f554acd6e1db31f9aec3d75b2c43994a95240ba42bcdf7060090231ff6214e896b5fd051fcb513337161cef408014f64391e9ecfcf5269749fcfdb8a3771da SHA512 a06a9e4ff4f9109dd4eb3f3fdb2308b043beca30c016b184a3f77e7c4728161b3a1b4a662fccf102419c4a3aabab9e30db5a3c87448fb8b2a91237bc08e834ea
+EBUILD lld-16.0.4.ebuild 2239 BLAKE2B 33f554acd6e1db31f9aec3d75b2c43994a95240ba42bcdf7060090231ff6214e896b5fd051fcb513337161cef408014f64391e9ecfcf5269749fcfdb8a3771da SHA512 a06a9e4ff4f9109dd4eb3f3fdb2308b043beca30c016b184a3f77e7c4728161b3a1b4a662fccf102419c4a3aabab9e30db5a3c87448fb8b2a91237bc08e834ea
 EBUILD lld-16.0.5.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-17.0.0.9999.ebuild 2157 BLAKE2B dd17cb187ecc5f448245e19ce67fc9abf26bad3fd62b4f999d01defc43b87e8d47f1613212d56e66061f414de947e0e2a9e24aeffd4b4baf947714b5dadb5ba0 SHA512 fca39302715a0c083b24b94336eeb53a376d69e014f49922ce49987ce2a8c591727cdde49fd70ed5067305c807e4445653753efd5900d8bb61e5b47269fd37d6
 EBUILD lld-17.0.0_pre20230502.ebuild 2157 BLAKE2B dd17cb187ecc5f448245e19ce67fc9abf26bad3fd62b4f999d01defc43b87e8d47f1613212d56e66061f414de947e0e2a9e24aeffd4b4baf947714b5dadb5ba0 SHA512 fca39302715a0c083b24b94336eeb53a376d69e014f49922ce49987ce2a8c591727cdde49fd70ed5067305c807e4445653753efd5900d8bb61e5b47269fd37d6
diff --git a/sys-devel/lld/lld-16.0.4.ebuild b/sys-devel/lld/lld-16.0.4.ebuild
new file mode 100644
index 000000000000..7ddfd8f8a755
--- /dev/null
+++ b/sys-devel/lld/lld-16.0.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[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_TEST_COMPONENTS=( llvm/utils third-party )
+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 39bb7026dd59..c74d502bf0ab 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 615 BLAKE2B dddab327388341f3330d7374a76bc1ea144aa5cad62feea34140b5825daf13118ff7185a6c2cce07479c3ca13c3ba8ad7cac7ba71a8b49fdd25a979d899a5b0a SHA512 57e7d90e7fc4f5dd2daddd1c7e8ed7885112120aca2b13b21e2fc719cfe5a87bb640aa67c605827bcd60aa71300abeba937e158ae1a1a16559236ef9e6d18319
+EBUILD llvm-common-16.0.4.ebuild 615 BLAKE2B dddab327388341f3330d7374a76bc1ea144aa5cad62feea34140b5825daf13118ff7185a6c2cce07479c3ca13c3ba8ad7cac7ba71a8b49fdd25a979d899a5b0a SHA512 57e7d90e7fc4f5dd2daddd1c7e8ed7885112120aca2b13b21e2fc719cfe5a87bb640aa67c605827bcd60aa71300abeba937e158ae1a1a16559236ef9e6d18319
 EBUILD llvm-common-16.0.5.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_pre20230502.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
diff --git a/sys-devel/llvm-common/llvm-common-16.0.4.ebuild b/sys-devel/llvm-common/llvm-common-16.0.4.ebuild
new file mode 100644
index 000000000000..4dd4fe395fe7
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-16.0.4.ebuild
@@ -0,0 +1,28 @@
+# 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="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+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 7c732f5ba2da..1695df8ee0fe 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,6 +1,7 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-16.0.3-manpages.tar.bz2 245859 BLAKE2B ea98ac1a777bb2fe52a576e7a733030e88debc50dbfceb70f20814fd960da6a56d06986272cb2792c86701961e4e39006e5a3aa105eefb8c59e3b99e528078ec SHA512 6669105c9ac66ec0c21ccc788635935b5133b035b97ff31af049ebb8064fa7d257d54c5d9fda79674aa6037668e3ddfd2a09f716dbfd7cd356b0e193242aa9fc
+DIST llvm-16.0.4-manpages.tar.bz2 243154 BLAKE2B 69308e3ec19d750e7249b7c8cd79224c466b879c67dd900e201339486fa7fa4dd6ef9ef5b033b2443b32c3530cc76564fe2856a76f9b466fdab2b5c64148f089 SHA512 2d2b711adbd20a233d0611f81393faa29a2f32f0e64799a9a48185876045023ca1320becd2da110fbcbfce019a38df0d7c13fcaea3770b4fc23aa732eb11321b
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-14.0.6-r4.tar.xz 19360 BLAKE2B 814dd617d237b0bd9c80bdd9d921196b8f93248b731083e79455d4609a05dd15b6847fc227359624abce683ecdaadaefea71dc9b65b7edd1fc3912123fa55054 SHA512 9ac57abc87a63cf31ecd021e6dd44f5f11cd6136fa3b92e89c52a6d13e0ed471f88e6e96160baeac4615eedff7943048a35a98c8d37387894c9c2d1f5df277ce
 DIST llvm-gentoo-patchset-15.0.7-r3.tar.xz 24268 BLAKE2B 6531ae385ecea87bc26dba8ce19b4cde8ff224c80fd81f04c6ded131e305ecfdeb8d29ebd3b68a641d240805dc83eb0ebc7cc85124f02ad0ee66e0f201b91d7e SHA512 66cb33f8b423736b990fb75d4f2d1e5f14c0b03308f403297204dd1a352d72f85f34220fd66d3de5d6df328cdf2ffce03c2a111cb0bb57791cf68a88069ac7df
@@ -11,6 +12,8 @@ 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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD llvm-14.0.6-r2.ebuild 12389 BLAKE2B 549b4e1c7feceb40c7e5aaa624925ec08627c84236c460f85a044621dc388cfca248f8a311c657a3b3dadbd367472f3c820a635c14246f74fdac98dd2ddf6fd1 SHA512 8559954b641fc007c92d4b3e2fcc129bdd812f974dccf37d74f61cb9d7414e28cbb41d7088767356035b972c1e417561770a89169676841e762e62644c6d0323
@@ -18,6 +21,7 @@ EBUILD llvm-14.0.6-r4.ebuild 12320 BLAKE2B 171c0d33e97ea1298768370982a54cf3ca16a
 EBUILD llvm-15.0.7-r3.ebuild 12493 BLAKE2B 86343f2e904e6e4bbd653656c359470fb94909d48ca2e4f78e1f48bc183fba98c830569e92ac157d8a98471a5500c0a48c3eda3e13bb69d4abc204702a2b865c SHA512 aa7f3438deac9d07bf78dd44e0bc33a1b39f7a3ae4c930ab9908559604b28b3dbd22efbe43152eeeaf36352afff86e3c03ed10717d5e0aa0e983fbafd8aff971
 EBUILD llvm-15.0.7.ebuild 12558 BLAKE2B 1f73f500a38ee4e96438a5e478781a562d48e10d550cd6c5beaf37a754ead1f0bedb121be78c6bee229f694cb085ee665f7b33a44eacba0d6eeaa42b545f6ca7 SHA512 92dd8f7f8554ee24978ef4e1409f5356a95455d2b5006da0a5dbf27cc277962916a0e93d2f7630a0eb3a9f3a1167eb9aeec0a319de3637c5762a7c391d3f5330
 EBUILD llvm-16.0.3.ebuild 12490 BLAKE2B 95b6ae05f64728668134ff348e5d084346285425e57c69a7345a44f85c832523b1219a76c3b2c6274e190b869569be3f91d9e5c0298e13167f3e6e0e8d676f66 SHA512 eec238ccb340ad901e130d984349ee4a9788bec4cd7def73a6c946becd1b86b74ee044e39cda48f892017a06e2a381a0424caaf44d073a51c64625c3b45411ba
+EBUILD llvm-16.0.4.ebuild 12421 BLAKE2B 49bea7429ddde3c8ba494952394d7f2b40c244cfa67bae63b3b65a24e13e461f57569d2cbcad7576dfed59c3e377b3a9f0e42c7a19fdf8cd577781636773bc8b SHA512 6e618b38abfa2dec9bc20c56ec5457a37d41063d9f3aff0b5f36d540ce7d07abec5e6223168478ff0f581a04deb4f10a9164fa370b8402b16e9ea43eb2da6dbb
 EBUILD llvm-16.0.5.9999.ebuild 12330 BLAKE2B 0ba8d556723f15cedb1c2296653dd33f6143c9c8d918214dc03645b0726b515cbe8221933ae041bec208bb5a5efc92b7797cbec7b8d5a6a195bc07e5c232cc69 SHA512 50483aafb23649384818a248b5d7a01d2788ec4601cf4926329315727d76a67e2515f76bb29c0665e6a537afc87b08c91aab80e6ad2da5a90906d978019c4646
 EBUILD llvm-17.0.0.9999.ebuild 12689 BLAKE2B 188b2dc059691ac3a1d181e8aeeadbe836507ea419f966b12203eb64de15a5c0bed49074e055f91e0e98a07b80bdff355302e4a4b6f27f09ff23753a513848f6 SHA512 9fcda73df117c7fcab2be62ad8f8ed51794c7e247cfab39f2533948a3c105575f75459b6dccca7cdc425a13e45947b13cf40c0e5cf70b771b7755a2063562192
 EBUILD llvm-17.0.0_pre20230502.ebuild 12758 BLAKE2B 06bd7ab28d6d6105c3d18ccdec1a24f2e589d693ebe72ed320aa8078bdd98b7a8246813a738d0a66688ca3e23687037c2e85ef9a73be32c5e72e77e32f4280c4 SHA512 fce3a727c79f69ec9094fdb6daa6a75145a91fb49560a16b3d299fd8420902932ee84d3a9faa9ac3016b09906f302fb2f4b4511408766e10ff870e57204c7831
diff --git a/sys-devel/llvm/llvm-16.0.4.ebuild b/sys-devel/llvm/llvm-16.0.4.ebuild
new file mode 100644
index 000000000000..2d844e82840c
--- /dev/null
+++ b/sys-devel/llvm/llvm-16.0.4.ebuild
@@ -0,0 +1,516 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	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 )
+LLVM_TEST_COMPONENTS=( 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)
+						;;
+					# 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
+	)
+
+	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
+			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
+		)
+	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=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-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_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_MASTER_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 c0d814e3161a..6fa7cbc52567 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 2aff4cc0c463..f267cad108f3 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 6550 BLAKE2B a3d856b59f3ad6ce433952a31081576c91576e764119720cf9af44dd54a1813f9f08da03c26cab7a4d00e8b44852197588b14eb52826419b353b44c926cf37bf SHA512 509c25c720fb1f4e3664491f41b23242dd24ba541cc319680cea6e0dc01bebe929af943281fe03473f49fff369b3021cc6abb0d5e6b8b1fd7fabc071961cdaa6
+EBUILD compiler-rt-sanitizers-16.0.4.ebuild 6550 BLAKE2B a3d856b59f3ad6ce433952a31081576c91576e764119720cf9af44dd54a1813f9f08da03c26cab7a4d00e8b44852197588b14eb52826419b353b44c926cf37bf SHA512 509c25c720fb1f4e3664491f41b23242dd24ba541cc319680cea6e0dc01bebe929af943281fe03473f49fff369b3021cc6abb0d5e6b8b1fd7fabc071961cdaa6
 EBUILD compiler-rt-sanitizers-16.0.5.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6249 BLAKE2B 036338e02f018bd9cb01036851fcee5af58f012e15c4fcb55a207e519d2b553e83f2871869681055a9c672b091126e95d52a1c50a605a94e27b866b22dd64732 SHA512 94a1deb4cbba26d0e1aa02333c2d3375349b059e1fe75f26368ab54d13b276c27ea377f4cce9b1cdf0a508add5ddae4886a59bbb24cd8bec61a7e5d03660746c
 EBUILD compiler-rt-sanitizers-17.0.0_pre20230502.ebuild 6249 BLAKE2B 036338e02f018bd9cb01036851fcee5af58f012e15c4fcb55a207e519d2b553e83f2871869681055a9c672b091126e95d52a1c50a605a94e27b866b22dd64732 SHA512 94a1deb4cbba26d0e1aa02333c2d3375349b059e1fe75f26368ab54d13b276c27ea377f4cce9b1cdf0a508add5ddae4886a59bbb24cd8bec61a7e5d03660746c
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.4.ebuild
new file mode 100644
index 000000000000..d7d5778a3c8c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.4.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	if has_version -b ">=sys-libs/glibc-2.37"; then
+		# known failures with glibc-2.37
+		# https://github.com/llvm/llvm-project/issues/60678
+		rm test/dfsan/custom.cpp || die
+		rm test/dfsan/release_shadow_space.c || 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 8b56d8b0177e..eb6cba3c8831 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -6,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 4244 BLAKE2B b4fa336d5147d1f452cfe2d423d86a7d3c61747c537c7ad6d3925c0f8cb375e63a7ca3a233504f246bba3e8571552ee575852ef9d14c4f7386078d89bbda0f90 SHA512 f41f64f6bce1331285993ce6542fca86ae5e8fbe6bf2ebbd7b5393fef8916125efb571d4272d64f25667592f04783992b43feb241d64d3186ceab38a686eb75d
+EBUILD compiler-rt-16.0.4.ebuild 4244 BLAKE2B b4fa336d5147d1f452cfe2d423d86a7d3c61747c537c7ad6d3925c0f8cb375e63a7ca3a233504f246bba3e8571552ee575852ef9d14c4f7386078d89bbda0f90 SHA512 f41f64f6bce1331285993ce6542fca86ae5e8fbe6bf2ebbd7b5393fef8916125efb571d4272d64f25667592f04783992b43feb241d64d3186ceab38a686eb75d
 EBUILD compiler-rt-16.0.5.9999.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
 EBUILD compiler-rt-17.0.0.9999.ebuild 4166 BLAKE2B cd26aafb9d796d914dd260347378d57ae3e94594a9f204a866bdd3ad261794c0b04e7caff1d0182fb9f4e462dbbc15132106c0118dfdec9b61adce7732da40d7 SHA512 68218eef7361276b938f7b3d5e44483337bdcd988c7dc8abccfa8b56501b6e8cfb6395b6054bbc69972cc3d5b238627ade3715bf9d9853f43b0e1152d6fee41a
 EBUILD compiler-rt-17.0.0_pre20230502.ebuild 4166 BLAKE2B cd26aafb9d796d914dd260347378d57ae3e94594a9f204a866bdd3ad261794c0b04e7caff1d0182fb9f4e462dbbc15132106c0118dfdec9b61adce7732da40d7 SHA512 68218eef7361276b938f7b3d5e44483337bdcd988c7dc8abccfa8b56501b6e8cfb6395b6054bbc69972cc3d5b238627ade3715bf9d9853f43b0e1152d6fee41a
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.4.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.4.ebuild
new file mode 100644
index 000000000000..49b92c7f0e51
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.4.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(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; 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 ! 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; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	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 6f48d8b54bc4..2de15d2c9a70 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,12 +6,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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD libcxx-14.0.6.ebuild 6949 BLAKE2B 963ece6dbc81f876b8894dd2be0ab4fd5e555dcd09feaf014e30411150f43c9f401910741ded4ecaa05d35f0a2bcf3eb7ce519d4019f464075c31db0c9b6523c SHA512 4c73189a6b719bb10527000b30b83c8811aa462d51bc51bd5b2ff703184e01d8805f0b998479116a39e878ef7486c14e2bfef62bd62b1a20718906eb778a0228
 EBUILD libcxx-15.0.7-r1.ebuild 5307 BLAKE2B 43ff3b320e3050127edf77b51afdb77f25c1dc8826c6b29e8a72f809479df78c661aa2882e6fa9459dd360b379d2a6bbd31d910942d40e49199feafa807a6f4a SHA512 be7372fa0a81a45a55e5896ca507e6a4c29e14f4f152154f43529fcb12c8a96ca0c620b432c1481e8c41bb588d4d3f3c479fb9c7ba2483e53881ffcd9ca7004e
 EBUILD libcxx-15.0.7.ebuild 5282 BLAKE2B 9c1dc8c9ac37ecad2c31231d04068fc60d29df72a393e507e46f12dc093ef11f475ca3df2806551450ea37372dd6739b58b68e7b65290e4ffc18b6fb6085f319 SHA512 f068764ad081f16471f1c3f126095bb5fc61f6151327e50fb6724c93ab33906c72f763b848cb6b0a25b532344a3b6d2b100ed070a6c8bcb7d2e9a4d43e128957
 EBUILD libcxx-16.0.3.ebuild 5294 BLAKE2B 83f9a04af5773a5dcf9f0ba430684e2527695b9b41b8f704a779abb2a9e74060c8450e888f0ccc89bd5befdb32a93706ad2cb82ba309792a1f79297d8a9315d9 SHA512 deed56905f464c6b0baca63585753dbf8975fd2db72493ff8adda9a4ed8cdcb4ca3ef7fcdea6227d6680dca949963f438aaa36947e9045e98a582813eec4defc
+EBUILD libcxx-16.0.4.ebuild 5294 BLAKE2B 83f9a04af5773a5dcf9f0ba430684e2527695b9b41b8f704a779abb2a9e74060c8450e888f0ccc89bd5befdb32a93706ad2cb82ba309792a1f79297d8a9315d9 SHA512 deed56905f464c6b0baca63585753dbf8975fd2db72493ff8adda9a4ed8cdcb4ca3ef7fcdea6227d6680dca949963f438aaa36947e9045e98a582813eec4defc
 EBUILD libcxx-16.0.5.9999.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
 EBUILD libcxx-17.0.0.9999.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
 EBUILD libcxx-17.0.0_pre20230502.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
diff --git a/sys-libs/libcxx/libcxx-16.0.4.ebuild b/sys-libs/libcxx/libcxx-16.0.4.ebuild
new file mode 100644
index 000000000000..cdbee6be92d6
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-16.0.4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang +libcxxabi static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		sys-devel/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 785427000a07..05664db89f43 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD libcxxabi-14.0.6.ebuild 3385 BLAKE2B 4de1316298a9ca1fab72d50484e01346b51a9d14eade701ebcb65100984a63b5bbf3cbea8640dc30e665539cf4af4edd5e1cf4efe7761c6e7cd050ba3d82c3ec SHA512 e23fbcd217ab40c2250bb4ab1fbd7845f9619d0333d2177b20051f9fded815c6b49f806201bf8a023db71287ec73c7ba6b4fa85a1256bef8c7861a2a4f480c31
 EBUILD libcxxabi-15.0.7.ebuild 2910 BLAKE2B 0384b9de395b7725422b07d31439af21c120173a2fa24393bf81e6c150b28977368234aa9f602bafcd46126e9f325cf9314b1f8ed26f1baedcfcda8102240cf7 SHA512 1e0114e9236fb02037229aaf03f736efc0bf8362c1aaa8353b527693b1759ca228cbaf783ada136129b221b464bf341fb54be825f9f5d405212554022de524c1
 EBUILD libcxxabi-16.0.3.ebuild 2922 BLAKE2B deb13575bf9827c2e53b9e9d6179c4cb1db4f6e2a2ab63455a6170883f10c2a2acffd82089e4465f3b07794d16bd81f58edc675a9b5a14a0d3423cc1854b4c57 SHA512 46352684087b70b767fa241510318432491f9aad1f9ea83059093f2ed7af8d61e24884a4958f7008f27ef6735de109084b3b28c8f83db31b6f0cd2830f9480e6
+EBUILD libcxxabi-16.0.4.ebuild 2922 BLAKE2B deb13575bf9827c2e53b9e9d6179c4cb1db4f6e2a2ab63455a6170883f10c2a2acffd82089e4465f3b07794d16bd81f58edc675a9b5a14a0d3423cc1854b4c57 SHA512 46352684087b70b767fa241510318432491f9aad1f9ea83059093f2ed7af8d61e24884a4958f7008f27ef6735de109084b3b28c8f83db31b6f0cd2830f9480e6
 EBUILD libcxxabi-16.0.5.9999.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
 EBUILD libcxxabi-17.0.0.9999.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
 EBUILD libcxxabi-17.0.0_pre20230502.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.4.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.4.ebuild
new file mode 100644
index 000000000000..e5d488bf1341
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<sys-libs/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index fc98fc83987e..d0e3f79e3886 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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-16.0.3.ebuild 3993 BLAKE2B 12ea9bf058a78f1a4439ee65528a592b0fed0a1234e3c318a748f9bf8e520763c7ffda28719f00abbb01fb1a77798f1094ed48fc344d1ea12999a0bbe60a8675 SHA512 b517da1c7c983f21969377852743b5015f6ea86ec078f330d100c8a5bc39de6ee0aa488a15f1702ea765a958ec9ea8903226d81a3ba154273cfa8a5e615cb3b5
+EBUILD libomp-16.0.4.ebuild 3993 BLAKE2B 12ea9bf058a78f1a4439ee65528a592b0fed0a1234e3c318a748f9bf8e520763c7ffda28719f00abbb01fb1a77798f1094ed48fc344d1ea12999a0bbe60a8675 SHA512 b517da1c7c983f21969377852743b5015f6ea86ec078f330d100c8a5bc39de6ee0aa488a15f1702ea765a958ec9ea8903226d81a3ba154273cfa8a5e615cb3b5
 EBUILD libomp-16.0.5.9999.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
 EBUILD libomp-17.0.0.9999.ebuild 3921 BLAKE2B 2aa5aa2719a4f9a7f244cd92fb819d0fafc81d7f806d1b295c583159e0884c14c04bf1188d8c9e315c4cd2e1d3940311cd4e80f03e501958cd3b38e1c0567ab9 SHA512 c6f7bbf7296b24154a170c47044851c7331564af58cdca813ac13903535e49438c9165c8c811e72ad18e0a2db4e890f9dce163f6f07b0b1d60a473e455402b00
 EBUILD libomp-17.0.0_pre20230502.ebuild 3921 BLAKE2B 2aa5aa2719a4f9a7f244cd92fb819d0fafc81d7f806d1b295c583159e0884c14c04bf1188d8c9e315c4cd2e1d3940311cd4e80f03e501958cd3b38e1c0567ab9 SHA512 c6f7bbf7296b24154a170c47044851c7331564af58cdca813ac13903535e49438c9165c8c811e72ad18e0a2db4e890f9dce163f6f07b0b1d60a473e455402b00
diff --git a/sys-libs/libomp/libomp-16.0.4.ebuild b/sys-libs/libomp/libomp-16.0.4.ebuild
new file mode 100644
index 000000000000..72038b861daa
--- /dev/null
+++ b/sys-libs/libomp/libomp-16.0.4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	debug gdb-plugin hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	offload? (
+		llvm_targets_AMDGPU? ( sys-devel/clang )
+		llvm_targets_NVPTX? ( sys-devel/clang )
+		virtual/pkgconfig
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local build_omptarget=OFF
+	# upstream disallows building libomptarget when sizeof(void*) != 8
+	if use offload &&
+		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
+		<<-EOF &>/dev/null
+			int test[sizeof(void *) == 8 ? 1 : -1];
+		EOF
+	then
+		build_omptarget=ON
+	fi
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+		# prevent trying to access the GPU
+		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+	)
+
+	if [[ ${build_omptarget} == ON ]]; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
+			)
+		else
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index aaf73be5b81b..d04347d97c79 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,11 +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.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 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.3.ebuild 3045 BLAKE2B e0704cc1c6a743ecd3c073df9456f7a549896a9992083ee650803f199d4285a7666fc819245fe3e5762046d8df875291283059033287b9e1f9d71345e86a20a2 SHA512 4da2d464da0d7f438e782bbb539c394588c046af0c1415718ffa2e43e6500eaa60aedefe58b814281c41873a4ebae8b01f5299798583e9662a347a95ed5a5e69
+EBUILD llvm-libunwind-16.0.4.ebuild 3045 BLAKE2B e0704cc1c6a743ecd3c073df9456f7a549896a9992083ee650803f199d4285a7666fc819245fe3e5762046d8df875291283059033287b9e1f9d71345e86a20a2 SHA512 4da2d464da0d7f438e782bbb539c394588c046af0c1415718ffa2e43e6500eaa60aedefe58b814281c41873a4ebae8b01f5299798583e9662a347a95ed5a5e69
 EBUILD llvm-libunwind-16.0.5.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2979 BLAKE2B 6c50c9b69b0cc8fa3799e9506b5d45946ea2606dc53d0925976633c2209f6148653e8b12bc31b76f56c4963d64b27971aec00c9e4da89d0489a76d1ba61a9f37 SHA512 e09e4bdbd8af6a470894c5950d81edf7574eba7c56f922c5447777247fa886dde958b8ee13257ca40cd7cee8af9f91fd6b9c11cf42a53b48bee0aacb469270ee
 EBUILD llvm-libunwind-17.0.0_pre20230502.ebuild 2979 BLAKE2B 6c50c9b69b0cc8fa3799e9506b5d45946ea2606dc53d0925976633c2209f6148653e8b12bc31b76f56c4963d64b27971aec00c9e4da89d0489a76d1ba61a9f37 SHA512 e09e4bdbd8af6a470894c5950d81edf7574eba7c56f922c5447777247fa886dde958b8ee13257ca40cd7cee8af9f91fd6b9c11cf42a53b48bee0aacb469270ee
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.4.ebuild
new file mode 100644
index 000000000000..049f6bc1cc17
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	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-apps/Manifest.gz b/www-apps/Manifest.gz
index c7ed6fb5bd32..b91192f8e48d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 7d2642177375..1e5b2c29f771 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,6 +1,6 @@
 AUX htaccess 170 BLAKE2B bcdf354e630f2e2995a56b7f435da2cff2c39f85ee70f745d43ec3cb575816da7b6c9626f2090dd1c2b25b38dc444904d547e4b8f96262b0ad9a9bda805cc045 SHA512 a19dba09a2a5c6926b56ca1063e329e431253825550890be56a46faccd736aec7236167b5da1f0b0cfec47a9935f340f246b4bfaaaaeba06644d08a76fc52514
 AUX htaccess-dist 1639 BLAKE2B 52fea4574320fc4e56aa061e46f7ec978a6282996188f2d86b9eea4e8b4617c561f94621ea3cf334d4eae16d164c96ce419258da40e9644b951f5c4d828acf09 SHA512 8d05756eb04a61fc9a89b814d0cf9022feb57c3de10fa74cf1964bdba7910d25448109147facccd8447a4ff446cb7a0cf8d8134642061d23b03e0921b032fc76
 AUX postinstall-en.txt 1791 BLAKE2B 96a1f47933d402d7d33aa6cd54724d1f1e9fb717c3a031be6785c49f26d5bcc518388d838a5e68f3911495b51391367ac5777698a8e79e45b5160f99250745e5 SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5
-DIST dokuwiki-2023-04-04.tgz 4032792 BLAKE2B 32bc42d6fd5d869bfc08ee8fc7214f42dfdb4812eea74d04d2566dc3c75f5a7069b62bbc0b8eaca389322d971ffc35c6d40e8257658e38f9cebf96ab2bd47bd6 SHA512 1539f9306916ce1f759a07168a02dab05ee044b3637ce96cf94d67b84027f5774cb2a9f493c8067ff70176d7b018c54cded1251e35022c8f9dfed74fd4fa501f
-EBUILD dokuwiki-20230404.ebuild 1879 BLAKE2B f000d838cc61b12aea18c0728dced258eab0b5bbe917655bce972b7eeee784839ea3afaf3c83890e932b36b6c757608f8a40bb7c49bbd8fcd0964b5612d8b575 SHA512 c600eb6d223cb13497cc2fb71d3027ea2b51a52305aac49baad167a82c640ea6facdc8b0caed735dca90a10b7d4a68b6aee47355d95df0b03f4df21cbcb6b1d1
+DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
+EBUILD dokuwiki-20230404a.ebuild 1879 BLAKE2B f000d838cc61b12aea18c0728dced258eab0b5bbe917655bce972b7eeee784839ea3afaf3c83890e932b36b6c757608f8a40bb7c49bbd8fcd0964b5612d8b575 SHA512 c600eb6d223cb13497cc2fb71d3027ea2b51a52305aac49baad167a82c640ea6facdc8b0caed735dca90a10b7d4a68b6aee47355d95df0b03f4df21cbcb6b1d1
 MISC metadata.xml 802 BLAKE2B a4dc7f053f175b1764efda3721a0cdfdb09d6e4311fd81f103bd4786185dada85accc52cb087aea8fddb957afc07efecca97202ed917f716875da028d1171577 SHA512 c3b1bb6f3d182dc08b08ec9a3407fa7e5eef31a82bdf63786e8488b9d67b3abab9c9b9e5ba4aed7e1a2da43356400eb4d6c825e9ed804c553c8a3b348efca10f
diff --git a/www-apps/dokuwiki/dokuwiki-20230404.ebuild b/www-apps/dokuwiki/dokuwiki-20230404a.ebuild
index c6d2a56a3fa0..c6d2a56a3fa0 100644
--- a/www-apps/dokuwiki/dokuwiki-20230404.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20230404a.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2023-05-18 10:12:16 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-18 10:12:16 +0100
commit	8ea6e43d2f65acbfda614dbd4635823d7605b6d8 (patch)
tree	06f832bd17f7282b5cd87dbec9f023e550afcc04
parent	75b7b7da41881995754ded71c9c029cb1686096d (diff)