gentoo auto-resync : 08:01:2023 - 12:15:59

author: V3n3RiX <venerix@koprulu.sector> 2023-01-08 12:15:59 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-08 12:15:59 +0000
commit: 6a57f9ee53dc794f3d47ea68f78d6ef76d00af47 (patch)
tree: dc9e574f3209abd88e91e2ee0d6093f4fe78e2d3
parent: 268f9f01921ccb921b794d43092c5f29c1e96c56 (diff)
374 files changed, 4403 insertions, 888 deletions
diff --git a/Manifest b/Manifest
index 9791a70f141e..57ad94cc9c9d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29808 BLAKE2B 5ed6bc817165ee25db8ff178a684fffb7342862b1c455db15859ee8edf286403ce14b4e7fe847782ff4a4f39bec376a5e9bc94fa81c70fb057f9d2e784b986a4 SHA512 265f8f38ab8feb4ba31298f66bec7588a9af854c8ef1f0ad5276bb89f7d48560846b81465a521b6cf1a44b73f4457542a867cdea47d26eb93900f207c35262e6
-TIMESTAMP 2023-01-08T05:39:44Z
+MANIFEST Manifest.files.gz 29782 BLAKE2B ff686a03fd10b052ba9b219bf10492d0abe627321e5a151ce3713765458c670e3f6b29745af4344e48a8b9dd64611c26863865cee05737200c168d3d5655c390 SHA512 56c7b1516a57f14707650143df2dcc2ae56bde7fafdd7b30b48f48d650ddf0fad9b79d2b7fa59b575925d6c7f88fda065318a8c2739f788bada4c1fb47909973
+TIMESTAMP 2023-01-08T11:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6VyBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQsRAAiEmfjq3mBRNf6SzATVM5rYsar+BqTIjF5OfEEzFt8Br1asqwQEuWdry1
-Cf/D7lnRFolZIhVBtSyi/IOOANIbevE+y/CeaDoL8H2Gx46pBQB0W37S6ytWPJuX
-YdjzXTnq1hG/ihHLsHukiiMRGCLgkyWmHrJVgTdJhnD/zV2FYEpjdX48NIJLedT+
-vQJ0XFg32aeDl0ukRrMnexNSYMiOxujyByOPTEu7HIsrBsjsWbAekONLQ8l69/cC
-jdWpEryNJB6+s5I0tpD1uLnIIf4ItAUru3hMvftK9E9Gtgdi25XLSSsW0MN+ti9s
-kgCp4Gylh1n7S34G/nlf7sBLXYs9jfj79wGXafoNA3dfxZAYqlHptQMMa9SXj7YQ
-8+crtPORchjxUFU4Fg2uQW2NgIfGpxxOsDY5Rx3TdzNCeopHjBXXDacDGDysLcWF
-qqgjrJU/MAfJs1R/axi71e5AJg/TOIDkVEBSR2G/jl9aA2KzWhDNZ++bVRHOL1UN
-eeQCmgljUSP2znueF6ahdX1xx4PLubGosFE/FiCohjyRhYDLgddbfUBtrfJctEQS
-FpJ4wmIMzgBePUrh5Mie+t9sLJznkTzB5vLSVDVdAzEqnszA9vdxrkLkItbSPpAQ
-SqSKtWm0Pfv9UNDx/dEdraiC43JVlHOnGM2Ppg02GYjRq1rC0jo=
-=jN1l
+klBthxAAq9m/thgOtIWe8Arw1OYPhD2lynyehrWuR9PHIy+L4a/0FvVVhdDjbqhf
+gswQgIf0sGPTAQ6aHHsQwWKrAjIs5d18dGVIceGcs4wiYleYn3HZ/TNHWMNEf7um
+YhDAGEZkKHCqya+Nnh3v8Er0+eFPqsKmVxkAxapphqycrnLmbpL9z3+4MEN6YgTv
+Xi7WnOkZ58we5xlE6SGMOX8efo23hTILYk0dXTddw9+k4VJCDO9dmiBUsQgThPgl
+OuvdojictA8UZfnq5AMOaZZLLOWVAhSxWgdejYcENarPPCwpSxW9Ri6tVaCMCuvj
+ClJ+aWTUv/lRuZFovO5iuNm56fb++qol+3aflvS/nk46j4uELyCvI1qlyIqldc05
+pkyhFaGbpx9XCg/+YBho5MLtivnVXn8vgtiQXOUXOxdNXSJo7nZdyRHQDW08AdSQ
+Ec0CkLsMXkfqneJPuVsJ/GTInKMdn/MGkd8w6d8OUlEdNGcf/7yAyrRBuzqtsm62
+cJwTpt/1f7UeZ3PWNOfW9wBP6Jag6VuND8yisN2X1y363QofENeB4PxgfkcKcEZP
+og9QgFKM5st/kb9VdUaNiQQPlC2q/ekDG+SoX4fueRQ+0ejVvIbtSI0prSLke7SD
+IskRCxNbYudJcDEKY0evuBRxM0rU9XiqLLLYTKRFT9mZ7MDFZrI=
+=oaxI
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f0b770f6d41c..1bcddf421578 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 556f832bc8e3..8debe03fab24 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/logsurfer+/Manifest b/app-admin/logsurfer+/Manifest
index 3c96f9c49199..9bb88e024502 100644
--- a/app-admin/logsurfer+/Manifest
+++ b/app-admin/logsurfer+/Manifest
@@ -2,6 +2,5 @@ AUX logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch 857 BLAKE2B
 AUX logsurfer-1.8.initd-r1 785 BLAKE2B c221acc6d565c6bef69e2b0e107d1d7e5b2fd03d7a645cbcf72b04ec903d3dd4fd031f3ba1f310b8cb0b6f1f8c936a1d3c605602a65682d09a3c4b86ced98f22 SHA512 dc02f6f317437adfe216992a0095912e73f9ad5abcbd2912bb4cdf0d71c4e0653eaeb14f3ff7164d20f1dee168c7b5352a3db96b9520a711e5f7ef04eca9e800
 AUX logsurfer.confd 106 BLAKE2B 3b43cc5e0782c3b34dca3ae607cf38db2128d09a11770efc013501368483134a4e6741c14533dfd59b05cce06e5498ba3a1321c330fe43915f588c5fef4bd3d1 SHA512 872004ae1aedc3adb550da30ebc544ccbf11af5ad399bb9788a4db336138c3f5ec03c3704eaaa2cecb0559de6a2bcab9e96da062e6af9a6daa22afdec709a43a
 DIST logsurfer-1.8.tar.gz 197507 BLAKE2B caa824ef486d8f48f39e6e1309d2dbccace4e91910b94267d50ab9dc022371bade87c251d87c4818d900ce2a72141f2ac4d0b4cccf4b2850e594951c77df2c0e SHA512 975b1353d067cee3a47fb555013ad86cf404863bcd044a46a7b8314670613b89720e4c21ac9c1389f930be964e4694ee6863ce72e289054ffacf9c62565ffa30
-EBUILD logsurfer+-1.8-r4.ebuild 815 BLAKE2B 90a95aacad1bb0bf32a91bd3f480e5f82efb810918c631350580d51b0107f3ec022b2c1bf0fa279ba5936da7777cc6eecfc3fe410fdadc5f68a9c55f9ea1cf53 SHA512 f9dfd7c817452a3f71541cc9a1ac7699a1c6cd15d0556f46f74c9da9becdb6ae1f221489084905237198450e2eb9d4e390eecdb3de7385cdfae73fbe576047b6
-EBUILD logsurfer+-1.8-r5.ebuild 896 BLAKE2B be1e3a803781945788bfc136987aa9288010bd539310bd1e385dbcd38c80d42fe5f027f89dac5a3f231a1620b721b3fb188dfc81bf3b2ca3fbf2310aab31fc84 SHA512 58908820fe9de9d8257cafb7e373ea638353a98d5f4ab7fc929f260495b61dc667acaf3d37debeee35a44e7bf323a499b81697f0406b57970dfd44581c0f068b
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD logsurfer+-1.8-r5.ebuild 892 BLAKE2B 83c525c60a9973a3cbcf9bdc097e05d44bc0d0a0f84834575020a31ca94a2573d74a3ef2b751cdcb80c436242c3cfa4d0f2c24f92d7c9ee385885734a2240545 SHA512 fc1c0c1da4c83ee8bb2c31fff828cc9a1c38ff5c990058c91ffe6b86bec6fde99bf3045dd86923713be5baa6d38031feae38d3ef719126732abfff9fb4a3c6f3
+MISC metadata.xml 247 BLAKE2B 227b2440b4cdea7b4d0363eb97d6a8c758713c69bbc7f9cf3a2b77bc42186357947aa93de72ac0243b9372e0d32c95542b111bc474cba1c81db6221855253220 SHA512 a3263cfc76fd2c6b8eafa54741e2d9baf3bbd492812588e1fdb1cd1277baeaf2136e1e291c2a7248699ec76c046f9074a45fab2515bb010532b6510bb56274f4
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild
deleted file mode 100644
index 5d651c2a12d2..000000000000
--- a/app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/+/}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Real Time Log Monitoring and Alerting"
-HOMEPAGE="https://www.crypt.gen.nz/logsurfer/"
-SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="freedist GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="bindist" #444330
-
-RDEPEND="
-	acct-group/logsurfer
-	acct-user/logsurfer
-"
-
-src_configure() {
-	local myeconfargs=(
-		--with-etcdir=/etc
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	dobin src/logsurfer
-	doman man/logsurfer.1 man/logsurfer.conf.4
-
-	newinitd "${FILESDIR}"/logsurfer-1.8.initd-r1 logsurfer
-	newconfd "${FILESDIR}"/logsurfer.confd logsurfer
-
-	einstalldocs
-}
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild
index c7f3f42ab822..d477332bb611 100644
--- a/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild
@@ -8,7 +8,7 @@ MY_P="${P/+/}"
 inherit toolchain-funcs
 
 DESCRIPTION="Real Time Log Monitoring and Alerting"
-HOMEPAGE="https://www.crypt.gen.nz/logsurfer/"
+HOMEPAGE="https://crypt.gen.nz/logsurfer/"
 SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
index 85e4ed814fa2..de962ca4f574 100644
--- a/app-admin/logsurfer+/metadata.xml
+++ b/app-admin/logsurfer+/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">logsurfer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ea40ee4020c8..2f1f285340e3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 020657c9adc8..bf74f3b944c6 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,5 +1,5 @@
 DIST upx-4.0.0-src.tar.xz 1159308 BLAKE2B d2626a63b626f9b4e913b822e699fa93b7080d322b19555d44d7cf4ce17b37f0d50ec1381d07d0e4f8827e8edcd29d525d497fa79acd18d520ac58e176fb2b72 SHA512 fe3e8c594e845a91338b1e11fe3cb6371430af40a567187d63835e27da8b2abf993a104b0693063f4db984234bada7b2bd16ad79e3ad90861a1f495d99de7de6
 DIST upx-4.0.1-src.tar.xz 1154032 BLAKE2B 0da23cedf73506e06e5dcf19ab0d194d8e578188bb4d75e760fe3f7dc7f24a9d42ff4b75fd9514162f48ae7cfad347b5bd65789805071354a74129960807843b SHA512 f2e42c83fd4a0d273a20c8b0f0d1eb201edcd1f10c779d2a6e8ac0812741c3af0c887382e54894190ecc4c7002a910524b2ed79ae7a7b595b8392598ad2e1235
 EBUILD upx-4.0.0.ebuild 651 BLAKE2B 79aca51cc6fa40e8a39fecd5d512cd191d9981c3e584ab18629c52253d036fd52802476f24060c40117273853d7862c6359c47d8da69732402c89cf2e7c07398 SHA512 168ee21480b5b065f0ec20b3a6916a479db25a358b4a7894d7bdccad4a2505fe12d975ee363b8a687fe0f395e5a07f12d3fc44eb0eacae5bbbe087cfbc4e259c
-EBUILD upx-4.0.1.ebuild 749 BLAKE2B 85ee83807e32ce8331ea780f0e103fc44a6af3b7a7ce868b033dab90c9a2063be47e66a87639e95c0856db4c84d2ee7f88026979001ed11d52b8f64c1e47ce08 SHA512 9e22bec203f8bf4c69c873156286f9e16c7c725435148f8537554f1dad3ffc3eba441623a22fe07aa5b335b8a7474f21617530c2ba74de32c2506af899fbec35
+EBUILD upx-4.0.1.ebuild 748 BLAKE2B e4562c894bd26240bb21dc4e579aa56c9c6bf27ef1fd00b6c30da6739cea4458a9de9154a7b1bcf5efa4f5fbd01fe595126f48f593ea2c8b336cc1cec84b3343 SHA512 93e947ff8f3794c0e61637e2587dc9acba3ce6f27024c8f1e9729fa4f915eec7467a62a70694c3d23fb2dbc10e9f5f115cbe9831899df2b77ecc8d4fffec15a6
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx/upx-4.0.1.ebuild b/app-arch/upx/upx-4.0.1.ebuild
index cdb9993a3627..44d1747d853c 100644
--- a/app-arch/upx/upx-4.0.1.ebuild
+++ b/app-arch/upx/upx-4.0.1.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 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="!app-arch/upx-bin"
 BDEPEND="app-arch/xz-utils[extra-filters]"
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 5bcbabeee7bf..c9e77563bef3 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index ec4789f50d0b..287f6d87f41c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,7 +2,7 @@ AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df11
 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
 AUX lxd-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4
 AUX lxd-4.0.9.initd 1333 BLAKE2B 72a27d38527b4f0dcca3b111ae0d112bd128cf83ff6261561c5a3bf1c619a2e36672b5eb06ff643660d3cee05a545991ed565be257a56452cbd498a202e1b197 SHA512 933a09e72dbf3bbab8e2148549b6bc08ac0caf2088bd44c3e378ac6041fa861845bfae351c83fcd0920655ceb29ea6ca8023163c52a2fb7499c9bf2958d4dc86
-AUX lxd-5.0.2-r1.initd 1739 BLAKE2B 0713033f39fdeafea5c1c130f49b720ee08b183a257b73d315cb26173d23e5be744d92fc048b8881fd7678a5e740a32f390a2bbbc1d2785afeac41ecdeb9ec1f SHA512 0375cc1214321006060b7b5eb91920098d0392fd6e748e47e50b6fa0deb4d2f364de78d1e5f59ec93e2e832df9ac5801500325bf2b4fa09f5f6e5ae99bf3eac1
+AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537b27f5e9b84eb36e5688b13d74968c865153d6e442f77a67b5794fb429705bea8b40cdef00768102de55b SHA512 73ea4aaee39061565524a378b9317bee4b850f0c28ae3f8a47e905b9dffc4452e71736880391bb74b88ea70bda12874699a1eff56400ac9d7949738f3aa3ebce
 AUX lxd-5.0.2.initd 1553 BLAKE2B 6f230eecda849486e8734e6cff7ae5779f1d25d198d29eee1dd6fc60f75b5b7d81e7c002a2a1cc7f6b61d34243953deca15b7ea2027f4af1a5d418c7bd316b06 SHA512 2369731b7227aa16b012fe6ea6f5deadd9451949ea293a8226ebcbb34581783f54dbd603a26949374459f0a2ff251965bf5398ae7878b10885bdc02b74c0febc
 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
diff --git a/app-containers/lxd/files/lxd-5.0.2-r1.initd b/app-containers/lxd/files/lxd-5.0.2-r1.initd
index 85b27a45e448..7c74c0fdc308 100644
--- a/app-containers/lxd/files/lxd-5.0.2-r1.initd
+++ b/app-containers/lxd/files/lxd-5.0.2-r1.initd
@@ -31,8 +31,7 @@ start() {
 
 	# Create necessary systemd paths in order for systemd containers to work on openrc host.
 	# /etc/rc.conf should have following values:
-	# rc_cgroup_mode="hybrid"
-	# rc_cgroup_controllers="yes"
+	#   rc_cgroup_mode="hybrid"
 	if [ -d /sys/fs/cgroup/unified ] &&
 	[ ! -d /sys/fs/cgroup/systemd ]; then
 		install -d /sys/fs/cgroup/systemd --group lxd --owner root
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a9cd1346b626..4ed9cf64f62c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/adcli/Manifest b/app-crypt/adcli/Manifest
index c5247d709a26..27abed4dfb64 100644
--- a/app-crypt/adcli/Manifest
+++ b/app-crypt/adcli/Manifest
@@ -1,7 +1,3 @@
-AUX adcli-0.9.1-glibc-2.34-resolv.patch 1160 BLAKE2B d32a1b3a02558a17c60b8804c9b8dfe50a4f11645150c9ca39cefc5205d1961834e9a051f8d9d15987b4969f47fef17296f1576d9a523be8e633d38d307565ed SHA512 8123f3b09b38d78c2caab0a6445bf04ea7c3d2badea0cb8b35200403f28fb43b0e3863bf00628c5f3986a30d437c483871fcb50139954ccbfa885d3e8f7c8b11
-AUX adcli-0.9.1-library-include-endian.h-for-le32toh.patch 586 BLAKE2B c48b0dede264e9eb26038ef6c80480229d93d6cde351f0c1fc951ea1efc77d0a18da4d045e01953e99b8ff5280c4081fd2f9a4425c289a4ff01a1e207dc79804 SHA512 8aec26b0f21ddebcf2529ae9e4052c38150d06fe5f4a95f1f011e0af5ae0781b58d40a9b3515178f1986f465ea076516ec1dc9fa81c451fdcc7dd5fe4a9cc85e
-DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e
 DIST adcli-0.9.2.tar.bz2 93680 BLAKE2B b5958b276ee43a0ee54aa922f27ed266d4e9fbd1c86e0c007dac9fcf9cc022e1b3ba043b782fceb00066be2577390773dc99fb8d476a6b5e6523d44d008fb667 SHA512 ae8414a0af389b6845dd92d41446a80a9dc1734b874175323c0e491d99944eab442b95ae6d3a29fc69638d2e73bf8d2c369f6fa50e9ed3968527444b78606286
-EBUILD adcli-0.9.1-r2.ebuild 795 BLAKE2B f00333f24261cd5628e358c0dc597b02f8fdb25274c4770332628bf57c71f296f68fbb26381756f229bbe43f8fee040cdf41864e73be2679b807a2f9c2938d36 SHA512 fab4109877430cfb7233cde305d083ca013b4d128c69ac8dc6cb6ebbf484da4906acff3fcda1447718397386c4b8cf617ce8848897109d1cfe9dd05071b21e68
 EBUILD adcli-0.9.2.ebuild 675 BLAKE2B cd29a60aa1c0e251e29bd7cbd9dd50d547bb17713e09cba4cdee463adb93036b33a8924cde9e22f7167c4c3a091450daba00fbd59d656698e84227af5581d382 SHA512 7c91122c29b743fdd5046164219178e21f35aa04df8f515ed7dac860a366f5d6ac74b9e449b32981662ed420718d7ec4d126b57ac678f9ee11060f24aec13da2
 MISC metadata.xml 501 BLAKE2B 426bc6a40ebda29bd46e41ef626075357d34952234f115d80963c2bc9498b04c23f4d017b86f34934a50a9a480ee794536c53a3b2b68c5f8c4861f630d659d66 SHA512 337f2c31ae03ba2b1e7d6bf357a3376c23caa00434b1cd11634b37a354c7c54dacaa6e72783a6280781f1e9dce2b2fe4d4a753bac5969093fe21b32cabd66a18
diff --git a/app-crypt/adcli/adcli-0.9.1-r2.ebuild b/app-crypt/adcli/adcli-0.9.1-r2.ebuild
deleted file mode 100644
index 4e27d477b698..000000000000
--- a/app-crypt/adcli/adcli-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Tool for performing actions on an Active Directory domain"
-HOMEPAGE="https://www.freedesktop.org/software/realmd/adcli/adcli.html"
-SRC_URI="https://gitlab.freedesktop.org/realmd/adcli/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	app-crypt/mit-krb5
-	net-nds/openldap:=[sasl]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		app-text/docbook-xml-dtd:4.3
-		app-text/xmlto
-		dev-libs/libxslt
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.34-resolv.patch
-	"${FILESDIR}"/${P}-library-include-endian.h-for-le32toh.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable doc)
-}
diff --git a/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch b/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch
deleted file mode 100644
index 105a4c407bab..000000000000
--- a/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44
-https://bugs.gentoo.org/820224
-
-From: Sumit Bose <sbose@redhat.com>
-Date: Wed, 28 Jul 2021 12:55:16 +0200
-Subject: [PATCH] configure: check for ns_get16 and ns_get32 as well
-
-With newer versions of glibc res_query() might ba already available in
-glibc with ns_get16() and ns_get32() still requires libresolv.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS)
- # -------------------------------------------------------------------
- # resolv
- 
--AC_MSG_CHECKING(for which library has res_query)
-+AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32])
- for lib in "" "-lresolv"; do
- 	saved_LIBS="$LIBS"
- 	LIBS="$LIBS $lib"
- 	AC_LINK_IFELSE([
- 		AC_LANG_PROGRAM([#include <resolv.h>],
--		                [res_query (0, 0, 0, 0, 0)])
-+		                [res_query (0, 0, 0, 0, 0);
-+		                 ns_get32 (NULL);
-+		                 ns_get16 (NULL);])
- 	],
- 	[ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ],
- 	[ LIBS="$saved_LIBS" ])
-GitLab
diff --git a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
deleted file mode 100644
index b901796d8d6c..000000000000
--- a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/830325
-https://gitlab.freedesktop.org/realmd/adcli/-/merge_requests/47
-
-From: Henning Schild <henning@hennsch.de>
-Date: Tue, 11 Jan 2022 08:22:55 +0100
-Subject: [PATCH] library: include endian.h for le32toh
-
-upstream commit 938065a751c0876eb837a27f8c1443fc7d0d2551
-
-linking against musl libc we need to include that specifically, actually
-also according to "man 3 endian".
---- a/library/adutil.c
-+++ b/library/adutil.c
-@@ -29,6 +29,7 @@
- 
- #include <assert.h>
- #include <ctype.h>
-+#include <endian.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 66466e13ec6f..0be898a94422 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index b56181d4307e..ee46810c01f9 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -5,5 +5,5 @@ DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de6
 DIST levee-4.0-patches.tar.xz 12292 BLAKE2B b5ff5dbd4e9a5be0aab747ca557cd4e8235057a23ad9f10ec6aad921c4cb5da3086315162dcd0a6db97102cfc573da5ae13e4ca4738cb5875f0bf6f32ae244b2 SHA512 fe8c9f781e63b1b800e754ffda5322a266a51e905e105b5f4b2e604f3ec922f9bf5fb6657b89f290c4ecff80f7bcdce88a2c03cac3082dc5c4d70e23b10bd931
 DIST levee-4.0.tar.bz2 80596 BLAKE2B c38325a04cadb78e2961d26dff605943ccc8214232ce9bf3fb61bf7ee8f91b1e6a43631326e21e38be73d8917a290d92790cc9bc2a4ca7b186b740674fbc5f8f SHA512 7551963018674431167ee2635dccfed1648268c33ec3ae1f11c0ced89dcba280ae1f6d3ab678ad4ba8331e0928b47f6c5953758da7516bae10df9e3edd65c22c
 EBUILD levee-3.5a.ebuild 1018 BLAKE2B 502b4d81c08812e0dab46d5e2b286c40d89f9ac201527c8cb37193f1ab7bf626eab52fde99d5908a59cfeb7787dc36673128ee9253138e643be3a0910555fc7c SHA512 0cf106238f39068a3a50d2c575bc02894839e0f6a0495d606947a7e04b3bf888fe02a13ef2b4f9e0f5d8dc6ed034c2d0608e308d587f9e9cf83213fe86112cd7
-EBUILD levee-4.0.ebuild 1195 BLAKE2B b1eecf2a9e2e10804009e60fe03aa20b113cfea95f5ef5210347b75e156c259e5ec2e12cbc05f239abdacf0894bfdacebe6aaa5fb94305e690d909ae3b1a79d3 SHA512 a4c6023d92beffa8f06af386793b0b18c5288d0f4836f7551b4a4db2521093e8c67bb4be4c89d5f0b208dec80c7ff76622c97555da6bf504676ec0a360ab8f09
+EBUILD levee-4.0.ebuild 1194 BLAKE2B 5193b8a137b2604e2af4c8ebbaf191c1139ab6b3de06db559c2872b70373aed4b4b4c5db67053a46d156ab23dcf6d89961aec79daa9f2ed84d0d3a09f5f49574 SHA512 d2733dace2386f4ffd9a44ba2258849e51d9421457203bf4b11e8ca7c7a59006af86bec8983fd3dc20e14d9cad59de9fdfe112c24b75e5f6973c4b5bf6aaf976
 MISC metadata.xml 242 BLAKE2B c20b015cb3be883d9faecc16d540b477b33c4c60ffb374cc4e85e584bee424dda903e69517686d9836542115cf1468043764402cb34d5d7da383be93f92acd88 SHA512 aad2f2e7f629e1d008638bc9fab674d98efbf08a468b9d9aaba41c15447d0eb9f2cf4d40c25023571734d9a6cb1e2bdfc20bbd9beff1ad231651a00e7e509c8e
diff --git a/app-editors/levee/levee-4.0.ebuild b/app-editors/levee/levee-4.0.ebuild
index b88405697587..892935078c39 100644
--- a/app-editors/levee/levee-4.0.ebuild
+++ b/app-editors/levee/levee-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="levee"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	!app-text/lv
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 1ddbeff3dde4..07d1649630ed 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index e33fa09c3919..ff4f66bc2825 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -6,5 +6,5 @@ AUX aide.cron-r2 5681 BLAKE2B 517f7a0a01bb6eb104d6f758191990c4da518fd15af9f88a55
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.17.4.tar.gz 331783 BLAKE2B 584a385d0a0e80edf0b89eef202431adfea7fe8ba04c774e49dfb7230e766e19a48572e9d6c80386668572e459db9770b04978df484bd49c7de6433657500e13 SHA512 b6dba54fd204e1899d47b0b4139786cbeaa51c388027e2cfc1bb839297a70ae8ad6f37429594a730fac8007d62b4ba5b61a4aa22edbc55cbe986ccfaf5197f31
 EBUILD aide-0.17.4-r2.ebuild 2532 BLAKE2B 9d02b8517ae88aa70b12666fce8b954e640af0d9fd1624d66fdcb8f79cf9db3edabfc73e42a3690d020f0fa1a6ea170d86ac6f4ef7735b9d3ee4fa800edaf637 SHA512 875abd09af1bebc2a25c652667b8f1b0f21f8f78fbabbc65842f9680723714327031cdc28034fe15e48c65fb9237965d7daf3d1c5d2b5a3e6921eacff628263d
-EBUILD aide-0.17.4-r3.ebuild 2535 BLAKE2B 441fad14063e3fee726fbbc2f55178c7b27506b8df9de2f585c869993d55acbe7632855e210891ed298ab2d2ce1dc926df1499c3e8cb239c25c540ba588c1281 SHA512 dbe0441bdc8b9fd74a04c07b50d49bb6e2e86dec8235c3c9b34c5569e4ab77301dbf50d7dd0809a569cafbf24a5b20845e02e1807d7289d2e86ee5457e676ba9
+EBUILD aide-0.17.4-r4.ebuild 2515 BLAKE2B 202941531fa273db05abc704a617313c993a9fbbd66f8af26505ea11b227258e922e0be9e508ed99cc4557af3ee9827355e6eee309411c8119209a811cf864e2 SHA512 66281a42979112dc1719c4c1f3f57b77ffc1a8a8038fd17bfdb452817e64835ae7833f1cbaa2d7c4a2c563a568a1861257aca1e26f069261a7f390ee5dcc3888
 MISC metadata.xml 567 BLAKE2B a3b852325f904e2fbf4a95b67a49ba259583e78f01194bb2dd79851cbd77bd35b5bc786e74c72892adf264471a9a93ae609611252f7e2f1a630dbe1463a80b33 SHA512 c7e14ed38ffa394bd611cb831e509a5f8897c6d394bc78b6ae5074141188ca7bb8aa9efe425930c6db5fade44505fc60f212b0e86bf187622ac8c7443e7a5272
diff --git a/app-forensics/aide/aide-0.17.4-r3.ebuild b/app-forensics/aide/aide-0.17.4-r4.ebuild
index f4826148c544..0684f4728854 100644
--- a/app-forensics/aide/aide-0.17.4-r3.ebuild
+++ b/app-forensics/aide/aide-0.17.4-r4.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
@@ -11,10 +11,11 @@ SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="acl audit curl e2fs mhash selinux xattr zlib"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="acl audit curl e2fs mhash selinux xattr"
 
 DEPEND="dev-libs/libpcre
+	sys-libs/zlib
 	acl? ( virtual/acl )
 	audit? ( sys-process/audit )
 	curl? ( net-misc/curl )
@@ -25,8 +26,7 @@ DEPEND="dev-libs/libpcre
 	)
 	mhash? ( app-crypt/mhash )
 	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
+	xattr? ( sys-apps/attr )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-aide )"
 BDEPEND="sys-devel/bison
@@ -73,7 +73,8 @@ src_configure() {
 		--without-locale
 
 		--without-prelink
-		$(use_with zlib)
+
+		--with-zlib
 		$(use_with curl)
 		$(use_with acl posix-acl)
 		$(use_with selinux)
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 66302cc01203..267371bee4d5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 72866f9ad7d4..ba6cc31ab69c 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -7,5 +7,5 @@ AUX apvlv-0.4.0-icon.patch 258 BLAKE2B 440dfe9904c4ac79408c90c5930e7b6ffc26fdd08
 DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
 DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
 EBUILD apvlv-0.1.5-r2.ebuild 1074 BLAKE2B c372704ea0105086aec23cf4a5ca647440e1a9c3dd90fee4e94bc285e6b78475cf0c7f43edd3b91b4999fcc22f13cb6d978837d9ad2c9cbf3e7ae6b1327a9060 SHA512 7b78bf8e5805f95348e4ae1dd7a6c8027bfc147f2db31b78739b7f343557a918db53831891ed1d0b71430ba2a963f44483277913de5998c7829a70aa7d7e3c5a
-EBUILD apvlv-0.4.0-r1.ebuild 1121 BLAKE2B aeddac373db69494831372b787788eb7c767be5ce64a062d9aeefc9471653a50adc56b66a40f14a50fc0b20df27570d14881729271471b60a7c50a4b20d2ec41 SHA512 9636500877a12fe30cbd6c6b2a9305665f7864f3712961f377b60e055efae001d537b94c4126409951a546eaf7f7a88231c6358f5aef2accac381a0fe4aacdbc
+EBUILD apvlv-0.4.0-r1.ebuild 1125 BLAKE2B aec2471b52af93c8435d3e3949e85687ccc030f2af562a9eba78e488646eb25e0d743d72b0f3acadbd67298edb736b1c52c6da49d158d14b140cfdd5ba8f7439 SHA512 1a9edbe4ffecec6f68d6a574b14a5e09cfa694c5b5785debfbae4c60edd7408d7eaa03ee9bf2db7d7ac9fce9a3e89b1457fb78efb728d0c5b8fd4079079994c5
 MISC metadata.xml 543 BLAKE2B 6e61516bb251d76663ce79b5c55ba6b7ea8fc6c3b1f0bd9ba4524e7b61e9f79d271599395daaeafa90ff2a44ad6755bf1185aa29adc0462bf65d4bdc9129e502 SHA512 c8822ce8ddfec1223794ac415517f17e46b06eb19207a52457b5362076342364fb85cd1873c0b39642f65bc2640eb752fb793df1d26a66140dd8026f81b8ea90
diff --git a/app-text/apvlv/apvlv-0.4.0-r1.ebuild b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
index 13dfc96b4f56..24ab3cda2530 100644
--- a/app-text/apvlv/apvlv-0.4.0-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug djvu"
 
 RDEPEND="
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index bc20a7b7c2b0..8344825640b9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index d17cfddad267..a905e7fc9634 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -7,6 +7,6 @@ DIST Catch2-3.0.1.tar.gz 1020413 BLAKE2B 91c207bb67b9d97191fcd5b3f50df66c7d671aa
 EBUILD catch-1.12.2-r1.ebuild 896 BLAKE2B 185ad88f37e5fc1b66d865be02c20989fd215c5ff50a63c6e91ea3fdc1af497b1f499693e24e66b980c367d387aaa328feffb3e11a37513e0191a43236e6c0d8 SHA512 b076e9b7b233dd067b55592382798d7ad7a85666e46a287ba5de688cbbedc9c6226b39a5c448821bb2fb6ba90c654cb33d111aded9e4a38d82d8d3f402bae1f2
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
 EBUILD catch-2.13.8.ebuild 1012 BLAKE2B be333f775e98a1f82628a9183e10ac4cc5a6dbc1c334c8884f5873088d4d8af2de91bec3676eb898876cd6e667d6ef9b1a14a12147f12c34a1eb50ec1b77df7b SHA512 00fc4467df4a80b480262b0b8b07ab8867a42318fd574519a883bf5b4f10c65234ab14cfe71d00dd2ce75ae6dc47977fef3c625d449950bef905b22971a6c983
-EBUILD catch-3.0.1.ebuild 1047 BLAKE2B 76b6c9cb867584c112199270c2fcb9db56e224ac732acdc844af73c14b0475735d0f7907c07e05c76e57bd1c71606012199f37ccf0ca6192aca118a901f93252 SHA512 c0b1b10af087a47ad654ee5ab72c50e6fdec1330f0bfe59aa4470e111a612917aa36abee31648ca47b4c01871da08b377538d751689a67abcb1f578084e73599
+EBUILD catch-3.0.1.ebuild 1046 BLAKE2B a2da569944dc7bcb77fb51649d5b165fa715a1d3361e732cbbba055367a9dfc75d60d49d0b15dd416ed1f9aba8a197a51ef6d76383b7ac3df0f33fe982429486 SHA512 ce2ae3049b3c8d2f83bda37014da99a090b67a14d193ceded369538671286f86f8d55503c8e5b3c450ee3e29408429bb9dab5613c89170436dce5921ffa09b38
 EBUILD catch-9999.ebuild 1001 BLAKE2B 1b889c57cfbffa4b0afb68c8945bc682ac857a3201a0a2870a8fb8412dd386e2af5a6f4cabcaeab9baeffb18f869033d4c22468b5e9b68c6005de1e1f5ac1757 SHA512 885f95f3d4d569e754e7c9579e432c8a2e78998d9ff1121dbbbdd5d2d9755778fd210f0337421c382c4125ddb42284c763993c78fef86ee1e919c56c5e56f6bb
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-3.0.1.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild
index f9a931f7a5ff..213b34bc0316 100644
--- a/dev-cpp/catch/catch-3.0.1.ebuild
+++ b/dev-cpp/catch/catch-3.0.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 2813d0c76491..c40d4e3db53d 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -3,5 +3,5 @@ DIST rapidfuzz-cpp-1.10.2.gh.tar.gz 284978 BLAKE2B 5d2ef555ce2af009d4bb2fbf3e649
 DIST rapidfuzz-cpp-1.10.4.gh.tar.gz 283916 BLAKE2B e0c3890628dd9303ff7d67d83df5a53f0466ccefd37fca6e56aa8613abc09fc16523e677cee3061425b2bd7720e5c6b26d43f51556ec7b1ef6d48583a1055a9e SHA512 11dfd3b5f869eaf11edcb2c075709416645c89ab6057dbcaf12eb5defd609c33e792265b131942f22e3e2661f8c00a653e23a83eb2ba4bd8c82a7d16960d3b3b
 EBUILD rapidfuzz-cpp-1.10.1.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
 EBUILD rapidfuzz-cpp-1.10.2.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
-EBUILD rapidfuzz-cpp-1.10.4.ebuild 611 BLAKE2B 64462e5b4dff63222e26a0fe864a3f2f5b80f0fff906dbab1cacb247f447d250c0b8caf2f17978ae6906fbe448eaf0a4fc02b6241f27e4a030974e610e78eb4e SHA512 00bc467e0f790dd5a175feadcc94106db7f5221ea0a37a3c88a63ee366440eb5aa57f4020e670517a4bc11d5b0968aea77430d59b68cd8ad00fe3eae919a1070
+EBUILD rapidfuzz-cpp-1.10.4.ebuild 615 BLAKE2B 485f83d37abb7bd958088f0c1b39a0dc3ed17d63699fab43bb243142ebd8f1801362fcf08af87aeb7da93088c7ac19617744af7ee5973596ed3f117f19177bcb SHA512 ac732d42462a84516eed4e4194396d7bcb887d7433e5a2e15fd97d0de2d33f049a28ebf5ffa9ff62e60b7e7bfc0c02d72f690e696da539f6ed5b996c52ce9ec3
 MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
index 633a2cde4a86..c353ee1fdfb1 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest
index 099a44e3198f..7bc7f1a6a152 100644
--- a/dev-cpp/taskflow/Manifest
+++ b/dev-cpp/taskflow/Manifest
@@ -3,7 +3,7 @@ AUX taskflow-3.4.0-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a2
 AUX taskflow-9999-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a28f2d02279e76e8379c55d70c39ded8c207c0ec43aaaacafd2c334c552444ac31b35e4b9b6a9f72afed9c1d82dbd9ae7d5db SHA512 df4cad42467361c2988030ccb66076d621bf60c074634d03686bb4e28f2dbe7e38599a0ba6993e59d35df59e4eb63469b04a447c038824d5c77680d6e2e1bb44
 DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
 DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d
-EBUILD taskflow-3.3.0.ebuild 1000 BLAKE2B f4b9ccf9b2debe643d32247f610eed6c31d20c506351b81dfb6096c8550da4e9da79ec5cfff921a5d33eaf47616e053611447b154643c7300e247c6ecc1b7541 SHA512 c47d83679e4d2d495636fe49b67b38eac01b65d3b4f2a90ab1c2059c5151487f2c7f41140eaedbb4d41b1b7c018b3646826662ed1d8015a99a213ca61dcfacbc
+EBUILD taskflow-3.3.0.ebuild 999 BLAKE2B 405f61b5a518e1697e3b660fab9443be2faa72ababa1ad43ac05ff549ebcfa7d3c9266699911ad424a688d290a21ca1e667f0c6328f8fdfd8bf01b37bf804cc6 SHA512 539ab5cf20898cd77ab9b8e0049f0cbaaa02d5918e33d694ceeafc26d8c04f90b8c50655130c5834d7481f069582c83d0296a2ec7995c117ea301391983a937e
 EBUILD taskflow-3.4.0.ebuild 1000 BLAKE2B 569ac9e32cdb984e614b9842d57b7686a32a399e2b983f6a2abd91a7facf1b5acb496defb13b1f4c0fcfd8ff10d08c54a60c8d806eefa4472869191f99d023cd SHA512 c2d60881a3d28d7f53cc7fa690aa7e7cf02a3f5c0895ed13bc2a06d356ea59f8fdaa97bb2e903ae6887534c9ed23baaca3177894bb3ae541ba18b4f3a3ce981d
 EBUILD taskflow-9999.ebuild 955 BLAKE2B f05ffb61825b989838487a762e6440c88eedc296174da5c7c4288efaa8b42d345a26d14de263662e8c51ebc485b0cc350ad30d5e537d6646183faced957cf953 SHA512 1dabc3aae2c06983a9f1fabb48a9a5f7486d12440099b9588d602989c60cf5b7de792c219589aed4989e5c305abcb36e57a9b58ad63fd78a4967270401a3180a
 MISC metadata.xml 651 BLAKE2B e10047de786b002d6c270c5e7bd4b618a435188c4d15d907e771b7d638832e41e1e7b6d4a367878c8b46a2ea774afdbdf6e5f054e90dadfd87dac3042c471fea SHA512 44ef280af91998e08aa97e8dfb9b3a5d26b67f1416d58c7e8975f12516549a76b9b9763158207add9b581bb08559d95721fedc35984916011e5af4eda155a87d
diff --git a/dev-cpp/taskflow/taskflow-3.3.0.ebuild b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
index 7622706d17f6..27b159cb6268 100644
--- a/dev-cpp/taskflow/taskflow-3.3.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.3.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=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/taskflow-${PV}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/taskflow-${PV}"
 fi
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fc9458301246..cac89fef1fa7 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 930537dac806..53d6d0bd4270 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,8 +1,7 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7 SHA512 f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548 SHA512 7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
-EBUILD mysql-workbench-8.0.29-r1.ebuild 2768 BLAKE2B e60559e2a7ea25723a6b15af251d28a44373242a6439ba02c5366e51e6398d528dd531d87fbff566fc5976820b35b2e34a86412d25f543e7881be21d533855fa SHA512 607eed04308f2200655334cf0b39e3aa9c1e141571ebbf23f5ec5573196667351782bb223ecd740e73c676017efba88d94d46a5a4318b2eb67540bddcab96962
+EBUILD mysql-workbench-8.0.31-r1.ebuild 2721 BLAKE2B 55092d00e595a7897b96b4eb61a83420dfd4e45e8e226ebca338ec4a28bbd2889408b410e583ae6c8e24f11ab98bac51bd1a952ac191b0449e07ad662c2a9dd6 SHA512 b646b9052cb0d286569bd2bbb0bb20dcc58e004f180fb98013bd29f23d57c97845e0c761c682c2ac45cedca4302fef50d55cb53874109de88ce51edf1e73bc7c
 EBUILD mysql-workbench-8.0.31.ebuild 2715 BLAKE2B bf012b7d2ba2648287c08111de4768f2e1d8592a3805275d834a3cc6b0fe8f561bba03f7792edca289e92241b0869cb8660caa46f5d78dec903eb9caa37078ba SHA512 cc1aca3a18e1bccc2ba2264da80b0ac6d3e023df3ad6b268bbb004f0a98057cc88e90eac7ff9f0b43b829ce7b67d0864a10be62e05a0055cddbba749840615d3
 MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
index efc97d50ee5f..c7a0d71a3016 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -28,16 +28,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND="${PYTHON_DEPS}
 		app-crypt/libsecret
 		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
+		<dev-cpp/antlr-cpp-4.8:4
 		dev-cpp/atkmm:*
 		dev-cpp/pangomm:1.4
 		>=dev-cpp/glibmm-2.14:2
 		dev-cpp/gtkmm:3.0
 		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
+		>=net-libs/libssh-0.9.5[server]
 		x11-libs/pango
 		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
 		>=x11-libs/cairo-1.5.12[glib,svg(+)]
 		>=dev-libs/rapidjson-1.1.0
 		dev-libs/libsigc++:2
@@ -50,7 +49,7 @@ CDEPEND="${PYTHON_DEPS}
 		virtual/opengl
 		|| ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
 		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
+		>=dev-db/mysql-connector-c++-8.0.27-r1
 		dev-db/vsqlite++
 		|| ( dev-db/libiodbc dev-db/unixODBC )
 		dev-python/pexpect
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 8293cd41b4dc..7f9f253e2f02 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -39,5 +39,5 @@ DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd77
 DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11731 BLAKE2B 6973e8d04c5157faa3b335ebcd0d6cecfb6f9c2f50de29a2d68b17bcab051504a681183fedbfe4c3d95cd0835c0bb0d8efbfc1c6f796932bdb2cee492c3f45c2 SHA512 560692a0b0f5e17b1cf20ea515c328fcb5ae329c0a9e623b78217acad8647210457d8a509dad033d7ef5a642401d1f505ae9476ac298808d6d6a4a2db19931f1
 EBUILD oracle-instantclient-19.11.0.0.0.ebuild 10765 BLAKE2B 2484cffb6fa28164bfec6fec848a1e1401ba7d4cb76fb6d875d0c3c77a33ff9228b42a85d8f4af3db1931e2b7667d8aa046d1bc89500003b5dc0c0d9f699be8c SHA512 0bb565c38138f795606b06f6ac1cf297b1e6aa10bd84045aad97c4d9f4ffa3d84f73e5b26eaf61543ee158deddf719ac0b8fb36ebe5c3a1dcc99cb8f3cc1d6a6
-EBUILD oracle-instantclient-21.3.0.0.0.ebuild 10671 BLAKE2B 3261e2c7cb6334187dd3622ef39a1ea197b24ea9738cba7ef52a97135651e822e32a1c18423f5cafceeccc2f3fde1c0abd07bba2f15687649294b5f01e1a5e4f SHA512 cf153160ca31cff3afd258e56150be9862f1e5c69563ba27d7480f570f8dce177fc8b21b3aa41101d91099ccf46e35d0126f8625ea746e5f014cdac51dcdea0d
+EBUILD oracle-instantclient-21.3.0.0.0.ebuild 10670 BLAKE2B d78f3d18a427f7633d8d388c61854ca558f9f32f9c61810f18f379cdd9af89c385463698f09382059dbd2774fcd52c9cef4cec4e99a5491df07f28bf31d0f560 SHA512 a2de62ad0a50a738c338aa6acd9495968809d0993c4c202a07ef8cb10e1c93df26e85068376cddb003ca268ca60b22effb733540992cb8c2988d67f150c570a6
 MISC metadata.xml 909 BLAKE2B adaa309170d33386196df2dd8e986fc40ce1ac48de76d8e017c5d98d5fe8341c5e4b41c2200f8d02be2bd8d4e9f395917571dd3bafb2491fe2f0651de43a044e SHA512 ff478c324fb82ccaf512f678af5eac61a4a0a7fed58679e12244aa9badd6e839e7a55fc3f0959efb9d8a41d85823b7adce472bd64554132dcd7f1719b16cc09b
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
index 18e18ca2dbf5..0c981eca0af2 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.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"
@@ -71,7 +71,7 @@ SRC_URI="
 
 LICENSE="OTN"
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 RESTRICT="mirror splitdebug test"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 78b6383a178c..a0235b4a5754 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 7cc5b120cb29..379f90223289 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -11,5 +11,5 @@ EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb6
 EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.4.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.5.1.ebuild 1107 BLAKE2B cb48b2f2b2f508f171c139c335ee61775534adedee72526644ca265e583018c46bb61eeaf5646ac206091df27d665c128622a6818230fc77d69dd593e665663d SHA512 b0a99794e4b908bf316fdb05a87c310a6aba05299dc49c6db873243c6202cd9a6bd9687a9d9203253f9ca7816f7af36edb68cee7b509110b438e966d2c161531
-EBUILD gradle-bin-7.6.ebuild 1109 BLAKE2B 7cfc0537a256cf0cc1dc7d8c369dac854251ee54064108795eae5720df97d9e9b3fac72fc41fb7443e2d0b85396dcd4563f19b56f1e0663c7dbe1e3447391bde SHA512 3160f5aa339b6e75ca0f74f14275323566a4688c84c6ba761d27ba39e0b497e09a3fe6a8790124d6469833fe5d329dc2a5b62a66e195f2499bb11d6368a218fb
+EBUILD gradle-bin-7.6.ebuild 1107 BLAKE2B 9ac3ff19c71f6a7cd34ec37bbbc3f0057bd442aaf99b843225e5a5c29287de0d85c93c47873ced459352e6d1db7bf3f825cbfe29dc900c6608b8b97dc5caf902 SHA512 90d8ef1b9b404cb475734e83b3507d24d1d1ed80ab441885720a364200f8958d3a83218068a0b221950227ba78c09f4db9625b9651d69e380b6808bd3243a9cf
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-7.6.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.ebuild
index 8dedd9ecd1ef..7d07ab9dc4b0 100644
--- a/dev-java/gradle-bin/gradle-bin-7.6.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.6.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
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 3a98a7cb58da..e0dc56cefd08 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,5 +1,5 @@
 DIST mill-bin-0.10.10 71059080 BLAKE2B acca082500d69ad87031dda36df363db38a5559188abc5eeea07b928892812063761566d4b909b3176e8a8a1d434540aafebfea0a46f368216c8273543817b34 SHA512 8bd4b3f86d6c85a15ee62c4ab3640d40f0e08232e1954a246915efa4f98f6cc78938cf042180f401daa1a40dad5ba98d7e3a2c4ecf2af6f0d27a3158157b2e0a
 DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
-EBUILD mill-bin-0.10.10.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
+EBUILD mill-bin-0.10.10.ebuild 480 BLAKE2B e21f94640f4e4898397995d6e3e0da843b3add05198fa17f4b78f2ad7e9a25cb9c7abe305858841b785f5257848abd2e38c09468490901f4754aceb8ecf7af19 SHA512 6999a1976f2e503aa16f5b09baef81f032d5358ddd65836efbb4a5e2795cb45810a6b375da786edb3b3119e843c7b1284244824672ad0e263587689d820c9a59
 EBUILD mill-bin-0.10.9.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 MISC metadata.xml 462 BLAKE2B 33fc9bc7b46cf529c83a5f554abf0ac46f109b72e9060b45c442aaae815c0845a0d5c8aa799ad369a75b5749e6499458763ca1913e88cae0d07fb6233e6badf6 SHA512 bd8831c79f4f164f509ee6415ef922fee49d40282d655785ec289f06da0e4735f3857041911236f2c7cf319f72458807ee5fb8a008e31774d90f03634161a2d2
diff --git a/dev-java/mill-bin/mill-bin-0.10.10.ebuild b/dev-java/mill-bin/mill-bin-0.10.10.ebuild
index e8485c57dfd6..55bbda799eb5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.10.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.10.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
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
 DESCRIPTION="A Java/Scala build tool"
 HOMEPAGE="https://com-lihaoyi.github.io/mill/"
 SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index df954a364203..96d46b94c7e4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index ac3441042e58..2f2ac92d69e6 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,9 +1,9 @@
 DIST swipl-8.4.1.tar.gz 11386908 BLAKE2B bd53355abe63ffde348ed38b0e7fee4bcba4e74128c73904a72ca3ba2021a8b650d08480a643ea3336f3fc6d1d7bcf7651deb1d32608581ce43bc118288df6da SHA512 22806d8abd0b729e27a6d7bbbd0df37af8af21bb186a8de58ec5f9a1d32c9a477838fd10155ff21998737fcc2aaf4711d1d4d5457ce5d62e328d5da032474ee5
-DIST swipl-8.4.2.tar.gz 11396705 BLAKE2B c0835bdbc09171ef00ccc52df14d07651ac42e36ab7bd6e6a72348050d3547a817bec13f2facd8fe051291dc3f0f80f64ed5c8a55e22dba314ccf896434013cf SHA512 1578d01c09ab7ee97c92703f58bab4d0fa5b94dc09092f87059e5002f3e4efbe0b9e85483e8b0a350837825c8b16d3b15c2e75df020571740fab6f1978d69669
 DIST swipl-8.5.11.tar.gz 11480652 BLAKE2B eb812a272d3fbcb181c5cee0dd033f6b7ffdee467bf37c645a98a34ce455189ded7b7c678482e992918477160a6a585ea07dcc38a4aa123eb5f4e04a35dc20d0 SHA512 00387d25548198e0d738cc210a0769130a6ad6fb0596dec04539b1fb85ab8d660a73fec1fe5f5d01878b90e8736018dbb0c8cfd240e1d6b2b62c0bb892f0826c
 DIST swipl-8.5.12.tar.gz 11489072 BLAKE2B 1c8ce7a0386c20be8e2eeac9d31df5862adf78ce0341e31b1ebcc42a923403c28707da12b88ba0773f5ebfdd61efe5a8d38a99f8f20aa47672fd51cdc4fbfb8e SHA512 d530fb7048cd80fa0f07b7b026279915cbb58dd7b8199daafe13c22659c5ffeac62168bcc9208c7bbd72616f54d453f5161c1fc08bf5497ba87abc12e5e8e7df
+DIST swipl-9.1.2.tar.gz 11827220 BLAKE2B e4bf40d1b4d0c48af5e630728208ca849b9a3d0f4129c827b98cd8d666b934218bbbee4c357b67cdd72b9e15046b70a873ffd9e31eaacac620a9aba6a7aec7fd SHA512 d47375c21ed33a2822b9df294a709141fc2e1f0aa61a297bd51a504f6f7859a1deb0ea6705d30b6f8198c71f440b176c7259bd83bff1ac5393ced77fdfbf564a
 EBUILD swi-prolog-8.4.1.ebuild 3177 BLAKE2B 2c3984b0a9aff83643922c5d8ad4beaab21a6ddcf6cd4090e23ad4a770d104e6d3f2f75c9d4bf910e720e23eb5e1f73ae999c5dc7012c2b0ddd660171478f9c2 SHA512 488763c483a760a468319742bca8df6135dbb8f754176dfc21b337d051c48f42d7ceddb210bddaaa3a599d5b162a474694bfbb8a68f16d146496d1d087ec9c29
-EBUILD swi-prolog-8.4.2.ebuild 3250 BLAKE2B 7f9187ceaa1e9321b65451ccd79ca4840d9eeea297af79d8ddf8f1e54bd69a6abf37e9cda66ab991345d0c5802833a34f1381b7fc28f542645fa59854a71b489 SHA512 1863da90675ec911ae3a9c5d66d618a2aa12ea324d2e928873a313c8b2842330bf5657ab25fc74137af64826635fc2035ca1f0d565eb806ac6c37275c433d48c
 EBUILD swi-prolog-8.5.11.ebuild 3191 BLAKE2B 4a7e883cb444a54f71acd8fa37bdef88b900c0dcaa948a9429ea1d320cb650c1fa381a0780570f69e96eeb341f20d54ec4715700aa645255c5d140c6dcc798bd SHA512 efb05a84a5876bda9c55970f98b3a0195fa34a495e1c7b16d6058d18c9ac1091e01e975f0fc00d3416b84bcfdc086268e5e3c206fdbcf49e546a921bcbf47785
 EBUILD swi-prolog-8.5.12.ebuild 3249 BLAKE2B a0fee95fa73564d28ca8fdba9293ab89d6abb64c029f9166a181aee4c4adf0afba0bda99cac671b1b61c564f0cb4fac2cc8941010e38384cc63dfdef37fe82da SHA512 df2624efb0fc37a7a445860c62599bbc615eb4b3e90b172b0721985be178e851e0ff81ee0c8dd1adab061a122ab9bdd5408b0d5be13e821ca73e14bc1c5fd847
-MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
+EBUILD swi-prolog-9.1.2.ebuild 3908 BLAKE2B a5675a9fc7e275280f914a5a32d88ac05308667a3fa683e19d12ebb0cb7060152a1142416a4851548c0c0b5894341116ec0010e9ec41b85f28eb7d8923b4fe63 SHA512 f2069e7488df16ec00b050f75b230611c6241068351ea32704d293bd989462f9649563e9834d6ce4ec17130fedbedaa84c049703c41335e31039125c6b55a597
+MISC metadata.xml 835 BLAKE2B 74eb565d22c6f7767dcb593fddff34fefff136f81558f674d62ce259d0988b15294c9947fff4b594e800108906a7f024c36c0b52d2ce090e86da0cb88cde163c SHA512 5f337a4020d75a08af811b76661c6e0206be0765f3a3a467947465217676665c5ba8f19d1914435d072e1d12383405801696342259984e2a0e72e80ad5073dd6
diff --git a/dev-lang/swi-prolog/metadata.xml b/dev-lang/swi-prolog/metadata.xml
index fb3da4793ad9..f346160e6877 100644
--- a/dev-lang/swi-prolog/metadata.xml
+++ b/dev-lang/swi-prolog/metadata.xml
@@ -7,7 +7,10 @@
 </maintainer>
 <use>
 	<flag name="archive">Use libarchive for extension packs</flag>
-	<flag name="uuid">Use ossp-uuid for UUID pack</flag>
+	<flag name="cli" restrict="&gt;=dev-lang/swi-prolog-8.5.20">Add support for CLI interfaces based on readline and libedit</flag>
+	<flag name="ipc" restrict="&gt;=dev-lang/swi-prolog-8.5.20">Add support for TIPC inter-process communication</flag>
+	<flag name="pgo" restrict="&gt;=dev-lang/swi-prolog-8.5.20">Optimize the build using Profile Guided Optimization (PGO)</flag>
+	<flag name="uuid" restrict="&lt;dev-lang/swi-prolog-8.5.20">Use ossp-uuid for UUID pack</flag>
 	<flag name="yaml">Use libyaml for YAML pack</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
index fc8d61141e4d..e7f92df2f131 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
@@ -1,58 +1,78 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit cmake desktop flag-o-matic java-pkg-opt-2 toolchain-funcs xdg
 
 PATCHSET_VER="0"
 
+MY_P="swipl-${PV}"
 DESCRIPTION="Versatile implementation of the Prolog programming language"
 HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml"
+IUSE="X archive berkdb +cli debug doc +gmp gui +ipc java minimal odbc pcre pgo qt6 ssl test yaml"
 RESTRICT="!test? ( test )"
 
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
+# See cmake/PackageSelection.cmake and cmake/DocDepends.cmake
+REQUIRED_USE="
+	doc? ( archive )
+	minimal? ( !archive !doc !ipc !ssl !test )
+"
+
+COMMON_DEPEND="
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
 	virtual/libcrypt:=
-	archive? ( app-arch/libarchive:= )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0= )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
 	X? (
+		media-libs/freetype:2
+		media-libs/fontconfig:1.0
 		media-libs/libjpeg-turbo:=
+		x11-libs/libICE
+		x11-libs/libSM
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXinerama
 		x11-libs/libXpm
 		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
+	)
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	cli? (
+		dev-libs/libedit
+		sys-libs/readline:=
+	)
+	gmp? ( dev-libs/gmp:0= )
+	gui? (
+		!qt6? (
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+	!minimal? ( dev-libs/ossp-uuid )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl:0= )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+DEPEND="${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
+	java? (
+		>=virtual/jdk-1.8:*
+		test? ( dev-java/junit:4 )
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/swipl-${PV}"
-
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
@@ -62,14 +82,21 @@ src_prepare() {
 		eapply "${WORKDIR}"/${PV}
 	fi
 
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+	sed \
+		-e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
 		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
 		-i CMakeLists.txt || die
 
+	sed "s/ -Werror//g" \
+		-i cmake/GCCBuiltins.cmake \
+		-i cmake/Config.cmake \
+		-i packages/ssl/CMakeLists.txt || die
+
 	local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses)
 	sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
 	sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die
 
+	java-pkg-opt-2_src_prepare
 	cmake_src_prepare
 }
 
@@ -77,57 +104,67 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 	use debug && append-flags -DO_DEBUG
 
+	if use pgo; then
+		CMAKE_BUILD_TYPE="PGO"
+		append-flags -Wno-error=coverage-mismatch
+	fi
+
 	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_DOCUMENTATION=$(usex doc)
 		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
 		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
 		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
 		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
 		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_TERM=$(usex cli)
+		-DSWIPL_PACKAGES_TIPC=$(usex ipc)
 		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DUSE_GMP=$(usex gmp)
+		-DUSE_TCMALLOC=OFF
 	)
 
-	cmake_src_configure
-}
+	if use gui; then
+		mycmakeargs+=(
+			-DSWIPL_PACKAGES_QT=yes
+			$(cmake_use_find_package qt6 Qt6)
+		)
+	else
+		mycmakeargs+=( -DSWIPL_PACKAGES_QT=no )
+	fi
 
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
+	if use test && use java; then
+		mycmakeargs+=( -DJUNIT_JAR="${ESYSROOT}"/usr/share/junit-4/lib/junit.jar )
+	fi
+
+	export XDG_CONFIG_DIRS="${HOME}"
+	export XDG_DATA_DIRS="${HOME}"
 
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
+	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
 
-	if use qt5; then
+	if use gui; then
 		doicon "${S}"/snap/gui/swipl.png
 		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
 	fi
 }
 
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	use gui && xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gui && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
+	use gui && xdg_pkg_postrm
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ced5c9806459..bc1e341dd709 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index fb2bbb7bfce8..21a7746c82c1 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -2,10 +2,12 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
 EBUILD libclc-15.0.6.ebuild 1667 BLAKE2B 01346327892acf0ab7b2753f83add55892e436fae55d842d894cfb605cba00e2b163827c04b59a4607e86b83fad00ef87176cbfffc4778e473adef852272b980 SHA512 f4e391d4ceabbe2ea288425e78f4349394ce9849a05f2e1966196f260b0fda4408ff27011bc4a7c53fa8b9fdfe4b6eb5cb5fe03bba077a85405595569e462876
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 EBUILD libclc-16.0.0_pre20230101.ebuild 1647 BLAKE2B 9fb55addc6447a9117849a0ab3975ce2f9f07f770a46da122606d01a521d0d6c9a23aae7b97f4a2309dc835791cf62c8d24c95fcacb3d0f4a07c1f1ad47794dc SHA512 456561adfad9d244ed90e17c292563fd7c8a2cd3a69ef128be5ec02b0e1d41790ea28c70cf46db9ea6b02e21788dacbf7c255bee658cc8dcefc4bde3f77d4b21
+EBUILD libclc-16.0.0_pre20230107.ebuild 1647 BLAKE2B 9fb55addc6447a9117849a0ab3975ce2f9f07f770a46da122606d01a521d0d6c9a23aae7b97f4a2309dc835791cf62c8d24c95fcacb3d0f4a07c1f1ad47794dc SHA512 456561adfad9d244ed90e17c292563fd7c8a2cd3a69ef128be5ec02b0e1d41790ea28c70cf46db9ea6b02e21788dacbf7c255bee658cc8dcefc4bde3f77d4b21
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20230107.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..214bdf463d72
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.0_pre20230107.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_{8..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=""
+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 f5f38eee1a85..9047edef9b40 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 9812420ae657..9ba2ce77e3b0 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
@@ -10,4 +11,5 @@ EBUILD llvm-ocaml-15.0.6.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424b
 EBUILD llvm-ocaml-15.0.6.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 EBUILD llvm-ocaml-16.0.0_pre20230101.ebuild 2516 BLAKE2B 34f2452e7772ab082b128092188d62b75972a86c30fb04b989c771a48fba24cfc407644eb9a3b6d461e8114ce556449b49747e246f54fc80c4251022a6e0b54b SHA512 0f730c5c812bb15d7e61d348993d32132d65b22d9d7550fc7931ac73f81cb10f4ecc801eb54eb56c270558737a44bc13a4250bec19bcfbc56794b35f49c65d05
+EBUILD llvm-ocaml-16.0.0_pre20230107.ebuild 2516 BLAKE2B 34f2452e7772ab082b128092188d62b75972a86c30fb04b989c771a48fba24cfc407644eb9a3b6d461e8114ce556449b49747e246f54fc80c4251022a6e0b54b SHA512 0f730c5c812bb15d7e61d348993d32132d65b22d9d7550fc7931ac73f81cb10f4ecc801eb54eb56c270558737a44bc13a4250bec19bcfbc56794b35f49c65d05
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230107.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..32a62fa4b1c6
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20230107.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_{8..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=""
+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/Levenshtein/Levenshtein-0.20.8.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
index 6f4971279261..4362535f997d 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 18e82516558d..2c739c673274 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -2,6 +2,6 @@ DIST Levenshtein-0.20.8.gh.tar.gz 36607 BLAKE2B 8c35c47768a21651c7922151f9a4ba24
 DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B a56ef0d6431d51516f69a6a00dabec4681aa3e999fecfd904d34fee2dc1d4e8fca5ef47af6d388b0dcb72a9a1664f4d8ccb4124496d6ddb1306c7194aba06d1a SHA512 12021fce00cc5bb951cdfaba190a14f512bab14cef53b430504400bfa99daa91faa04a819fef750c7e558b0a99698fc52c8f52294d4ce47069efdf30a2d9600a
-EBUILD Levenshtein-0.20.8.ebuild 1033 BLAKE2B 3a1f66b548a91c00567e687f596a8aa7fb6364ac07a9794d7e953d4db5ff125d62253569ac6ba3aa55fe9084da8b486cbe1b90760ec76fc7e69b97d4ccd22657 SHA512 d61eec029da84a0f3e7fae4d97cf49ed1e0cdb0cbbe0866c6573d59a6ac130048010552c76671418dea0bba6241e3473ce0d69e6294fec0ef5aa2ece41f52f7f
+EBUILD Levenshtein-0.20.8.ebuild 1032 BLAKE2B b2e8cb02d21dc179169e74f5561fd5399af6eb4602860cb4c6b1db5d4da99581b83ed4db645bf0d3a38c95dc88ad48ba47c749cc9dfb462fc2af7d178796bdd5 SHA512 fe922091c35bf0772e171321df30dd732aacb05f2c541347a089d7c1da9e3113ec34bb7f19454fe42b54e9f107c90b23d363fc955bc5be6574a354de48fd0b1e
 EBUILD Levenshtein-0.20.9.ebuild 1039 BLAKE2B 474340fffa7fac85662b3e1e171f3fae42b08fb0d961b45d5ddd69ef99e6552f312ff1ca9402f3c7fe0c18c637cd1735d41e00c8a94b1dd39d8d18a18d6abec4 SHA512 84e60aab0277301e530a1e7d1355c7e86aa6a4de644a7720b5fc0aaf17a458c425f6489e9c0e98334b9555c8064a6d510a880850d4fb7f9d24ddba00e8bccadf
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8a4397fa6e62..cad503e3b4df 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 62b067df4418..2ab23de63b59 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
@@ -10,4 +11,5 @@ EBUILD clang-python-15.0.6.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673
 EBUILD clang-python-15.0.6.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c314018fa23a5ec58cef95098f70f979fe0ba7c6f0880bec50905f084a0d9a7091428ae930683aeac4204c9999a4b3f690 SHA512 7ad0811bedb1938316a95528bae46f20c9e00051a41ed545173de4f36975247ce1a5b1f648655acd0bf3474377a8a32f8c1d573e036afc503cc6a30e24dbd0e1
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20230101.ebuild 1145 BLAKE2B 3811618cd3f1c99a5079fb7eeabb1b1b91732e6e6ce3149a414b8a645098c88082698b0370b4112690c1fae3ac8915b7f340d249e032302bec01dfb1a5a6dae4 SHA512 2e29c2c85e9dec495bdcb86a33cdab95284f8cfe0f4d859ddb256b5946469534975034710f12016cc87ebbb2071ca92e16de8c72d98ac6db3ba9f4bb34c12f56
+EBUILD clang-python-16.0.0_pre20230107.ebuild 1145 BLAKE2B 3811618cd3f1c99a5079fb7eeabb1b1b91732e6e6ce3149a414b8a645098c88082698b0370b4112690c1fae3ac8915b7f340d249e032302bec01dfb1a5a6dae4 SHA512 2e29c2c85e9dec495bdcb86a33cdab95284f8cfe0f4d859ddb256b5946469534975034710f12016cc87ebbb2071ca92e16de8c72d98ac6db3ba9f4bb34c12f56
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..da0feef4cef2
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.0_pre20230107.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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=""
+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)
+	"${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/lit/Manifest b/dev-python/lit/Manifest
index 8d727d67cf15..b7b04fbe2d0e 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
@@ -10,4 +11,5 @@ EBUILD lit-15.0.6.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505f
 EBUILD lit-15.0.6.ebuild 914 BLAKE2B cbc8b1b6aaad9330b210d9dd053a9af083380e829afec784464c1c017ac64461c2b07db61c7c645d4059d1c235a85290cc100bba4b99db9f7f3deda3373a1d15 SHA512 7f47b3e0ad072444ccfeb9dab174d5faebe902b62c0bc5eea875b69836755784484111570540f7b29d2439858fa0a07950c61741a3093cd2e7fc99e9b5946ec7
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20230101.ebuild 877 BLAKE2B bf6fc27b120a104e7cd4e69d8694840e29bae1d5e0d747f8e462370b19bd35ded983e76b7df5bc880b201317c88ca8394500804fcf239258b941e6a261aa4926 SHA512 93fb8a38395a6e2bc285bc966722d456e5bceffc823dc42072ee855aaf992377f8a83ae45f3d02bc5eb3a26ae48d6d7d01f55429ce8162c42643d9084185885f
+EBUILD lit-16.0.0_pre20230107.ebuild 871 BLAKE2B 6124405a203907ddafc356f37ff56527b43cbf22a0e222dd0a739029af4e4c1e2859f9f1f010fd6705a7682ab80a689bd157d7e061ad0b282540125b030b6ed1 SHA512 9a1a8c212ace19f703e8ef0e83d191a0d49b95fd789f3783daac24712d7f738baca771d302592ab9e7c808aee565e44ea786daf3cd4268b31f698c604d81a76e
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.0_pre20230107.ebuild b/dev-python/lit/lit-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..4950a6292b82
--- /dev/null
+++ b/dev-python/lit/lit-16.0.0_pre20230107.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_{8..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=""
+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/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index ae8c4a248e2a..698f0ffcb721 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -7,5 +7,5 @@ EBUILD rapidfuzz-2.13.2.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b9
 EBUILD rapidfuzz-2.13.3.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
 EBUILD rapidfuzz-2.13.4.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
 EBUILD rapidfuzz-2.13.6.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
-EBUILD rapidfuzz-2.13.7.ebuild 1106 BLAKE2B 2313fa07af61260b6cb462fe18f50a04454e8cb2dfbf1e68b78523bc5ae9b42c6c4fbb4ec41496cc6bf7e417a217edbd1d6c8e8e360770f7d6e96bd9d4c2a081 SHA512 b1cc7b4a284125a0ceb4cdfa1822f7d28328e43d96e8fc3f64fe5e63995823155a551b993f3044edf3479a3ba27728ab430db8a8d0a93010b8470ba4b7dc5bcc
+EBUILD rapidfuzz-2.13.7.ebuild 1110 BLAKE2B 785a85f308d3603f7915d5ad4c14598178d931da66074a1dd008d5aa7380139b8b9434efd490c6d47cd68e8318f82d61ef43b683aebae45aec92226748bca5bd SHA512 cdba322a98c048704ed0e8d015fc601a3efcf1b6f2f093c1755f884e5c077f45e0713803143b3c50a0c770c600717d4097ee56ac942dcdf11102acac148052ae
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
index f79473694de5..a56a8a0b4491 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz_capi/Manifest b/dev-python/rapidfuzz_capi/Manifest
index ab019b3765fe..7cc57326374e 100644
--- a/dev-python/rapidfuzz_capi/Manifest
+++ b/dev-python/rapidfuzz_capi/Manifest
@@ -1,3 +1,3 @@
 DIST rapidfuzz_capi-1.0.5.gh.tar.gz 5908 BLAKE2B a5f3c27c2292800527f0e0558e0f25525c2865a6348fbbe36da8d5a96e5524c68154bfba8dbfc3c174f759dde14a95c64e47dd6669166beb035bd1126741569b SHA512 b62c6fdd0e5d0804f7c1ef6f6b5e007afd8439720071fbdf1440232c62925e794a6ae33774a33ef745ebbd4ef956a85d2bf60934a7d568d39d1e590467f26bcf
-EBUILD rapidfuzz_capi-1.0.5.ebuild 564 BLAKE2B dd70d1cec407b7a5163fc04bb4b02371e2dd4de7865b7bb3e080d3a991eb63ead3a843275695469761d4bdf5353a8a4dea859979c91691a36d46b94593f7e779 SHA512 bd5bd9279e7e0aca54aaec040700fabf2b2b1d3b7bbefab8cc1174ca55b5a7e09e7ad28170f941e6a07f9d52aa47290baa010aaffcf29b5c3e278cb80cad9cad
+EBUILD rapidfuzz_capi-1.0.5.ebuild 568 BLAKE2B b9ad6b4b5d83e13a0ff41d99b40820e985dc635a6e1411eb404162fcc7bcf9f235470833ed6782670af46fb4fd9ad11f170790bea6113e2e032294ace4e58863 SHA512 f135bb0a575616236c0c72292225e5528a2e0dc21462835e2b7a209dd5f7ec4e43983a1d94949f1994a7ac03dece9d640c93877c1e0588ec856cf068b26a74e5
 MISC metadata.xml 408 BLAKE2B ef5cb671e756eccc17d4bbbd4aa4c3fc0ac5931994750659ee9a6746bfbcbe5e3d283764749531fa2d7e46afc8eb14acc234f15f539ad0d1b7186b56ccff0a84 SHA512 fa723a5d815999bb2f0e12369aeb64726164adda4c89f2ed8b1136985f3843a9cb62a6250f7fea811e45c1ee1a3aae3d7911954955b8f32bda3af9f976bc6650
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
index da8c0f1e873b..f0786dd356ae 100644
--- a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0f95742371b6..8d7dcf2e8c8e 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 471f34c10bf2..fd07569d7300 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -8,6 +8,7 @@ DIST bundler-2.2.33.gem 401920 BLAKE2B bfdb62c86449683d479f735ff6d65d33576ff03f1
 DIST bundler-2.3.26.gem 411648 BLAKE2B 5ea0ff86e0e09bf0466e4bb21502a13519515f312b3df62024f0d293a51237eb30a5b3c349fb867e9b8dbf0e50ede5bc12b14c5cc6014a717d55534bf46d18f5 SHA512 03c6310c63ec4d313d48ecb15e784ae9cb2d2cb2cefc75752bbb7c018eeec45d534259646d525e486cd746ee8c179312c167338875e13f826994617622d2330d
 DIST bundler-2.3.8.gem 403968 BLAKE2B 80640d5032034be0511762c60832c85c65b7b97397eca49d2bc35977a85625104477606abd6d8b286dd4697906a5d97076cac30f7ab58f45b258ba1e637bbc2c SHA512 e04bc9762135bdab7eb70bde4f21289375b7ea9bee795775dc614f31a6f145a5406396dbc638bdac778ac7c39d60c953e5ba38376b8bc72e7a8cfd1c40b25585
 DIST bundler-2.4.1.gem 408576 BLAKE2B 8bd574023dfdffa9ab02b4a0f86c922cf3c8bbcebee3b9ad77b9eba748a81219f8fbccb3eac667922e7dc23f73212e9f42f04eae6ee99b1869ab40537365e8f2 SHA512 244cf923838c9e2001fae5533df66457953d93943fc9a2c587a1d36b1aec3385a7cd50680bd0fe14e8abb2dc11b11a8636a1e1c0d36847c24080f63edfe8b1f5
+DIST bundler-2.4.3.gem 409088 BLAKE2B df6991e9f4ef80899ac691d7a0ece268980bda7497482b207eba8e5e0f957fbc7b06f11755932f527d80ed199e79292b1a720a06f80b38d95685a4e6f2316e27 SHA512 a232c40656d05031b39390c72ae71596618e87d92cf86f1db45d75993ff8cb0625fef8055540ef14a8179211bdf17804028468c568e261d3dd43c0a5405ed4bf
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.18.ebuild 904 BLAKE2B 5dc132ff96e618068a474a08c11a7eab6d4f0f645c0b390ebae293c5c5175b97e11a6d49e9c26da5a7478176e8a60c80c4d2817fcaee97438b16947aa8ab501b SHA512 18d89b36b2c5dd6230bfa11a81de23571a11597e28f233c99418a0e69f92c511222a6b2bdc37086643e6476e4049e5cb4ce16e6e1c1d649237768b29d6265423
 EBUILD bundler-2.2.24.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
@@ -20,4 +21,5 @@ EBUILD bundler-2.3.26.ebuild 880 BLAKE2B 5bf0fa758a73c61eb40f7a5d4c20280b4326034
 EBUILD bundler-2.3.8-r1.ebuild 911 BLAKE2B c79b33c6fed601500611860c19526e597d88886e5b2a5bc6c501ef05cd8a7fc32e181e6ebbca76dca91c7a5b13753e25d8619d5f26ca7410ced8405b60a6ee64 SHA512 27c7ee78fd96610453bc8c80e42ae1d984c50fced7ca925a7bfdfeafcbef6572235c56fd492ed1e041dcd8792a964183271828283e3b80662b0fd9833d7e1e39
 EBUILD bundler-2.3.8.ebuild 919 BLAKE2B f360aaf6bcd38d0665c41f6e302a5da0281dbb777c00d0b57394285a31ac895204e34fa73c9ce907115475ffe8cc02664a1e2743cc1f59b8fc4c591b9528b654 SHA512 4a33a068940ce9816e66686c0e1141dde37bb898edd63b5269fe1aafe2551cd16a8dc373978d49f4bb56cc77159110ee1da779731984e0da428db8819354431b
 EBUILD bundler-2.4.1.ebuild 880 BLAKE2B 5bf0fa758a73c61eb40f7a5d4c20280b432603485440cb1b0ab86a71f1c03c731f16d33cd642454377f18ab33b3a213c7b1bed0d23d277cb387fef1d852f9bd1 SHA512 e0cf7e44703096b2a4a883e75a53696809d55f4b50858c9f11add5c6ce071e9775d6806c7c1a66346699a229cbb2420e249df079bdda47e614e45ac92f36dd1b
+EBUILD bundler-2.4.3.ebuild 880 BLAKE2B fc5f95db9e44504a3ab0339bb8eef2075ddb9bd23057cf875296b71dab1a6aad97ef446f7e7b539d7409778b2bf2d598a857793b43a3256104bbca51c323676c SHA512 06f0df186f59a3553cc0c66fe4dde95d99d04236b3846b0eb03487994ab7b123278cc63bc13abb9bc4c4bd518a358c6153c30836b47f7d8555cf473531aec4e5
 MISC metadata.xml 343 BLAKE2B 2526cf508fc4002f02cab371f22490c1d7316a06ce2e18eca7563cc672a935e829afd850c99fb6cf8069e8193f1739a4dc6fba3d327b339c564183f43d008f1e SHA512 495c6e0c73b0574ef644c13f2001dcdbc785f07a036b8220e8982fde16983aaf816440f33c060bd7cee9843183c8059c930ab7b5e5cfdb847e2671bee8c33c97
diff --git a/dev-ruby/bundler/bundler-2.4.3.ebuild b/dev-ruby/bundler/bundler-2.4.3.ebuild
new file mode 100644
index 000000000000..1ac24d655f96
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 9454ac9b87a7..45950e6907dd 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,7 +1,5 @@
-DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
 DIST curb-1.0.1.gem 90624 BLAKE2B b54404e0ea81ccb2ea03e262abce247ca4e0db1a5208cfecd57a6c0e423c36b282cdaef7db9bd3fe70d3fdb8cfa60c6085be04ff78daac71e83b63fe25bfef06 SHA512 78eeef1b3a778c64517243a25ff82889cb4703589d27f08cff6e84d39a806610a80bb749c51ddba93a82e02a18797978b55ebc4643948caa8900e76d343f4bc6
 DIST curb-1.0.3.gem 91648 BLAKE2B 8f819a5411c92e353cee4e1ef87c65bed67783606fcfe238a736ca5110b790d942e1cce6079508b854ab8b22e0079e8240e3d417f9e9ec6c2bef39878321ab55 SHA512 6273acd74121e3a4e42f7cb89eff4bad9511c7cafdf5e046773ec988c816003531877f6e5e756fab73296cedfa4599693014b6b65e9a9001a6e3c4875f53b73e
-EBUILD curb-0.9.11-r1.ebuild 1391 BLAKE2B 462de9fb6407457864bd56b2a0de59bb4723da435455b1371b2df8acd349e4a6424909897521e0a0dd7fd75520af11346bfc3193cd572247d64beca032a7ed2b SHA512 59706c93edaada27f54a15cc8ec7735b28d05a7d2736dbf0b00bf15b5502850466fb45b0278c735655493b5128e0813bc80b0cea2253541434b8611733deb222
 EBUILD curb-1.0.1.ebuild 1398 BLAKE2B d117b3d0e525c5fdd7d80dc53db1e6cdebc34a3a8beb4ca7d04907abe9150f43e7801b777b3860936b55028a42e62d9a253157c55a2cfd99cd5e38c341a5b30c SHA512 328b2c7db57cbb6a62c3f9be7917dd2cf528d305cbab63b6eba49aef0abee1889c760ea224886cf3b0d16e7474334c55bbe020883af30d9afdb8f11fe12fbfda
 EBUILD curb-1.0.3.ebuild 1392 BLAKE2B d2514dda2f4f51c5e9eae3fd0c43e41a3fd95ad2d01b013f956ed379be3442eaa3bb9e0a3af5f68336a7cf6607998f1b54748268173eb4e2f0bb3a9eaaa01010 SHA512 0cfd0c105f49bff419ce04ccdd2e68433209082689265cc07e86768ff24fbd880fed4b60a8b2f32655f11b548de702ca051eababb7e8da85a73493f06c87ed4d
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-0.9.11-r1.ebuild b/dev-ruby/curb/curb-0.9.11-r1.ebuild
deleted file mode 100644
index 884ae6906585..000000000000
--- a/dev-ruby/curb/curb-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="https://github.com/taf2/curb"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
-		-i tests/tc_curl_multi.rb || die
-
-	# Fix test that expects wrong output
-	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
-
-	# avoid failing tests where failure condition seems weird, no
-	# upstream travis so not clear if the test is indeed broken.
-	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
-
-	# avoid test requiring ntlm support on curl which is no longer available in gentoo
-	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
-}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 18a867ba7c60..338202fd3699 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,5 +1,7 @@
+DIST gettext_i18n_rails-1.10.0.tar.gz 21434 BLAKE2B 7b754b482c527593589f43b2547b5ed418db09bce255ba8e65523c7bf46c5402953990dc5941b06af8745a25c7840358e4beabaf1a2aec295a7763484bce8818 SHA512 0016dee43253fbf1fb712d74a1fb85c28d9d23b62af2ab16dfd4837f38749e4be8901b578b6a1e6ecbcf7476114e15873b4c073c5c0bdd7417e1d78515a3e4ff
 DIST gettext_i18n_rails-1.8.1.tar.gz 21942 BLAKE2B 7925bfad0e1033fd363ca2c376594ba8ca6a7f5c1da940c680acae53e4b3902d7c07828b6023ed208f559af1b9ded7933ffae6b7385e066c0494aa16cc728256 SHA512 711c15620a23c070f47d4846f48b74564bfc23d27e9757936b432c1b3c534121d4cf58101fe533bc58b7d3e33e899134b92cd119e2cd2cd3eb39f54e93e394e0
 DIST gettext_i18n_rails-1.9.0.tar.gz 21389 BLAKE2B 12c98c76f6e782d35957a168d71ba0ac6cbfa492954716366fc9c41cef1ee7cd733f4e352bff0c28c9ae873445729a30c572053eca423cfc272b4639e474a36d SHA512 dd271828120a4f430adf2d2f63d3c7c294d4b236d665b1e64599ba0c3e40114afcab0cd485fd2388e5747c4edb40d12de69e08464b36b160e216326bd112c232
+EBUILD gettext_i18n_rails-1.10.0.ebuild 1074 BLAKE2B bc07e74861aeb3fc9695625bc637c3e0683b1bca9684a4ff957af800f31e11d4fc2a30f9284e283ba328593a8eee1c4f9d95ac5f8320c7b77c592a48bad17543 SHA512 ce26fb8f0a3cbffb976f47de7dc98d44838c7fcf11080216a7447b0f1fd3d895577be3dfaf355b7501a1b1c8388ef900e5f01885dd463027f9f378579fc2c907
 EBUILD gettext_i18n_rails-1.8.1-r1.ebuild 1063 BLAKE2B 181e93a46b69899a8eb5fd4fd835c9e58d1c517a6ce7c5f7d82ec79e957405483fdfb3b902867a1c97f5c1fb05d1559cd404474978c462c71659a530e9e9cb7d SHA512 ae1b8a1b252269b8839f513406b38970b0d510dbb9a1af912b75905c1c070dd6d7462f3afb58cffebdb42dcace998262b86c90d60d8b4259aea9aac72475a2ff
 EBUILD gettext_i18n_rails-1.9.0.ebuild 1074 BLAKE2B 2b4cf0f59edec41943ad19be74eee123c7d6ca3ec558065167f990cc34a0ae30499a96cab628afbc0fe3487268e1d97577e83712817ae779fc851b0abb12dee1 SHA512 62a8f812120798abe3432407a58256500d9288014f18d853050f8c807cd2133f9672add0f7738d5375215418fa5360dbb50a508dca7497bc6c33167f2b38659f
 MISC metadata.xml 353 BLAKE2B cfdd814918fa7d75f7e209c0efff8c8ecba9154a8977cab4d64412c2cd09a52553d5b25050c25535fc59c3dfc11255ab9fbff703536da85a7b0b7d29390cb7af SHA512 12b6cbce3229f093d824a6d1036a44ee7cbb7399dc29db9eeaac72797440d222f65bd1efafe097efb2aee9ddb2881df54bb93bb336d0c03441b2a396405d1967
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.10.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.10.0.ebuild
new file mode 100644
index 000000000000..8f6d8c4ddf2f
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gettext_i18n_rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:6.1 dev-ruby/activerecord:6.1[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0:*"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+	# Test against specific Rails version
+	sed -e '1igem "rails", "~>6.1.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index e746e04038e3..59c754276869 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -3,5 +3,6 @@ DIST git-1.12.0.tar.gz 218472 BLAKE2B f5e0465fd2f0f2f1eb1584da6757c012cf80457a15
 DIST git-1.13.0.tar.gz 219424 BLAKE2B 38d1821c59cbb743c50655e9426d77f76e77dda614a711b7d2185ed7f4caa853383ba85ecf05237da403061d002527c38a5c6e06cf5e6d482ac76bac49a0db56 SHA512 7920de37a3df67b743e91fb317bd0cba746d2343dfb77036398fc124d00eede7b9ade5dd2af5f26d65f1f24006608a29fca55d5be8a00557caaa31acd0b274d4
 EBUILD git-1.11.0.ebuild 1230 BLAKE2B 47014a85314446ac871835aa7d4488da3ada0d0bb7d784010027d8ce4e15d4939a14dafed0355f9c3cb77bd3f9f7630e66e7f0f6760ff052243dd3fdc1444879 SHA512 efdfdf7a4a140bbce25b34502d9fec75883e200733bb51bddcc25f29ca4d803fab4ae88a1d9c341dc89ee7b16807fbb38a5fc5582437636b77288cd851d3a86d
 EBUILD git-1.12.0.ebuild 1252 BLAKE2B 8cecfda11f8006929f7b8254415ce8226183e29843f20cefab00efdd23aa670799d2ae38f3221c92f375b0f377d39920ba92366ec0e4a407774fc63ef885c13c SHA512 d87fac3a7d4cc86b2604c877f8bfc55d32d3d7259883ec3ffe7489957f202e8020d6ad9c21e3b87c569a9ecf9ac396ad3326725eff121cf44581d2ceb27f810c
+EBUILD git-1.13.0-r1.ebuild 1311 BLAKE2B c59850828f991c0ebab56f87d442bc2a4a6a45ecfc9d48a542b18c6340ae176c2d514080a0ae275196bfdd4d69892f163e04def4f69ec5bf3b20ec49740248fd SHA512 0edd92d9cde77118fd7ff25e1b0c4bf9b02b6436bf0f4d096c089ceae2d19a038d5200858ac96f7ebef56123d303f6da28524b7a438732ca1a6e3f57e3167b5f
 EBUILD git-1.13.0.ebuild 1253 BLAKE2B b2cce84a1bf3642d5d47d02279744a5def2466a69d6535c6e66be3606f89fef20d50551fbb6094d66373d71bf322f7f3d6d181d07f83d2e13adcf07ec37a1441 SHA512 cae2bda168b842100340760544edbd20eaf94b160c27f5c710c68c17799ae52bbdb967f10f474df559a3ba56c9fc19199b139b0cd59789e07baff493cb2fdcbb
 MISC metadata.xml 343 BLAKE2B bc9a79524aa9216ddb3624e81f61f8ecaf988538693155f5b8de7289effc0613a5d102b55b4c9c9eccc50d8556b0c4fdcec1e9a9cdab67d28753008204c9af2d SHA512 d599ff9d1df8510ff8603e9030a65c294bef3ee93f0e5a438300a8bb5c0ffe3c4a9bdd7ec41fd5effa27b4b7e1c978faefe95dceedc270b6a995bb928f2d70be
diff --git a/dev-ruby/git/git-1.13.0-r1.ebuild b/dev-ruby/git/git-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..d9cbcab1b2db
--- /dev/null
+++ b/dev-ruby/git/git-1.13.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/schacon/ruby-git"
+SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e 's/1.12.0/'${PV}'/' lib/git/version.rb || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 24c3b3890e3a..3a6a7f403199 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,5 +1,7 @@
 DIST maxitest-3.7.0.tar.gz 62716 BLAKE2B 9919702c3b6c701edf6a5de8c1054547edaeeda518a7b7bae3f419cba9f92f535ec7870ece080fb472d7635243afec4aeed4a27fd839874aa40d63d6ce4ecab8 SHA512 4843f9d405a40177622e9892d1e5fffe297ae03cfef68b73ce3ee966cc3a36e126a9f5a5018b898465f5ad40f8d4fc1e6bf53f5c76b376efeff669b57dd1e8aa
 DIST maxitest-4.3.0.tar.gz 62596 BLAKE2B ddfa98aa4b4e1e0c85100ed6b703e8b76f5a251913e34de03f8cacdc0eb3a60014945786c1f60d81163d8c690f1cf37689fdc05b15a53b63b08247842f736176 SHA512 b81cc37bbd1ed5c149c4d541591fcec46e1e1fc74fc20205cf33745de4fad7fc302e8120b79d17e39412d7133b8d57fee064e1a36380efbde9bdd22f7bbc05b7
+DIST maxitest-4.4.0.tar.gz 62749 BLAKE2B 0545da95ff3bf6c61a330f041b7944f7ef7dfdb00267d28273b8a0bf8914647a0c34e32a826acc89fe2f2d9a1ac2cc610ca968cef273a6a6e7d64db68c6583cf SHA512 37b6a8c9a992fd54c605c0b26a490ddfd8b06e00e9686a41e6170d81c047b6b255ad337f315d8c5d4176e8acba19e2a51061a402bba7dd3d528e14d20e2d24c4
 EBUILD maxitest-3.7.0.ebuild 1436 BLAKE2B 3483d6389f9f8cd9d9c325819c1dc467cc125883ce30c6d1a6745f3c25405ea76484b291dec61defacefdcc3c22d680b9434fc153da41ad940da2123b87f22d2 SHA512 57ddf480278da7ce06e60c75bf45dfe3f1aaa86b511257c153c8d3915065cf296f96cd5b68ba34250405fb64d4bb1d3c8879c890ddc2b0906c2a781af01e39fd
 EBUILD maxitest-4.3.0.ebuild 1533 BLAKE2B d3e69c8609541f7aa2a3640716ef84029122c03f8b243de0065f696c37e6d4be3e241c9d9511c54e623d6e5e57ce0f3b4088d2eea71c6c83989de1ae26d523e5 SHA512 efe38bfd39e043d13ca4ad47d52300dd10a3629df1041cfad14c3d4f81ab19f2b081de1ee5837c3a2960d28cfdce8fdb7e850d89ae7a870dcda92cacf0684354
+EBUILD maxitest-4.4.0.ebuild 1533 BLAKE2B 4430d62218e961e177be586387e6f8a98a85f5c1c798e053716c6f9e927f61ed7696a03b3e8f4f443294251664305a117889d141cbf3f423dffd902761961f8e SHA512 f8458f681790fbd2b9a4aeb9e73914bcdb780f722e2e44b23e6c448ce1e2cb999aa8b51a9302087214faf2f0165d356690eaad3aab8895e30f49f32fc9a7a48a
 MISC metadata.xml 333 BLAKE2B 4f6d2cdebd14923f2841e9ccf9313f2b478a3c47c26979cf90c03d8977b8ed77e08a1369fc374a47a84603d546ad46d7225eda21224f423bc52c4b0320e6d80c SHA512 6e9425f636821a231213a9dee84cec2dc3394a52ea4f5f8a69e0c1691ffdc8e46946dbc0b99147bbbe05211557646a6538b3dbbe716ec6a469b21040b1c8b3fd
diff --git a/dev-ruby/maxitest/maxitest-4.4.0.ebuild b/dev-ruby/maxitest/maxitest-4.4.0.ebuild
new file mode 100644
index 000000000000..b0ac344fdff3
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-4.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.18:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/wwtd/ s:^:#:' \
+		-e 's/git ls-files/find */' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(byebug\|bump\)/ s:^:#:' Gemfile || die
+
+	sed -e '/shows short backtraces/askip "fails on ruby27"' \
+		-e '/fails when not used/askip "fails with newer maxitest by design"' \
+		-e '/shows version/askip "fails due to missing require for version"' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index c442a201fff6..633d68a59880 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -2,8 +2,10 @@ DIST parser-3.1.1.0.tar.gz 299759 BLAKE2B c4fdf278c1ae90529de414d9cda2770524f051
 DIST parser-3.1.2.0.tar.gz 299753 BLAKE2B b5c991ab0834ed5e5b7107935500659828a6f804d9231462dc8a658346bab3959ac56b514045c25af4adb84af3f0cdd9615c9aafb2325ab24a04c0c5617ca732 SHA512 d8becf7e5b633c0a1ddfe8aac98c2f89d6b713cbabd2877a4eac36b0fd4935bd1a05990c100bcf58f04ad78218af0a5f79dbb83bf369708750c8834598286cfa
 DIST parser-3.1.2.1.tar.gz 299885 BLAKE2B 2fe56279be003825a25e6fdfc99dbb13b93dc167f7da3fe636da368bc10a6506afd7510bf3d7c55122321de1cd0bf46afce2ee0ff0a9d914e507c0333225e5ea SHA512 9bbaae6436f41668621fdb1f45dd2a30ea5485dca19b0024a19e8be0684c4a961e914040e3b53f725f06c98822392cfef87113332124272f895bb571e56cc961
 DIST parser-3.1.3.0.tar.gz 301000 BLAKE2B 3b7984966643d983e8606ba4de13a08de9130aa58b5adebdc9cfb273e00e700086f99f8a678ccb6db1ac70dac2da429dbfa1b45661c4f9764b676beae5c64633 SHA512 23ef12043706ba810ade3ac94f376082d5b45db8b451634d469a26f834890e7a82a9669132df4654aef4cb7650f0e13d2f33aad489ebbbb76ab547cb9e64f498
+DIST parser-3.2.0.0.tar.gz 302043 BLAKE2B 8a02ca62560fc976fbe62d02ecf24713248a9f522e1cc9daa1deaa153d900628dce4f59c7791cc61652199358addca1432403a3f3849b0ef8f9495639282697d SHA512 58b9011c22af76f5eccf7035dd53da705ddc952c6185ebbb48c33c5486b5852ba8a543093f8c1f2a2c7aea8e78407c04a9dc49abf43edb27c460cf8b038338cf
 EBUILD parser-3.1.1.0.ebuild 975 BLAKE2B 842507f70b0ff18fe8a7b897eb61d56e4e070636344f14b5bd6c6206475ddb5105469f1d8f98a83aaa08da3c1b8a0aaa08c87ce6095772a2aed5914e7d33ab95 SHA512 8340d66160f7a497c17a02d0190c8b747dff4cbbf360a5f1734a0167999a4dc447820156c95feec70fb4a886cb47805fe054e5607b1c7247537a27af87021cf4
 EBUILD parser-3.1.2.0.ebuild 975 BLAKE2B 842507f70b0ff18fe8a7b897eb61d56e4e070636344f14b5bd6c6206475ddb5105469f1d8f98a83aaa08da3c1b8a0aaa08c87ce6095772a2aed5914e7d33ab95 SHA512 8340d66160f7a497c17a02d0190c8b747dff4cbbf360a5f1734a0167999a4dc447820156c95feec70fb4a886cb47805fe054e5607b1c7247537a27af87021cf4
 EBUILD parser-3.1.2.1.ebuild 968 BLAKE2B 28469c4d75e3e0041446dde769ec8e839a1e8776ca6ee15f86d08bdde0d5db2b1da6d4c18ccbf97a32c47608eb836072ce4bc5884395c86368ae8309928cc730 SHA512 0947276f1a5cdb7a6723e789c318b7c60384945092c824bd5cb3a35f61d5f7202b12e418784d582414ecefeaa4fbccb2c51d82ee7f54e2121d964a4d3efd8c5e
 EBUILD parser-3.1.3.0.ebuild 968 BLAKE2B 28469c4d75e3e0041446dde769ec8e839a1e8776ca6ee15f86d08bdde0d5db2b1da6d4c18ccbf97a32c47608eb836072ce4bc5884395c86368ae8309928cc730 SHA512 0947276f1a5cdb7a6723e789c318b7c60384945092c824bd5cb3a35f61d5f7202b12e418784d582414ecefeaa4fbccb2c51d82ee7f54e2121d964a4d3efd8c5e
+EBUILD parser-3.2.0.0.ebuild 968 BLAKE2B ec0ec0de84f58e73f8f4e563c1bfdd9a76d2fc8b7008f10afe9c9e9cd711c85a19b5eea68c21b6ea188c94943c2f3da20a593935292d304371fcf777efc4b302 SHA512 2ddc344496f74e376ce07942f17c43eade7e289acc5ef9e30f52a4ddf2685290c35cc29117baa8d87e11c4b8f00fa85fa669e70a4f3760ae09a13a611dbe417e
 MISC metadata.xml 344 BLAKE2B 00abcffb45cb3f1cbcd61458b7bcd8a4a81029fd58aba3f67a270c5ec37e8738f4d31b09f8b382987615acd4a8bd5ad335c54b60662a862f3828a1af360437df SHA512 4a28a0ed71d39d82fa69378ab26f4cf5844d01e58cc1805372df985a5ce25892f268a75db5a0dd3ca00bba3285a7cfb5447a1f261d79c7bcd41cd45b6cc68677
diff --git a/dev-ruby/parser/parser-3.2.0.0.ebuild b/dev-ruby/parser/parser-3.2.0.0.ebuild
new file mode 100644
index 000000000000..1831dac09aaf
--- /dev/null
+++ b/dev-ruby/parser/parser-3.2.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/racc )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index d5f8b125810e..60c802aaee3c 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,15 +1,11 @@
-DIST rack-protection-2.2.0.gem 17408 BLAKE2B d9d5d8e2473b6354dd61cfc338a05932a2c60aa12544399cb0b9b74c717d6fa48bdec638381582be0a13f845f0c69583275f412458a20198894b5eddc7b53358 SHA512 06d6c2026e3e93131a2405bbaa8a514ddde48607979828b9fc41309dbdfff2b7c8cac48a6981e76b5dda554f0cbdc7c6ff5f44b8925fce1cb9b7de0a16380ca4
-DIST rack-protection-2.2.1.gem 17408 BLAKE2B 21ecf95a27ab08b2e89369cfaffff43192c2ca5bb74afe7a91041e5fb9f2479a625ca2fcc59fc2f3eb208f17a3456dffd14095d25f8a0ed331972f6f987dace6 SHA512 595dc7ff7deb63130f966a12849750900319356f29948e9cca1e1aebe168bad77de624dd280a1b804ad6a2d44daedfcb352777ca724e9fde2a5de02ead472734
-DIST rack-protection-2.2.2.gem 17408 BLAKE2B d67384374afa29712742531bff0cca78be96f80dd316d4e5929cb2751152bc0d73f8ede4430aa50a2e114b872845f11ca8debe93eaa1a7a63e05daae697c2e7d SHA512 6bc7694daebcc2fb585b303aa059e82db94c142a82d0e951e0dd99388074449c989d41c3aa05882a150776e28d0394f78d0b063e564e7eda7aea14d496eef0fb
 DIST rack-protection-2.2.3.gem 17920 BLAKE2B 7a66cf4d5de68acd3ef4c7db2485657ce226e3101660f4f15bb3a8ab937785211055e49d676cf73cf52d4896e787d8f78a62099549a4ff846b5963c4247b5dd3 SHA512 ce41e1e61016090125557d8211b65b0fc9d545fac6c42f64fb3f48ac0fea56689e17acf7aca6cd82137ba7384c559ac47ac9995f57068f3f216ae61b7fe8953d
 DIST rack-protection-3.0.1.gem 20480 BLAKE2B 102fff6298dbbb766313687b6f3653c60d055c654922e108c0e5eab1364858adf83a800c66f0800ef8a48997884e4b0c16ad1a70c2d00d657fdbcdb929c18bbc SHA512 730cb4fa67e86ee79043e706c4a011f1f4fad8902d27ed25a14e03c7acf7644db9e8685bb6248d9511d32d55a1f13eb548cd9471958b69bf88c4c371fcc1a8df
 DIST rack-protection-3.0.2.gem 20480 BLAKE2B 95c951c6995ac4e69bb6aca85ff0c8a86793466db84e149ef6d287fb479fe49bc3708d0bc71ca656c4bb79b069d3b01139fab04756bc68051eda90db29f506a4 SHA512 54603e8ba22f1b359e5ffe82a3ee99a31a26e5dedd1e46edd4591ca416a1f241dc37ce2b6da25262a9cf9027b0e8687bd23c6dcbea0197131ca33088cbfd0280
 DIST rack-protection-3.0.4.gem 20480 BLAKE2B a71d86a123cdf392632c3193cccf8fc5635ca076039eecc40fd0aa050624e909d63c578727ca1e4bf13736fb844b8d3114ce34a6729b57b600715cab7ec25c1f SHA512 b898c66dcac38219c43b1a6ce3a2952ca35e44f81b604f00dbff43938b5493df4c9a654ae221f01675f8f4b8aaf90f31b435a648f46f70789ac78a0c4a0c4f12
-EBUILD rack-protection-2.2.0.ebuild 732 BLAKE2B dd20f9b311166faf02058ca14b4e6f0c46d197a0b3c5e8c46375c89bdd889919945e2552eae32deadcd407bca3a2ab750ec9eb7bbd87017bf935bdea1641faf7 SHA512 4106892a5dee7c8c44e42e857b7d26d6ae4f702c2c7c5da901cb34953ce0b33d045a2a549239e1f202bc1bc88df7bd2068ceca207196f906e3c2bb0bd653ba6d
-EBUILD rack-protection-2.2.1.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
-EBUILD rack-protection-2.2.2.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
+DIST rack-protection-3.0.5.gem 20480 BLAKE2B 1fa11760c6ddac58234ffe2e6d783c985e29b5e2bd10ea21b0782f7824b5930351c8e32c9401b6276ef028adcd8b25ca4458333d8008a554c413f54315ff8809 SHA512 4ed0ee9e8fe08532ff7f2905251af110f3fff0e419da5be50ae3e5a90906e43c39cf8edc219fcfe3e27a72591500c040afcc9552da875773375b170fb91aa9ff
 EBUILD rack-protection-2.2.3.ebuild 725 BLAKE2B b65a457ddc3984143c102230fc0128ef880babf7bf2af24c51ed7ae944596b72a7d1edd88474375540b9c8bba59f5961cbd65bafbdc82b1534c9c127ace7648e SHA512 211cb3298895eb77364f9283a65a2d11978632ec35d79ef786556dc5faec310f9c1cd0ed1ab310dacfc4a15fad2bd25cfbfc6c629be3ed04147513bae92863c2
 EBUILD rack-protection-3.0.1.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.2.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.4.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
+EBUILD rack-protection-3.0.5.ebuild 726 BLAKE2B 71cbd0fac644be09c96229635395a1067c958033d98cb4aba5490ab2c507de10368285647e6759d5d412ceab978cd80e722a757fbfdf8089f8b8e76d5aaac6b1 SHA512 b6410e5f3cade65514ef4fed852337abda58c9aaff6b72f7ef47ec14347870dc9f1891cb81731f7c24257003d07fca472edb5c1b12343e935754abb25927c93d
 MISC metadata.xml 495 BLAKE2B f6dcdfdea078816191c90910089dd90c242b7aa90e41b07670f7bd024d24cdf4a19ab8486c2e82acd4da6bf26db2fc0dcd087b959d8e188d1be1a17ce6b98976 SHA512 bde612118e9e962e7dbd04340312b9556fa54d241831c0e754e10e65f0eccd4909b19622d4f393e684e688977ac34db30e7fa16848116fa39c5aac95f669f2ba
diff --git a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
deleted file mode 100644
index 13db1f3f6e1f..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-2.2.1.ebuild b/dev-ruby/rack-protection/rack-protection-2.2.1.ebuild
deleted file mode 100644
index d31bdbd997d7..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-2.2.2.ebuild b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
index d31bdbd997d7..c1fe98e42fca 100644
--- a/dev-ruby/rack-protection/rack-protection-2.2.2.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 4be750baf322..2481cd0798ac 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,7 @@
 DIST rack-2.2.4.tar.gz 278632 BLAKE2B 2d12a9c1e239590a4aedea5f3bb4c171b6032255658688a151e665aa1cb33dee17754c7b2736f8f1725c70b8344f5f6664cace8c4d4cb4e9f6f2ee1c7a3117c0 SHA512 aef54a06efce54d58e600829bbf550162bf68fe710b61b2b81022b2a8581819fb575e03992f493f11ed5f3391349f21cd142f6acc5b6017ec4c8e21cb17e4874
 DIST rack-2.2.5.tar.gz 278648 BLAKE2B 8778364969506e8fdb152c5f88ab4b0b07c8764bf2cff9aee82ab6ca9958669038100816804215a09947a15b8ce06597c9204d4f2b34218178c14dfc8298ac48 SHA512 bc0e33d7bab700e2a5ad05aa1089d261b3f78a6c456ff14def57645df853915057ae9d42fb5ecd72989737a2882dcbdefe7af4939020efdde1ada38a4cf274e2
+DIST rack-3.0.3.tar.gz 786619 BLAKE2B 471c76e05dc52809e1cd95463ffe7fd2b9bbb0f0d97783d5cbea728cad1cf8272b7045f7329aec6efc9d3881c87b1e3a6e3eb376de015eb6e1188c37668531c1 SHA512 9b5860c62191df983a76aacc0c765d6275aff6d0d146fe0f2f1361e9ad6b76115ba0cbb94682bf9bdede8170e086b67018d362044099c91ea3dc015944d1b444
 EBUILD rack-2.2.4.ebuild 1708 BLAKE2B 9db82605b298705172d939cc7acdcb07ea1f5a6439d6ce6f0964326d27f6376c2648381b6e808b4c0ed269f77c72a5b41c8f54dd153759899fa6cb27c58ed1df SHA512 69db8c6487db112df55989c59c7e6f09c16f8063de327658bd0d8646f3bddc84899e0828fb179903798d69eaa16cea8cde056b9ccf0363dc335eed959b585a39
 EBUILD rack-2.2.5.ebuild 1679 BLAKE2B 6862e24b5a10c1b54443320e89296d276201b5d425956af323d7c05d7b93a6edd1f2bd665b2dca3a6b11fbf772fae311c3e17aea5c240edbde6d06057cdda984 SHA512 e4cebb1e7131734b5b9a47246bc5217916b83a58088605d106916ac183ebdca9626610c85fe0717bdc5232c8c647dc05db790d64db34aa1d45053b9747aecb0b
+EBUILD rack-3.0.3.ebuild 1293 BLAKE2B a6c99f5219f0a4b4fc194667233ea0a10e4cf4dbc0bf6d6f54d6caaecd6d42e0481ee5f5c9c35febfa0a6887addb90944772c36285b66240a6c7627aa3ce2ceb SHA512 3c908011fe5682f09369588d333b4d844e3d50b9f58f734dc5bb4f436d4221df222368f8625835e798ce5f139a058e58cd94871aca2a1c2c2a3072f0572925f4
 MISC metadata.xml 537 BLAKE2B 998152d25abdb228da5fc7b39719693fd0811ce6dc0d831cf90a5ecbb88e540d76dfb6cfddb3584748f46f6d66aa2d1bc73d492c9e810db1c0e44895108d5e17 SHA512 4670ef4b5b33270c48d212fa995b965305f558c5f670e7eccbe2e44f9ba8d1628c112de5a9305c2ad90adb6e2996cab6da385e5f473d850b287e92f7594e0d21
diff --git a/dev-ruby/rack/rack-3.0.3.ebuild b/dev-ruby/rack/rack-3.0.3.ebuild
new file mode 100644
index 000000000000..7aee70d2e0f0
--- /dev/null
+++ b/dev-ruby/rack/rack-3.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 019d07f1cad9..ed5da88b9816 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -3,9 +3,11 @@ DIST rbs-2.3.2.tar.gz 977459 BLAKE2B d33984c03a962f4d72989b5b665e7e256f8928e86fa
 DIST rbs-2.5.1.tar.gz 983686 BLAKE2B d0feb4f173e2d1dd76d93309279fc75f9ed992ead2c144d69905e6acd139c709535ae29d78e85787f082821734a6448446e746791922e4322c55dc446a38ec06 SHA512 079778ad36db8f096e33d04a460b03d03c6b3616a2066e40a3aa06615d51265d8bfa7669a31463ce46bbcb16dc74ed8a24ba280b46c24f25b2327f5c8a8ae891
 DIST rbs-2.8.0.tar.gz 1065757 BLAKE2B 136ba929d0b61c6b2625b49574ec45a28aa1de77a1a63d74bf5747ff4c88968ce28116472a97310e10846dec404dc2a4ccebb51c90f14f5713f3b1d21f18c9c6 SHA512 3a04026112bffef03a3e65c5d539ead7de353b4af279da6f4a7def854fe6c7f95d291663ab18bab678228ae4b26e87aec89fc1ed961ebc4cf83f38ef726ad407
 DIST rbs-2.8.2.tar.gz 1069304 BLAKE2B a05cdd12767ed47cb90a64ab9803523dfa11a2295ebf2be4f9087918bc74ef75a46e3ec95a78c6c272e65b7d0485db0697edc8c4e586f7ae2b4608cde638969e SHA512 02666374fa8a93f421916f62b6a101e602c5dc8996169b1fd618618ab76afb11bba0891aac3f48f70af080f5d73ede264728f93799b3a330cae3a43b9cab1cb4
+DIST rbs-2.8.3.tar.gz 1069360 BLAKE2B 7151346fadcfdb2e246dbd32c440c4e5fbfe0f6dbed67a100460b451f87432a5811d63269b612949b720d0a3234818e46d1e1f614886e92e0b75cb5814c3e24f SHA512 4e6ec348945171868752ff62704e2a64ced4a11288a96c03e837e508df235c0cf85f99469952a7b052662ee7bc16e0942aaa2bc448381d95d5603fefdacf6839
 EBUILD rbs-1.5.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-2.3.2.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
 EBUILD rbs-2.5.1.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
 EBUILD rbs-2.8.0.ebuild 1905 BLAKE2B ff1382678d9b03ed335d69f54dee98cc50d22d4fcf4b9af2d53f189956e7a8e6c026edf6b60832d5592889bfa4af594d953125e5f2de15632b869d991f452bc7 SHA512 f85ac1031e8a1fdd3a54730e71ac971592d66e06dd20d261fe6e2cea3c8cf3d4d838a3c08c49d8e71ee8c788124904fc96413e47a76e20a720ce5fe414315d1a
 EBUILD rbs-2.8.2.ebuild 1915 BLAKE2B 6c2d5bbe6a7ff05aff2f28f4a1b77a934f7932206107618eaf6bc7b226d5f1a6b699f6b870ab6edad75c1fb0f6aa82e59231e3e88ee4cb2f95d5f2924a39dd84 SHA512 2c7d9f08b3248d717054b2c762fdb98a8630249dc747e4e17b614ea758b00348a0e75d3886c19ec8dc23201dcfd79ea937fc035c5924a3d5e737f1722a5d631f
+EBUILD rbs-2.8.3.ebuild 1915 BLAKE2B 7350ffd17c9b04a1581954e32cb858db1aae32eee91813311a05af1a4c23469444992686665ce810f453761fef2b57da907fd45b556ff602b3abadf9b9685f6e SHA512 075d6ab192e67e0b54646e9262383de55dac493f9f2e3522f9b0ba85b5508dc24a28a55e1e7f9b9ee3e59b2d7555fb679f23175ba80134a7cc7bff958642fed2
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-2.8.3.ebuild b/dev-ruby/rbs/rbs-2.8.3.ebuild
new file mode 100644
index 000000000000..c90ff55f9e70
--- /dev/null
+++ b/dev-ruby/rbs/rbs-2.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 46e80a766124..561a08899d3a 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,8 +1,10 @@
 DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
 DIST rdoc-6.3.3.tar.gz 675961 BLAKE2B 200d57c4b104cb3ba894ef56fd72b4f6b2228dc2c5fd7a53035a7e03834e0e9aa283ee2b07dc7dbbfaf123bc9d96ef302f47a24b71a6d735872960ecd65d9cb3 SHA512 e4e4083fea67184c435b59866fc8e8c29c740d716f8be279d18a625c1eadddd41d449de30ddcc3af1aa0507320c0910800d5a0032540b626c5b2ea83d3b123f2
 DIST rdoc-6.4.0.tar.gz 755741 BLAKE2B d2519dc0dac3fac32ef7cac8c87dba1a679f0b09dc5858e91899d6d28195cf584fe3eba802bafad400ae26c5ddcb65eaec32e101f9e047f80cecd1616a386ed3 SHA512 6c6a89245ac77abdeedee70327f97f8a9b8bb596c14848a95487ff19039864dd7a5c0f5b501fe2e7b187c671cfb205c1500359c7c203beb89211addaf3ac34f7
+DIST rdoc-6.5.0.tar.gz 762645 BLAKE2B cecade491f0d18b2c50ec710cb27a28b6cb946f321503e0508e8d4802e93033a78867346eb1d68ca56884ea0d68d51d6fdb92eb61fa63034a01332e8b572dbcf SHA512 10382e66ca778f85f236614fe071b2b0d598065d3aab8f5a89cb0839da7713b5e16a66e3f7a2bff2e2125d26a42f088a86c6d339dc36479a943bb7023c1cad0c
 EBUILD rdoc-6.3.2.ebuild 2678 BLAKE2B 7991b323a189f783222a27786c61f838ef3267413c65618b27d97f6557d911e720856e6d14ff611f8bbc4e2f3bd51364ccba0d1e7c6d598e7d1180e108a6f3dc SHA512 be3868aa87c2cf271f35fb7cae89d5b1db01636e3daa21921533cc9f925f0eadfc206381b24aef990f31ca12f27eee7e40d303e08c6e1d7fc102211a79e4e092
 EBUILD rdoc-6.3.3-r1.ebuild 2690 BLAKE2B 4392b76c35e9b5f00eb95f2961125f37b587edd8e51290edb3d0ae08e5acea55e81c4c7bf4638cdf3ebe2c71cecb4b4a10b7f351d47137e1185cacd37e88d7aa SHA512 d03924a5e34ceb351d8152bfe8a87e12ababfdd35ba99afceb1c54014223f51df00ca761a478e14f8060f1a2128971f31033f7b717d100b3ae69e28b6ee21ecb
 EBUILD rdoc-6.3.3.ebuild 2679 BLAKE2B 91d2085a7603e1b16bacb35bd49e32652a11cf9c9dcd86221464fcc760e3a66493ed711f187231aaecc8ee3afb221ec12d99b590c3075299c40758df93f619b8 SHA512 58761d462049ab4d59c7f8d31b2066b6e8d020b6f843627b2dccbab071cbed1ea121bc55ad7e0638b7419982a0afb91b54afa5bc22125254ee2d5278813342ab
 EBUILD rdoc-6.4.0.ebuild 2750 BLAKE2B 3db539d7c8452e7522a4ee38e57913710d5fd6e43bdf48089a773b39099b4296d77db314826091a756855791ef3969b36ca2de64a56df8db254a16ef0f66edf2 SHA512 6c30ca796070161ce8f20198be2b61f67f365c211d01bfccd6efdbf794c84ed64571233c7bbfb4e8dea79aa034bf954cdc49b2ca8d3047be800d9dc041e73664
+EBUILD rdoc-6.5.0.ebuild 2752 BLAKE2B 18876ee4c05615fbf72724845438efcf61ddcf38b1fff70c98926e0b9f7d7ba210a263f4ce9740f60206ec6784f65f1899e0b7c63b41d7042ba6543e9d880679 SHA512 c1a50b1df2254004ca6b089ed8f3e97233e17dd6cf3434c04c95fbe1fe90431ca05d31212c707a6d12338254e5ea45b15a30a47f29b71d040c470ce59474a0a4
 MISC metadata.xml 336 BLAKE2B b8daecb4713060cf3c1258c47a4e0ad25bc1930b094dd07ade2613c0700b56779ade45609d6b57db16a51d6df8de7039913bcab318bba0d85e0ac5bba9d09e12 SHA512 bb8c15dcf12c2ead3e96c0c615beb7d11de3d2b9e49d21faf024b66f39d3720e0e969319897eb640f2bfb89006896fa5b0d4c9668c51ea2c4aff05a23d56241f
diff --git a/dev-ruby/rdoc/rdoc-6.5.0.ebuild b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
new file mode 100644
index 000000000000..a6dbbb09a981
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 3d4019d7aea4..0266a18b06e0 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -5,6 +5,7 @@ DIST rspec-expectations-3.11.0-git.tgz 214878 BLAKE2B f830a0a31fb0e7cd6639e711e4
 DIST rspec-expectations-3.11.1-git.tgz 217396 BLAKE2B b9660b22f0b23a5436d98ffe2b21b58c947765ab5cf7d245bf265faead46a5326fc403ad55ee2fcd72d96c8c29fc996715ecc74c9521ec4ca34daa9d5bc0f819 SHA512 1941056eb2f2205f583f335993e25030b433cb0463992d74d5c568c7bbab4313fc6e7e14ada5147064b14d6da49326e3c3cb342408cfe9b38d350c9470e5cdf9
 DIST rspec-expectations-3.12.0-git.tgz 217524 BLAKE2B f9638e2e5c83020818b2de4c06074b7d70f02655a50d598ecfcd8c79e1abb2ec351c5b7aed1ec0ea84fde140fc1a04349a6f2edbffda7cb697135ac0b5788b0c SHA512 51a80b5d45e8ca61a829f2130c60433999c6d5c60343d25f737bdb9d6864e89a156b29b549250f7c4248d5ba7a0cef11eb28e55d3023274051eb11f2d0361c83
 DIST rspec-expectations-3.12.1-git.tgz 218331 BLAKE2B 9a8604bef9d0118fc3ce5c56f3c53597bf5f4a2eb6a85977fb73ba43e585fc430c3a658ed6ca5b2b9c7fce7e11add81303734bac4bafc8331b221eef8eca4a8a SHA512 a0412cbf55d6cc3c0671abb3cb64bbc9473496aeb8adaa0fa5ae35f0036635adf5f894db0a9150002e7a69cffd1bf2b0c952672890197559be5c54bd2b508b64
+DIST rspec-expectations-3.12.2-git.tgz 218501 BLAKE2B 9b4dffb018d11c6d2bea399a7c1c3ebea157f83231d50e641998e0cb77e85e65c097a5d21e6989ce4c123df00137146b409fa2af102691867195fe42f1e11735 SHA512 6695959bcb185654e7ae96eaf112263ab49cf89f32781ab2b445e11e5d04b070295c9fa051ed6f4925b7cce78fb233490ad12618ac8f54d24a328ae3a6788859
 EBUILD rspec-expectations-2.99.2.ebuild 1638 BLAKE2B a15ce1cfc2d48f2820daad095ca70e8969245eb04cbd69e1ab89a2482dcd53bb1968618396ae9ae3e7eb1ab6c8ea7aab663c4a91ccac49ea9cd7e28d6357cd3d SHA512 cc77361f64c0caa032c4ff553412f30994d8922623c5608e9cee4a682e8b08ee4d791b4738f716bd81ac567d98699791a779d138888eb3934c8dfdbabeb49984
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
 EBUILD rspec-expectations-3.10.2.ebuild 1318 BLAKE2B 728632075a61aae02e2b7457e48af0acd9eb2cd4160e211cf2b612d7b12619856f024d9c177360f700d4fcb32f1ae569b49e71531c778537ea5cc08146086747 SHA512 d46ff515a45bf7f501383296d8191d7ba07b149dfc2a10209ef9161ca79f1ad57577603fffb907779b1073b6c8f5a24a1cec5dbf13f225b7736172eba1c20a22
@@ -12,4 +13,5 @@ EBUILD rspec-expectations-3.11.0.ebuild 1325 BLAKE2B 3ca7f8d244ab7207be1b5ed91a9
 EBUILD rspec-expectations-3.11.1.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
 EBUILD rspec-expectations-3.12.0.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
 EBUILD rspec-expectations-3.12.1.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
+EBUILD rspec-expectations-3.12.2.ebuild 1318 BLAKE2B 80713ab20268b191458fb6484966e7e9d3680ca1e9c900b7da821caf6ec14fd444c3318694416e2732ada0c4642b9ac383ab9fccc6d606f6f8619925d6e80076 SHA512 c0c52585417b6a8f6bc0eb0e17b72c9ed8321c368b8a00cd0869f335c486436220bd474a5b2d84a93347e98284af6a4eff7f58a74ef5420abcd0960fded38b8e
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.12.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.12.2.ebuild
new file mode 100644
index 000000000000..147583e75d53
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 8756d987c7ee..49e594af3379 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -6,6 +6,7 @@ DIST rspec-mocks-3.11.1-git.tgz 198650 BLAKE2B bdf06f0614bb7b6c4eb6a0ff0af84d4f6
 DIST rspec-mocks-3.11.2-git.tgz 202347 BLAKE2B 7db89badf2cd3a9bdb590260dfced05cc72ccb7b2a8f600969f17c2df0523ee602f728aef257e88876f5c3b283645cf7f3243bd6de67c5bd26d3d74d0349593a SHA512 a1053cb9604b01de99f79b18fea2c4b3818d950e83da642a8b3aa9dbdb397429f51d95efa84a603770d4db94a25758c1cef15ce1ba77a4c952e9ef5f43a21e4d
 DIST rspec-mocks-3.12.0-git.tgz 202794 BLAKE2B 053c4b1504a369376cfef8411fd97304e56cd83be1b89296e4bf5b260af8ef89f8aff85a095bac5b8244b38020725ddd087d93774b49b422d37344b142a4badc SHA512 f292d4ab82e7da2badff596fba91a26499821565b13b4004571efdcd8b559cc4996c3d6e092c429b8ee2962d0898c79b54eec7fd6c7835d414e1ff0258bdd3f8
 DIST rspec-mocks-3.12.1-git.tgz 203924 BLAKE2B d8b954046e2c4e7e4a949469733b44f4d71eef13642f4a65a25bc97322dacc75e6a32c07077b6dff6a71e66bae36469dd28bd641e9c5508bd9f333d30ff655e5 SHA512 983358f1acaaaeb12e77ff3d1863878382f9e0d413ac0f25d11e7f7f50251de17d3a9ad4ac25dae5568bdc4b9b0af716196ee409c035f9fd90b13d2ab769cd18
+DIST rspec-mocks-3.12.2-git.tgz 204751 BLAKE2B bcbb8d6df6b1bf3b58e43e72c25b792f91f00467520cb1b366883e8ad54b7a380b287ae9e6f453de78603423f099ed0d4b3759338f5a4a91ea9c42c16439c4eb SHA512 ae1cdafe53d7c3258bce4cd0bec10a9b91886f2b71736e028350ea212999b88b9fb2e3554f1db040bf8e66cfb2d0139c305aa219e01c8db998b75283da327d3a
 EBUILD rspec-mocks-2.99.2-r1.ebuild 1623 BLAKE2B fd1169cf4a9bdab0faac65b0cd738c31dfaeb59c5925eabd2999cf0a0c7cbf60033c9109414dd6504ff6e29c85bfe6a6fc41001ced2e5cd4eccfcedca86943a5 SHA512 5c4e6639691f811cb0b3658c1d6d0ebfc546ed486868e37dfa808c8a86041d1b0fd66f877505cc8ccee7129d9c0e586f63671391caec55f0b148e51ac4f7d5fd
 EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f3644836376b9925dbf27a55e959956f9c049343a56e95e3272cf9d062d86d2914998309d6cd51a6f6db1b86352d90cd5adc8 SHA512 11f1f35d5b2d59292a42ad277b3676c5c34bfaa72e22bf5705150eeff1d94fc3688e5f9daaf2b11e327767d481102f1a1890329562c0a6e78bbae0146e9ed3e7
 EBUILD rspec-mocks-3.10.3.ebuild 1442 BLAKE2B c980f6995e1c6e16b8c7ad463dc2a29ac19a2d9a0deae49a625d430f332ef3b1a49bf09cec4b46d80bb0a2f01abdfce478858f96731e5e771cc7430a025b83ea SHA512 a34266c160e0953251bac75dcf8ff18b19d2c42a49ab8844dea7033b22120563b29efe870755b1c2e8e4f099018c45011f77e2626775c8a1b1ee60d8351f1081
@@ -14,4 +15,5 @@ EBUILD rspec-mocks-3.11.1.ebuild 1458 BLAKE2B 56d68d0f345b15d6ae06307d4d0261d259
 EBUILD rspec-mocks-3.11.2.ebuild 1451 BLAKE2B 1ad96337e55ec4f4f256c7ba81d625c0d27f11a3d602661ee9ca811e3809e00429a2ae9fb8aaefb0dbd9ab844acab23c6dd6a9c4df0829090ee82949858b2ad1 SHA512 5f51ab0781e583b17ad0975d9f2c10637a9c30067fed93a0a02d62634338b7c25ffdc5d2bd592a9e18d1ef050f797429ed9d959b236573348c33cab751a08f91
 EBUILD rspec-mocks-3.12.0.ebuild 1452 BLAKE2B 33b7391074e25374e5485f960dcd08f8c9a329f4ddcc97f2ac7fc3632b754d3014c3cc6a89dc59459d9957cd74338b3eb6e4d8619b85c618a533e4d6d18962e0 SHA512 81097c356cb4c879c4ddf52f4f32de61ac2f5fbe489449536abf9334bf97aa89e46d388b627c3a6fb46b2c194e61d8e0b0a36cc43468bd5174b521aba9658879
 EBUILD rspec-mocks-3.12.1.ebuild 1452 BLAKE2B 33b7391074e25374e5485f960dcd08f8c9a329f4ddcc97f2ac7fc3632b754d3014c3cc6a89dc59459d9957cd74338b3eb6e4d8619b85c618a533e4d6d18962e0 SHA512 81097c356cb4c879c4ddf52f4f32de61ac2f5fbe489449536abf9334bf97aa89e46d388b627c3a6fb46b2c194e61d8e0b0a36cc43468bd5174b521aba9658879
+EBUILD rspec-mocks-3.12.2.ebuild 1452 BLAKE2B 16a1dea2a9f1190a7fd5a14ea16b4fa46b26df448ceb7824e0fb49e707dd5dde4d00660a12a576ba24be11c13c38bf3e43491dfdd5e1c4854ccebc3eacb9ed4f SHA512 4206a7d38d40a1918e2586595fb1e4df9bd7062711955f677bd839faec11dcc1613bf28a07c658e400221b51c73d9da12b970f127cbe4d87469e12267e8462e8
 MISC metadata.xml 344 BLAKE2B 5b939c668a8c75c33348bff9e8a0fa6042702fb59cdfdc2c8b45db1d9d191950a63d6f9b1329e6a2717a097d7b001afecb9ebbd0fa08badaf95664d37b06eb17 SHA512 026e9a293c2f99d86a11f37267fddcf54dbdc33aec00f470a988d477d6e3198ccc478c03cca059be0a4e324b9f256719c99c7c81af97c75fd7cebab433d4b1a1
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild
new file mode 100644
index 000000000000..078bb0e70328
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.12.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 3f1fa734ef0d..042694761e31 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -11,6 +11,7 @@ DIST rubygems-3.2.33.tar.gz 12131881 BLAKE2B 6ec9321d808df2ee1bbde7f9889471bb7db
 DIST rubygems-3.3.26.tar.gz 12995476 BLAKE2B c06400d263f64ee988781b49628eebde2b78b5c3cdf3796fe5e1ce5891cb0b41b5e50313293afc72c9b278ab00415b91a862f4245107c63e8eedb9904a5d33e2 SHA512 5aad9f6f0f7187d7d3f2a77ceb50b4b293290dc2e83fb55654c8fdf8e222568d40ef0c64d603ae2ff0db39e7a39ee89ec3c48bb102d434637145863881851086
 DIST rubygems-3.3.8.tar.gz 12928096 BLAKE2B f09f7da32db03b9240515cbc114b94fdec0e7d9da6c4ac1ca297f76989be154da3dd6dbf4701e295d01dac957fbd4429ea39eee3ee66bc4fb6d4e6194ccec96a SHA512 bc5719204ac81d9a70df0c8affd99c6e45835f3aa140c9d262d34bee879a7b932a0b5069453e949054e9f3feeab7d376f1a02e1aeaed167b30bf59fe57d0af40
 DIST rubygems-3.4.1.tar.gz 12999634 BLAKE2B 019364e3abd3b12f2a37b08a8d32546cd002c47653a4cdd4e06d8605010dcfcbf3f82f2d375c6bd51a8f1b462b624cefb85932c075b965d5038c26d6079de261 SHA512 2183f7d6ab914c47c02b53cafa6f39845986e4b38713d320402b98f0f0926dbbd957ef11c00b4fbe8f6c9985a1a5d9f551b2df9d47f00c389026e373dbd6f6ed
+DIST rubygems-3.4.3.tar.gz 15002575 BLAKE2B be8dfb7233754e0ef9147eab1c64d363c38de5a6c296087a193b801c9fa1a12d2a21d7b3b01360f53a30caa6815b3bcdf3d14ecd19ac19dfd2e88115526b5a97 SHA512 7f3907b6ab8f001bd856c2b25b71c5ec32b21b2b5fa16ba369e3108c44698712ac3f5ace430554a4b15dc0adef2d87fa41bffa03dcd01f524fe8bbd80de9807b
 EBUILD rubygems-3.1.6.ebuild 2833 BLAKE2B fc86fe558e68ec8c97d11ecf54d71267cf4858b945e4da004eae6138409b6050245958a2177e539dc29a442cdfc9140fa6d319612b90d9dc5cdfd186d9d237f0 SHA512 492eba6a302e5b96cf37c113c6d17f5278383df97d8419e2856d53e7058aa055b70753c14caed7f47a3bd87871f3f54d76fbd97332a35448095235a760169c6c
 EBUILD rubygems-3.2.14.ebuild 3148 BLAKE2B 725418cf75abd437994e7ca0819c0444b402fd4fc4e7a0e34abd4dd91a45f53fe887bc53527a148b3cc6e939c830884b64c98bac4c0d3214e6eb427349f63e2e SHA512 62c24f631f6b42f40fd2686c34dded757c1fb65698ed659b36a85dc688c0a4850b2f5e4cfa2e9efd042636f55013a0725ff162dbd3cbf6631c1fc3c8d7917092
 EBUILD rubygems-3.2.22.ebuild 3141 BLAKE2B 0e7944a328814a6aa50867212e7a2b114d596185ad4bd0664ffb474d9ec7ca8646dc0d5ddb8b2af978d0c2bccb1a55706bb8309799f7e80f33573c5877d34206 SHA512 54153f7998221a53b54e0e51ba4ee6e70187ac4746a6451c5eb0c269b4c43f21c7323d8437dd68d28e39fe258bd550b4c44d62cf5a1bca0b46c4ff2e5ee19dc9
@@ -18,4 +19,5 @@ EBUILD rubygems-3.2.33.ebuild 3313 BLAKE2B 7df80679eca565fe40e90d303ae628aff4ca6
 EBUILD rubygems-3.3.26.ebuild 3451 BLAKE2B ac53dc2b46dfdb0f0c629362ecc355ee317071a4970f6eaf7fbc92657466a6c0f3f8ae72bc485ac87e8274108388f3f612bec47fa3cbc439088a722f5d0ba983 SHA512 b9a28984e2e82c2f118602165d07540beb34814e03273942c6fb1f257e011b09a3136feb11cfbf7aa89138073b53a10d36b38d1abf0a66c40923cd93db877eb1
 EBUILD rubygems-3.3.8.ebuild 3327 BLAKE2B 0d9f66367e4b5c96a5fab1b00a17588f44df93523c72eaeef6efa74bb91b8aaeef0322e5f01fe11d56eaefbe1a2b1a35e8fc98a553954838c1403e2a049ca4c3 SHA512 af42c7a1e19d4ed119ffe538e3500eefa404caee98c7b02b4bf2b03692948572a91396f6a4a28e420e686a2e57bb7fcdd03df24c16389c529eda29446eef7d94
 EBUILD rubygems-3.4.1.ebuild 3451 BLAKE2B ac53dc2b46dfdb0f0c629362ecc355ee317071a4970f6eaf7fbc92657466a6c0f3f8ae72bc485ac87e8274108388f3f612bec47fa3cbc439088a722f5d0ba983 SHA512 b9a28984e2e82c2f118602165d07540beb34814e03273942c6fb1f257e011b09a3136feb11cfbf7aa89138073b53a10d36b38d1abf0a66c40923cd93db877eb1
+EBUILD rubygems-3.4.3.ebuild 3451 BLAKE2B daabfa111abbf40b32058b4910342954ac722be1b53f8c78228618047d2b083267d19cfe724cfe1af34c462e3f3ac89366a2ccd02e81fa3cba295b466b8698f8 SHA512 16bec7cdfd929c48564e1a9d660fa81677e0585edc8c7aad546a12d21c322883dc2974269674f16abd568540896b5081181f01d9ca5ac55452330f293eb23940
 MISC metadata.xml 432 BLAKE2B c63e6f07840e2764fda3c1270275351adef92a243292b67181cc06a0fdbb76ee02e64069149c082d33d75f9407ced54156423b023fc1eb34a800282f0aead9ca SHA512 67ce708fa9f5532770b83481d4b33bb1e21be994dd7c5342c4abcd084b5cbfe544ee692e25a468e99e22174fe685312a3f42bb80f01120fcfe138046fb0a54b8
diff --git a/dev-ruby/rubygems/rubygems-3.4.3.ebuild b/dev-ruby/rubygems/rubygems-3.4.3.ebuild
new file mode 100644
index 000000000000..b1c1f69fed82
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 186a4edba4e1..253a43b58017 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,11 +1,9 @@
-DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
-DIST sinatra-2.2.2.tar.gz 513056 BLAKE2B 80904850ce577131ecc6c28917772cda6ab606ff1b4a71b733cde98d56e2906bb0dc5b65c83465e65686571e8752ec7935d89734e7d2e45c544fe14a2c8046d4 SHA512 e69a36738a7c1095968a343113ddba414ff685e941a8b55575e4b2ffa5a8e7394d874966d5532643cdfec997ac4c825c293185f6688c715006e37159eedd2be8
 DIST sinatra-2.2.3.tar.gz 513333 BLAKE2B 925b3188cb3f63d58a1078845bf58c6684e176527f29bdb0507e2185613b35930345ef1143319b3bd53170846cc67c8e8ce92b036e39ad03fee0f4f361a2aeaf SHA512 666b7a7fec67b4976ec10a704f1e98f9e815cad887ecaaf5bdee6cb0b5f4e29d99ef806865bc5b8e61d2aedea5b343c14f342d03515f0f6c68de3dc905fe77a1
 DIST sinatra-3.0.2.tar.gz 265824 BLAKE2B 87739d8863dd9959b8c3530b19a3f52de31636fcdd77fe1558930749498c73ec4cf0ddf998a9f6029c46842656059f8bd76d1781beb277608ccf265577561447 SHA512 57094e00ca8280401ed76f5c52dded82d42a4a81290a9a990f464ac43abbf350e8325b8f60505bfd005b6c7d92283a3f7a9345c0ccbf227530a8c3cb93c0af38
 DIST sinatra-3.0.4.tar.gz 266263 BLAKE2B d338fde60ab57f08d5df8afe240b1ed5cb1cde351b3f57b9700a7019e317cc16fc1a41148c1a75e97ff22844e8555b8fc1723c9d12818406fe28d1399fba9506 SHA512 b0581806261df57d8aa392b920a8998ecec311b1f82ab5ac7093c77ba5044eb9f5029a4d7266db05aa791ab30397fa304295a964b3ec3b58a2c0d13e3abb6328
-EBUILD sinatra-2.2.0-r1.ebuild 1005 BLAKE2B dda13c02308ce841d04b6267592523a417d2ff3043124ba024a591097e3a3436d4f30f1adf0237d4495471c1b9b406f3fadf792710a6e42a590f8b21284ff51b SHA512 aed0a377a5b9145344506ef2175ec1d6fec265f347f82ac960baad954366c325d501fb3f4ef167bf81e09079d99dc68c1686e9479b5d76abee800b32e51393fa
-EBUILD sinatra-2.2.2.ebuild 1006 BLAKE2B 02051754d7ceead4327c603836d52b6d4344e9c1ab4d3ae6fc3a7dc2ded7a2ee8540702aaca19f3eb388e064bfa990637776e400b068f1ee0702fc5917da5eb3 SHA512 2552c3e63d0b62838d631551b2a135822df89c2ec6758a34ec058989f47925525cf0c3a984f777166404449c0ec09e16b4cd4d5672a1d01d43769c6e486a483c
+DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968b0f3ac98b599748e9572cc0bfc9121dc8731a0dcc9dd1bce04837373f93f198bff56c0de9f50932711b4040e8 SHA512 9ec41c3f0c4e4faaa181fddb2fe3262796a29e93fc07349422ca20dc845632c127c3e82e67f16ca19d2b2bcd43ad48fdca918d70b6747d8a2088ce1c84fd8eb2
 EBUILD sinatra-2.2.3.ebuild 1005 BLAKE2B 5b6d14debe343babe32dc4985a05a41fcd5c956bc9f7438f2486d4bea48349af8cce4c5eb6d97783242d55ffcfe051fe6b9a01ee15c6afada090177d71d0fe57 SHA512 aca6222442954b05734e096d225e9e550449f1e597cb369e3e653bf3063400fece8a776dd11af6e7e37841c585f27d4f46f5de47f574a715f95bb2b780793863
 EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.4.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
-MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
+EBUILD sinatra-3.0.5.ebuild 1032 BLAKE2B e534db05a691a05197a5733c2ba4630eb463749e2436f08711e0eadaef7c0f85d90804eb803811d55d03aa63e4f7fde611b5a9d2cc6a0c159d6c5c2f4a99b4ec SHA512 a744d018502e8dfc1cec63bd3aa4575dbb2d45b1bec0df74ab729b03236941aa7fa7bfbcc49e329c7e54a88dd6c327b71f70432f89bcb46b57a3c6e6ab82f953
+MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/metadata.xml b/dev-ruby/sinatra/metadata.xml
index 658c72b1920d..a14add969f1a 100644
--- a/dev-ruby/sinatra/metadata.xml
+++ b/dev-ruby/sinatra/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sinatra/sinatra</remote-id>
+    <remote-id type="rubygems">sinatra</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
deleted file mode 100644
index 6e3d3a72f8de..000000000000
--- a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:1
-	dev-ruby/rack:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
-}
diff --git a/dev-ruby/sinatra/sinatra-2.2.2.ebuild b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
index b196d368b135..affc012e8456 100644
--- a/dev-ruby/sinatra/sinatra-2.2.2.ebuild
+++ b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -17,13 +17,13 @@ HOMEPAGE="http://www.sinatrarb.com/"
 SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="2"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/mustermann:2
-	dev-ruby/rack:2.2
+	dev-ruby/mustermann:3
+	>=dev-ruby/rack-2.2.4:2.2
 	~dev-ruby/rack-protection-${PV}
 	dev-ruby/tilt:2"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index c192a538fb79..89992026f502 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -3,9 +3,11 @@ DIST sus-0.14.0.tar.gz 24207 BLAKE2B 1132e6fdf7c842ec8835613b647c837a1f5ec46c197
 DIST sus-0.15.0.tar.gz 25434 BLAKE2B 538ac7b81f7dcc74143e42a7b3fb5e12243b6a36228ac09cdf31549a9a666601d9e155fdd6ef079772b525e6993e07a12230ef87064d99b6ec5ddc643e9128cc SHA512 0110b08af0a94595764a9085e23d9d4b3ac1dec0b16e3c672b11520c7155d6b147890d53d25f00302812d22f95cb3ee7fc5563eae2476d8c99b7cc30aaadbc9e
 DIST sus-0.15.1.tar.gz 25680 BLAKE2B 4350023a6c2ae1c77687d0ebb66a31cd7a4d90cf955eabdca44be2282984aa3740e2f489844d7e30f448ba92cda6c949992cad1ed246c48db01c5b08ec058ad9 SHA512 f962f7f921144cca25faeb53be34a892501fdc1a2bd83dc64be7640232d1faa82b4d28c046af3440f7e142ea0fba525e1087b466952988e017ff469897dc01e4
 DIST sus-0.15.2.tar.gz 25676 BLAKE2B 3cc99d849674b87c8ac919dc176d48cfc184de9ed302f33a40a3f171430e9cc0ad9624c29f95053e7a8bd0ab7b2741bd6a09c7a77707a9ef83a265b09a095b4d SHA512 0f2e0f3640cce798564c53ffb2cc93996eda28af3b49d4f0d89327be960ef68e8aee5b0e906cfbadca0582bf5b363633314fd7d2eabf7ebf4782fe2aed095394
+DIST sus-0.16.0.tar.gz 26123 BLAKE2B 829e2ec74e60eb41809d85e9f74e1c8697d7803c6f26dd5da18f705fb0b35f85d8efb976eb858e07647db2137a1e864181346b69d2dd054d81289a6bd43cca2c SHA512 cd787e63b202df8b501c5d71198b9cfa23085b7e6ad7d9d9a4d023e4fab3a6c103d89390293f9940d14c023ea224b33b5ec728b67988aee8279cf248e20547cf
 EBUILD sus-0.13.0.ebuild 814 BLAKE2B dca4143816b09ca42de7d48e1a8cf51f82ccf5406884a04090244221c869be29bb89c7986f896b4f0497e89d7a9e44f740dc66ac0ee58a04c6e6a5535b61eb47 SHA512 9e17bc2fdfc1f9e41f5d3775b211f538de8e48eef8075ca2ec1ff2d56be110bfa4c336b858ce6fde294f98f46cb447c7f80e70c96a1f7ba37c58cd393cfb1fb7
 EBUILD sus-0.14.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.15.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.15.1.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.15.2.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
+EBUILD sus-0.16.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.16.0.ebuild b/dev-ruby/sus/sus-0.16.0.ebuild
new file mode 100644
index 000000000000..46c6a8c0fd05
--- /dev/null
+++ b/dev-ruby/sus/sus-0.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index 3820b8c84e8b..a57cb265f116 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -2,8 +2,10 @@ DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824
 DIST unicode-display_width-2.1.0.tar.gz 11981 BLAKE2B b8e70183b1df9f17bd719e1193c3c2ade5d9186772e4246b618d882eda997a0c22ee0179778f7b8580e32ec89461453144d57d198075f0d400ea52f3679ff7dc SHA512 f8fb1375ba0e88a41633d4aca4628198c5ee55f318a7f0055c9178b39f55818ec892f6e455021cf5050dbd1d748a102b319b1d8b9921ed1ba54a1d106d7911aa
 DIST unicode-display_width-2.2.0.tar.gz 12077 BLAKE2B f7b26d41e3b70122ddccbfdd44d83550bdab7b59b6801881814f33e50544d9d68ad59f34b58d9e961aaf9e2c709dfc83da8040cb03667e1293958cb23cf987c2 SHA512 85b7b9ed1e82b7865f32ad61208013cf89bcc5df05ac59ca2315545b759ee8da968409cbe89e7e7f30b03e209e811584ece2e99d33ae35413f9b6c318fff7064
 DIST unicode-display_width-2.3.0.tar.gz 12130 BLAKE2B 8a29aa0227e9bc63a8484d9a4f836dd4fccd3515206627e31f820cdef49167c406c67a3c9bae9c75b5e1c25675e1da02015f7eedc09ff413ffcd3e96704ae664 SHA512 82f52512f8338e310e501fd1892cbaf9c8e5b49a8bd191e9fafde72ca1ab5503ddfa81c3633b4ef6bc9e57d805f2792ddb5c6c63948022097feeb9bd7030beec
+DIST unicode-display_width-2.4.2.tar.gz 13096 BLAKE2B 89f7f8ded131a6c049242ede8822475c2629e2377a6b06ca59b1264c1c18981039c95c0aea8a24c00488b8f5c48aed3cc1b5672785eb36bbcf3cee1af8c2cc53 SHA512 c0815c19821855fed2d3205a6cae2059e0338fb27148f55281c910b54d5b0be2d34ba4bf990ba1c328c454f7ec8dbc0c69427550f2d62d1ac4ce5174b53b8ff3
 EBUILD unicode-display_width-1.7.0.ebuild 748 BLAKE2B 19c16dc0ff2b95b1ed42c0f54579b7dff9dd197169d6e5489e11cc1a9160a4873614e032a788f57f585b4a37c8c31febb23899b67f09e5d26b4cb814b6913556 SHA512 f4ccc3cdbc986402756c2014421359ee95b2c2ea6544b962da0340f42bbe0652cdd71340d732f215cebb2e6979b9f542949282f25e7b58efe55b4d41e02c168f
 EBUILD unicode-display_width-2.1.0.ebuild 808 BLAKE2B 845734eb0151a09f11c1461c870bb17d4f9df412e67a3700c778794776abb818a3a732f537b6c96d090bf770c2e8c2298e463e095c917a18f38b6e27c92196e2 SHA512 ed57f2930157d03c5dba412280c2ea5a5ff80334561b68d98780a396db8d3db96aef8bbbcf43f38002f87f3fec8968b4e5e9a6861b576dd90e9e2e7299afae71
 EBUILD unicode-display_width-2.2.0.ebuild 808 BLAKE2B 845734eb0151a09f11c1461c870bb17d4f9df412e67a3700c778794776abb818a3a732f537b6c96d090bf770c2e8c2298e463e095c917a18f38b6e27c92196e2 SHA512 ed57f2930157d03c5dba412280c2ea5a5ff80334561b68d98780a396db8d3db96aef8bbbcf43f38002f87f3fec8968b4e5e9a6861b576dd90e9e2e7299afae71
 EBUILD unicode-display_width-2.3.0.ebuild 801 BLAKE2B 3ca534298202ff608b79a774ee1d2a8de968adc822ce2914a2a0473586b01af75f1f3a74845920332abd3c817f81df9d81d54e13386d56f677998a1ed3f20b31 SHA512 cbc948df641120d366869ac56d5d9418049db55722f1756c5fca5ffeee4adf08ef41728c867fdeda83e6ec477d1f50a306a5a77ffd623a4109b00b3f11798ae8
-MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
+EBUILD unicode-display_width-2.4.2.ebuild 801 BLAKE2B 97462f7cccc2fdeb37586f33103bdc0af9b55a0daeb28c3c85b33a12089c3438f95baa938eeac4cbacf5a31eabaf4cfcb03ae29d7a0504a5c610c3ad149cb9ec SHA512 caa9fd820610494f1952a46b49db276f5003b3b1a3c70245c4d72302fdb201dc7e0ee3ece89dfdf0b144ffd4cf94b0f307c5755fe07ed7d2dbf92467053ce2e0
+MISC metadata.xml 422 BLAKE2B 822ec564698366cc9ae3c5319faf86ab7e3408f7f48cb1fe7118a912469bfa75119d1a64fd01dab709cf6df99ef5a5f0300a60393b77ccce0081e321e32515fe SHA512 d7c6abeb16d32bca8afa485954bd4fea6e4212c1d9b8139346c2d072cb008884a5bb70a82653a2e678a5416930a5e01b65de92534e13195edf3b9449e70f3ae6
diff --git a/dev-ruby/unicode-display_width/metadata.xml b/dev-ruby/unicode-display_width/metadata.xml
index 7a38fd1850ff..320aa7dd1242 100644
--- a/dev-ruby/unicode-display_width/metadata.xml
+++ b/dev-ruby/unicode-display_width/metadata.xml
@@ -5,4 +5,8 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">janlelis/unicode-display_width</remote-id>
+    <remote-id type="rubygems">unicode-display_width</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
new file mode 100644
index 000000000000..0be3be30a89d
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
+		-e '/Config object based API/,/^end/ s:^:#:' \
+		-i spec/display_width_spec.rb || die
+}
diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
index 2cc9d511e112..c868763cdb26 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.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 @@ if [[ ${PV} == "9999" ]]; then
 else
 	COMMIT_ID="d9fcc272b6a08c3e3e5b7919040f0ab5f8952d65"
 	SRC_URI="https://github.com/brendangregg/FlameGraph/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="CDDL"
diff --git a/dev-util/FlameGraph/Manifest b/dev-util/FlameGraph/Manifest
index 5f085a6d4f3d..a7119b8bc62d 100644
--- a/dev-util/FlameGraph/Manifest
+++ b/dev-util/FlameGraph/Manifest
@@ -3,6 +3,6 @@ DIST FlameGraph-1.0_p20210830.tar.gz 1057405 BLAKE2B 75669be86ace6e6ccb30bd3883c
 DIST FlameGraph-1.0_p20220918.tar.gz 1061640 BLAKE2B 6d4b96a21eec5c5706e108f3e4314d75a38df8bf64e96d84caaf90c7021cff58384a42df65d6def555c1a242f44d347cd82ab2f3eea5c2cebb5f42f86e6e38cc SHA512 97d57a33f4759c122ec09fe421288b31cbd227c1d81b771c76379f33cd62e1e44f5ebbd1510483df18cf355cd3ddcfc44a7a47f9ae54f30ecdae34e776dc87f1
 EBUILD FlameGraph-1.0.ebuild 687 BLAKE2B 8aae4b0d229f258c02be636a5f85e95bb21e7e1f8bed73b954ba843e59b1f5171848464819373339a107de2ac979eebc6f937708ed4f81b2397a6dfed03ce46b SHA512 a648faad2eaa9a0ba461debe379de968cd4eefdad6a4a77e317637c40a4b0bfec1daea5408fb171a8c947baad4ea62611da0327b767ce0af126f29b0b068ed92
 EBUILD FlameGraph-1.0_p20210830.ebuild 669 BLAKE2B bbb39895a9c0858f2c47048d9eeca2b65203edfb963093dac0395a4912e4f48ff6e46f3f8c55b866d38174e43d3170918c58ce2a4990c17d77677a714e1e4b6b SHA512 88360c97066f542ca2bef5e7d66b8c5ac38f6121d476659818cd17947b60bae42aa0070b5ec2e20e62b4b0cfb40af751e2a2bc3346b487ddb90aad987ba4a5be
-EBUILD FlameGraph-1.0_p20220918.ebuild 789 BLAKE2B dd3187092d6cf3a724eeef6987e4f7cd9098f092da9ab1cf2bbf5356f18879f60a87fe0086f6f92184133d42863d8fcedf10f4886309c465981f526558ab2075 SHA512 9ab72f598d8a35385f1f8a390df50467767c306a4bf9c44f61ba61ca81778e51e9a472ab1e7067e16afc1a7c3fa4ce22ca1a94539b29e7070dabffaf4d83c65c
+EBUILD FlameGraph-1.0_p20220918.ebuild 787 BLAKE2B 64cf0f7fdaa91339505f8c8e5a473be9fc08d64866b677c1cc949d2b4a240166ce0a90da5ec69362dd9379801d7954622bb34b693e207008e273b716b745d670 SHA512 7d401e8398c92dc33d36d522c42d4e4f37f3267929b95a1ee8f0d94c8736c0cb8ad293092fb5345b0271cb65177b4ccead7009ba2f7d5142fa1d09a839cbbd1f
 EBUILD FlameGraph-9999.ebuild 689 BLAKE2B 59642850636557277bd26347753fb0365f6e367c50acffb22e71d345fac3d6e32531f3b45470c09b1bdabcf4007d5e6d6bb082d6e160cd674c2b2a6bf44c557e SHA512 c1cf5a14edc17c1d00c4eb40f774b8a22e5b4a45d76d0fec4fa73baf528c1d88d6fc84ab72c99d5c6bd99f6449d58f0e3bb4ead54ade74091916b3c91aa37891
 MISC metadata.xml 335 BLAKE2B 763810bfc87b644b5559da3ebc79826e27b26f58c6be072da6c399e8f799d8a5f97cefa44b4b6d42af33dee63e53ef52660bd924619e90857290fa30071d9a25 SHA512 0acbd73fa02f69ff43015f2ad7b34a9d93e5423235111f2f93348889cb34f81a1a7980a507ab5628a18c6ab14895666391b1d3c555518df013b1eb245a18abe4
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 825bd7bf7901..6702ff0a12cb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index 7cc5234b9138..6ad5eb6931ba 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,3 +1,5 @@
 DIST android-udev-rules-20220903.tar.gz 21009 BLAKE2B 4f0375b574f123e7cbd18658582568f85e3278e9fe2b673e6c9193a16845737afc99d82d0df2f6a8d0daf784132e7d523bdf767761a5d467a66bf89f86cc1046 SHA512 ca09a1b49b6cbc7df2b8c6bea1e6fcf4886938c8567002054222795493bea036e3c5a139939e43cb965d45a8ecf74c0715583ef1aade2b7783751a75ab34d540
+DIST android-udev-rules-20230104.tar.gz 21266 BLAKE2B bbae83511b1fa5e94a50ae3cc44920862de30873304c0a904b4f9d3796296deff419c05db5d716cc89587c3a7ae7a302b2b219564e452564c5f3bf092e7515af SHA512 dcc45755a5a20a74d2241b398dba0e65135bf9c5539396bd6a3415b15fd865f4d3134de53de1ae2019ffe9567c557b5a386fdfe0245107b29c234a2211e0a211
 EBUILD android-udev-rules-20220903.ebuild 734 BLAKE2B c03881c500a241b722ce61d4305f4561d45076e5298ce138039071a6fe17e6036fe5795168adfe95dcd42a4db6a151ddbb4415e8f95ee6d3f36532a7928d55fa SHA512 b7963d1cfe8039f09bb6ecdeffd5e2b31aaa740ab7e9398858c7f70f67f47d25ab2fc8ec5562dc5b9ba747a3c0b3c77e07758321b2b042f4262870002a87e6be
+EBUILD android-udev-rules-20230104.ebuild 741 BLAKE2B d19e7448f94716d55a1364d244e0827b25bcc860c59ab1a07abe8179161961c24bc69c5ca6475782b9e31fbc27b9b2e2125ed2861755c92eebb2ac80424f0dda SHA512 f011a45d6f340c7da44123c8deef1b05544214633cda6a41f7963f7eade6dbde14cca34bd939d9ac0ba519d37f092c970de31d7990e477411d8c1f5b0d93aea5
 MISC metadata.xml 489 BLAKE2B 89af52034e7b4d3588131f94d9c5d2af47442a46550cb694383a19c5ed95de9e6be6b58dd91e32d951ec20d1b167bd550bc2aaf72db2ed866ef7b66367b3e7d9 SHA512 eb468d8fc9103f7b6f62849e130235d8697f770f3b7a4d9f45e591d4f8dc5b7cd1d6d80ab2df441f7f531e74fa0914947c5f65cabbb3e8d059d294b940b47132
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild
new file mode 100644
index 000000000000..12572552f91e
--- /dev/null
+++ b/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
+HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
+SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/android
+	virtual/udev
+"
+
+src_prepare() {
+	default
+
+	# Use the pre-existing android group
+	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
+}
+
+src_install() {
+	udev_dorules 51-android.rules
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 87c3f7037341..92aa57659b38 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
@@ -10,4 +11,5 @@ EBUILD lldb-15.0.6.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5
 EBUILD lldb-15.0.6.ebuild 2716 BLAKE2B ee270c3ff0808cc63879896b0e45a8917f8dca397ebd85b6063d8ffca03c599f855be2b83d4176ab6575832ed099e727cf005d4cba748e948d0a854f1e3d4d37 SHA512 5061d9be200b7140f0511a55110e854bd2560bfd44cc3231d9f1c7fe0db23c21a2c434d7c182df165f9d0790df596b2d03844cced969cbb845f9e5a4bf998db5
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20230101.ebuild 2664 BLAKE2B d585fb85b84194003cdd5bc079480dc6716026e7332567b6127f67b896577b7af4c880f84e8f191d9c7492c4ea5002bdec660bdeba74f416535c27d48783d880 SHA512 1a6bd506a7e7b4bfb0145fc0d9aba2c7994d5b3094f5e9631ff1c34513c36924df90181e5580a0ad2fac806daea3ed2d8c3d32a6494f6078e6ad2b500e2630bf
+EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B d585fb85b84194003cdd5bc079480dc6716026e7332567b6127f67b896577b7af4c880f84e8f191d9c7492c4ea5002bdec660bdeba74f416535c27d48783d880 SHA512 1a6bd506a7e7b4bfb0145fc0d9aba2c7994d5b3094f5e9631ff1c34513c36924df90181e5580a0ad2fac806daea3ed2d8c3d32a6494f6078e6ad2b500e2630bf
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0_pre20230107.ebuild b/dev-util/lldb/lldb-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..96a116ba0a1c
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.0_pre20230107.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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=""
+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)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index 465ad96a1b86..3dba9b95900d 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,6 +1,6 @@
 DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
 DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee
 EBUILD tup-0.7.10.ebuild 2662 BLAKE2B b42af53dad74b6300858bb85c9456348682a0fea81a659245dfa4a6af6b5406e3666024a85a5db1b45128e0740c429dac610041af563b66d125498aadbdd1eef SHA512 2897911f70618baf2136f0c9120352b06593462e80cbea8b91e5081eecb71702e5d710f7c45e104070c85c2c3f3e95e6f656f8450803299741c7ad9da8e50802
-EBUILD tup-0.7.11.ebuild 3034 BLAKE2B 52195a39bce47bb00529fd7b0394ac5899ae6af81b529b79e86cb7e74e2ac11b7b3c2ca93ca021d64ddb877d97a06ca31dd300c3a80b44518b10a455f4422dde SHA512 fc312a7c3b30e572c933ec2b2ec86e976b2855a55861eabe890f4bd959a7dddbcd017d118bcf0131be3dd4c1a9d201fc24e58b2587c35c4ba1cc38bdb250d6cc
+EBUILD tup-0.7.11.ebuild 3033 BLAKE2B 57700889a75bc9cf516455c2b5d8e6c60998f394510e75ed7395980ad4f2326e36d83fec5b7b7857acc6ee91ad6c73d3ba3488df25415de822412ee1722ad7d3 SHA512 9fe11df101d0c05a0a3dfd4219a799b3fd797573d655ee09ad19da51cebaf0502e4cec5b46cd964b9480feeb064126a9353b542789bcae64e51cad2082dd7afd
 EBUILD tup-9999.ebuild 2447 BLAKE2B 77f1047e5269e9f07917e5710aafe656f204a1765b0afbef91715bb89bb4ca0f97a12f32b6ea22df4905ce2b553edafa7e78bad0321a5ed89712634044e4eeda SHA512 6012b928d0422961f1341dfb2d9b844a17723c60e40d3938e461ca59a9c8180afe318c393dafb310dbed00838cb71b104a1011b119d1f70af5fd505398a3520f
 MISC metadata.xml 243 BLAKE2B b87b031fb5a945f70afbd431c56a3290c4cb0926e55d9a7bb10040806d40d494688e7c532131e6b47d9fc79237c08b41ea60fb14eb0e84b295788a5cb7b69bb5 SHA512 7f3a04c70b392b12fe3efb4c2fc0d75f7e9dd1e3b74568862913c678843e52883584bc892e8059b21c94bb515831923259a086f99481adb02cee02d852ae34ed
diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild
index 18992088eedc..42faf664fa7d 100644
--- a/dev-util/tup/tup-0.7.11.ebuild
+++ b/dev-util/tup/tup-0.7.11.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
@@ -21,7 +21,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 34d4a5e99667..e6c84007ce75 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 7edcc7aa2f38..47435f7980ac 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -81,15 +81,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
-				16.0.0_pre20221217)
-					EGIT_COMMIT=fb792ebaf2114ad11d673cf891ae560e2e604711
-					;;
-				16.0.0_pre20221226)
-					EGIT_COMMIT=dfc20708bcdf7b4c4bea8595fc4ac8674634d5e6
-					;;
 				16.0.0_pre20230101)
 					EGIT_COMMIT=b20dd2b186fdc76828219b705a2b58f5830f4b9d
 					;;
+				16.0.0_pre20230107)
+					EGIT_COMMIT=6dc85bd3fde7df2999fda07e9e9f2e83d52c6125
+					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9d56e24e7352..6daad0d80a1f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 586a3da88dd2..9a2157a59077 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,5 +15,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
 EBUILD sane-backends-1.1.1-r11.ebuild 9418 BLAKE2B 26e6c1979a769149f77bb15526bec0f8d9194a433428c4a34e752c14d4ad1458cee88205575cec780ccf2d5bd24c036da59136084ef3cbc0786a6646338d4a0d SHA512 b4be00af7484c25f488c27e0b2e6fe2132bf48e74d159890ace368d13eef976963a2307c00f1d457ddb45342c9a2992bd1bbbe32cc490d9188f9bc9894d39075
-EBUILD sane-backends-1.1.1-r13.ebuild 9581 BLAKE2B c621ea42804fc018ddb10f615238c1e7edf2cf336fb8e48d692e8684784c1c36e1d5f17e6ede48345623089dc27ac8711111d9df99f87925444881079a3fecb9 SHA512 60902ac37ad4bfaefac1b31ebf9a8a5d3643ea8f5dbaa8e434a5f298a54ed90bef86f6b46be41cd7d2aefd98095cd70262655b5167e081ea91224b86f6bf4d5e
+EBUILD sane-backends-1.1.1-r13.ebuild 9580 BLAKE2B c493d5ac23c8eb235ed07ee38fbe76f67e7c63ff312efed09d08fc2bb9aff08b6c4929d18afc1c52cba2f4537807bc48a9e121d48626d6222c3072e3e640165d SHA512 da3e7aab7d9ef7178dd3d65b116876a243764999e5733ba155fdbf3cb35486deca3578530d9c13f784509e92ea9da3acf145964a774eb40158d089d28ca3d1ab
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index fb1659fbd216..dd0efbaf1624 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.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
@@ -129,7 +129,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 916c8f2824f9..43b5a7c08fa8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 59dd989fec6c..338f59f15d9c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,9 +1,9 @@
 DIST abcMIDI-2022.09.01.zip 613296 BLAKE2B f91ae072768af52a4709146cefba1cb4af4a10d08ab1bb042d606672d666065a7a639771d7f2bc9b11af7dd898d230b160c19276ededc932b174f1fb717f3cd4 SHA512 45d52ccc90aed618649d18026f2142e0fb4665b97df4cbe20e9cb06ceb08769ab5d00a5bb2e60a9f0de6496cd5d222ea9f865d6c6cffc8efc626b994f8e0ed61
 DIST abcMIDI-2022.12.09.zip 617080 BLAKE2B 2e74577d4f1b8fb3dfa6dd4de1ca25998b4ecf546101a368d19c84db4f31795699e6a91e591dacef2e4dfbd48eb78d79b745a58fcab9884a68222fe446ddd9b9 SHA512 5eae6a2a9e5331a071627eba3687522f0682b7f7a587a05805fc812181101672ddc6337a3e20ac9d1968aebe3c0834f1d81061544a001cf43247dd903f57388f
 DIST abcMIDI-2022.12.30.zip 618258 BLAKE2B 390072d591ca1e65c046e7b02414978a00d688bc1ef5fb9601d932fe59b6a939cd24e41406646b434e3bf94a3e184c2689d03f3eb4e6ab0d9087e2714e7d7c12 SHA512 6092f529666407bf3aedd55c8c874b547a920c2f675b9b101d9fb14c514208a2ab963dc0da4b38eb95ff3cb98153f268fdf5a7bda066090d31d3399373f279bf
-DIST abcMIDI-2023.01.05.zip 619555 BLAKE2B 45b7dd58be44b3e89a7db189693e4010f8104ebe8e5700c68db832ec3d6c1867e0abb642ae3da520bdce4579f8e455985195ed3f1461ee1634a3cdc5fdbcef02 SHA512 0d421a5b403ffff8769f33b3d0910ea90fe990e177be82ed23f35aba8b5a654c1a1bfe2005c56dc58c85076a8fd03477bf477b2ddbc7ba4a4c3a946bb2d065ef
+DIST abcMIDI-2023.01.06.zip 619778 BLAKE2B d8052cb1b3961dba7dae272c333ef69bfe63b304eb03c1cef257a1e7d85c1df16511d893a580e7a40e9576ae98f16e401d6907fe4a9f0c94ae5d91c03f4c0454 SHA512 d2032f865dd5317692b055ab06530191e880fd6dd13d0351f89dd8d1ea0b4ff2bdefe758ade7d06d2319c61316bfb19a1114741b2a03680ee38c4c49c6d7a129
 EBUILD abcmidi-2022.09.01.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.12.09.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.12.30.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
-EBUILD abcmidi-2023.01.05.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
+EBUILD abcmidi-2023.01.06.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2023.01.05.ebuild b/media-sound/abcmidi/abcmidi-2023.01.06.ebuild
index 636c9619449a..636c9619449a 100644
--- a/media-sound/abcmidi/abcmidi-2023.01.05.ebuild
+++ b/media-sound/abcmidi/abcmidi-2023.01.06.ebuild
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index f6274587c14f..56dc312de8e5 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,5 +1,3 @@
-DIST pasystray-0.8.0.tar.gz 58770 BLAKE2B dff11dec46986d3b086acdff43aa7eda97e8edcdef0ef85a246087a3a0da9407cb4475ab4b579a370f90c23327d065ae704685124915b27e03f0be1a44e50a58 SHA512 104c68e41659306ca1e750d0d580d6ffcf4411da2da51a4f2780f551e12da9e104eb66ea841234292769f05a15f8f14ceaefc55893cf551a47124d086b1fb291
 DIST pasystray-0.8.1.tar.gz 59383 BLAKE2B 0d110b7625537d71b12a3ce9d89a32857fc66071bfabdfcc6409900ca13b92c1e2cfe9f7c27a33ae5ea3a89fe10d4c222f3bf60fcb498f07498a2a5497d9b51b SHA512 a9924b5b17833df4862f7c2bec5b518a3d8b6f2f80fe494c38a0cc07965095fb3155fc2181eb071f9acaf4629d81a908f2f622107c31346502293bfd4fa291a8
-EBUILD pasystray-0.8.0-r1.ebuild 863 BLAKE2B 045317eb70e1e8bb62382932040816b0c73d00c145adca8a9591a6041402c130355b2f7e64f1f4784fcf11f20f4c26a7439133dd7c47cd82c18a028ba6b21a68 SHA512 7733e06c23a78b0e80e60b7fa6e8e5a5bc75b6f08e00c5b98747ad132f7c8e6e09c1d5f7bb6732f209b1ccc7732401f39f9c9d742992a6e8afadb454d3e9da97
 EBUILD pasystray-0.8.1.ebuild 813 BLAKE2B 8e5fcd8d871d5d46c3cef269d6b985e4704c9e56caf2a2b2f21f432246c9aefd9d9f2f2e120a84f2df07275d2d572da9ed87b30c36370a5415b955b7da1b14fe SHA512 f752675a13c427eb7ae28e95222edf9495414008cced45b909d50c82777ed796d3a8fab480754748487440b09b25358939d9e60991adc9a82e294227a8c679e0
 MISC metadata.xml 666 BLAKE2B 6729f9a6e3bbfeaa9f8319c53770972326a0ffe851c02b5238d0e928c02d222d93bf569d00a9b6c1f33602fc13b764f9750d4473f67b1fc5d36da06e52fe96c0 SHA512 11a383b58d521ce5ca4bdcf3505e45b8dbd3053cf3e075c39c8dc4b83c94e3e7654141ffc8048cacdf8b4cc0c4d6565fe0d9609a3e14bf14bc248578978cf39d
diff --git a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild b/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
deleted file mode 100644
index 6ee50f286b3a..000000000000
--- a/media-sound/pasystray/pasystray-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	dev-libs/glib
-	|| (
-		media-libs/libpulse[glib]
-		media-sound/pulseaudio-daemon[glib,zeroconf?]
-		<media-sound/pulseaudio-15.99.1[glib,zeroconf?]
-	)
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	zeroconf? ( net-dns/avahi )
-	libnotify? ( x11-libs/libnotify )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 97dd27be701f..f3346f444074 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6d65f8ac7836..74447015bb2c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 05:39:40 +0000
+Sun, 08 Jan 2023 11:39:35 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 091623b781c0..76fb98a0d437 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2023-01-08T05:39:43Z
+TIMESTAMP 2023-01-08T11:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6Vx9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC0AhAAp/7UHF2p07Xe+WSEwWufi/ZFEK4VVFfXOTBE6h9BWFlToLhBZ7E6YYGi
-z9MxPDHw9kfymSa1yYbVTAHNitzT2nzuy5j0ZlX6ONvo7g8LsiWJJw3l8eD/HUSS
-R2mXda+IPETMh1inxyfmbfljPJrDWbicByAntiD3FHU1FpL8lyd/30177stDiBrb
-tTELvv0nLG5G8034TOVF6xpDofgvYZqtmJEAxBhGXnGJcSxEQRYPPC4OuUK+nIdC
-F3xLQYj+9hMWtTSXfMuD8SFVajNbCKhAwo4BRdwR5jIHRpiIb8dZhO62cXympW8V
-z0Qn1V39GF3ChzK7uugLTpcfiMKn1ULiWabAAraJR16KnP/8xUzaXXiNF1AkIXkB
-AVBIOmGTaR/GpyB8e1ft/mcMynO6fASood4iajTr9rAiVBbeD7bOJBdwT2baqzvd
-gwcXdJvFtGo4lVrAz6OF5ipXOjUTYsxQgtHCqDXdbVGyMV1x9uD8H/AngHbDr+yW
-O0hFgbO1WziFfIAj6Sqx8bRhDmPZHUpZNeF9yecm8iSy5sZngnRy3yv96Y2VFHD7
-nND2FujZ5IvVWZCKhgEodEywUNpnCIm214HhTPujszda+EXwglTGMwLXGynZyPLm
-4xXtl1wT5eTCfa/Abk7ryxQTX7SJ6Lbc2Hdc3qU57zTBnlYNjzc=
-=mLRg
+klAAUw/+NEH2h7NrEE7/3ej0xKB8YYe7I43zb+e8anbpV5ZZmhKjeEMrqlArqViP
+MyKDZV0gfDr1ydKP4EFdrJJry020VVQqXpEscBhDV4nFfys9ZAZzJSosabg845jv
+FPVfNCENb0O3Ymfp0gBdaoLKXmj1o/BgDKfblRUUj59uuf2t8q8GgLkOTzThc+j5
+jnwxhkb2QhgbOGCDn7dhABJRBMS+HpcOpMFdo5LJZaUSMq1mMJaNYCpV9GzxVslo
+8GN5WVoaiEotSutQ1egrOwhzaRO66G7WRfRxJhUzYv8qCPWir3Le1AtORZGvbh/9
+lQ9QfDSchE77V38D+SXxdJn88NFSzGLDHCxKt0qXpgIjxqfXep13fAI+wBHgGlj4
+dG4KcObl+6R7TjXldXsxiFKZDAHlOohAfL4I1JgKnD2/cCjTte4XAtaOrObp9Uud
+NbX4gfdMMud1TyuByQ3DgcQy32ZrO/CfiCEPJsZ2PWg3R5iTZjb1VXpeAp4OkUJ4
+7QNAIpFSlUPPzx8OGmWheacw78bbKPu3GCsKZ6iy45a9LhYI6PZ+7zB7JnOlrJor
+wxtttcFd7T2eLg6HtXbRFOENfOJH8j6+ZlKEH3P7khuNMp9JNDXqanyjpDtSLNTS
+J0Cp5FGdtr/uW0wSk+u4VI4B3tu2GUom54yUG7+pEaUXJskqIA0=
+=1i0n
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6d65f8ac7836..74447015bb2c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 05:39:40 +0000
+Sun, 08 Jan 2023 11:39:35 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fd3199f3f10b..fa1c0c806cbd 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 5f091e8cee15..b88c18fe41ce 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r4 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r4
deleted file mode 100644
index fde7cd4a98c8..000000000000
--- a/metadata/md5-cache/app-admin/logsurfer+-1.8-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Real Time Log Monitoring and Alerting
-EAPI=7
-HOMEPAGE=https://www.crypt.gen.nz/logsurfer/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=freedist GPL-2+
-RDEPEND=acct-group/logsurfer acct-user/logsurfer
-RESTRICT=bindist
-SLOT=0
-SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b10ca636567daa771f316b024d499171
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r5 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r5
index 0218c617f3be..f2c000454de8 100644
--- a/metadata/md5-cache/app-admin/logsurfer+-1.8-r5
+++ b/metadata/md5-cache/app-admin/logsurfer+-1.8-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install
 DESCRIPTION=Real Time Log Monitoring and Alerting
 EAPI=8
-HOMEPAGE=https://www.crypt.gen.nz/logsurfer/
+HOMEPAGE=https://crypt.gen.nz/logsurfer/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=freedist GPL-2+
@@ -10,4 +10,4 @@ RESTRICT=bindist
 SLOT=0
 SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3bd7e61b2a9705212d3d27c4b9f0f508
+_md5_=3c692c1187a444370db1343fd5c44a9c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 258df82bba1c..417cb68029c1 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/upx-4.0.1 b/metadata/md5-cache/app-arch/upx-4.0.1
index 221df01fdd90..29963badee9b 100644
--- a/metadata/md5-cache/app-arch/upx-4.0.1
+++ b/metadata/md5-cache/app-arch/upx-4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression
 EAPI=8
 HOMEPAGE=https://upx.github.io/
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ UPX-exception
 RDEPEND=!app-arch/upx-bin
 SLOT=0
 SRC_URI=https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-src.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28bfac279e4d600ae48d93db392e6780
+_md5_=30de1bcf8e710fdfab8e268852259a65
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index d187e01289a3..4b1e4a5c8ba2 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/adcli-0.9.1-r2 b/metadata/md5-cache/app-crypt/adcli-0.9.1-r2
deleted file mode 100644
index 7a6d63a07d53..000000000000
--- a/metadata/md5-cache/app-crypt/adcli-0.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-text/docbook-xml-dtd:4.3 app-text/xmlto dev-libs/libxslt ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DEPEND=app-crypt/mit-krb5 net-nds/openldap:=[sasl]
-DESCRIPTION=Tool for performing actions on an Active Directory domain
-EAPI=8
-HOMEPAGE=https://www.freedesktop.org/software/realmd/adcli/adcli.html
-INHERIT=autotools
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-crypt/mit-krb5 net-nds/openldap:=[sasl]
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/realmd/adcli/-/archive/0.9.1/adcli-0.9.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c9601d11a8165508ca22e53f86555e92
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index c067bf2d1b7d..83c0e73df578 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/levee-4.0 b/metadata/md5-cache/app-editors/levee-4.0
index 5c382da69354..66e6dcd9f7c4 100644
--- a/metadata/md5-cache/app-editors/levee-4.0
+++ b/metadata/md5-cache/app-editors/levee-4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Really tiny vi clone, for things like rescue disks
 EAPI=8
 HOMEPAGE=https://www.pell.portland.or.us/~orc/Code/levee/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=levee
 RDEPEND=!app-text/lv sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://www.pell.portland.or.us/~orc/Code/levee/levee-4.0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/app-editors/levee/levee-4.0-patches.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0d4a6f280eb8b11dccb8ef4b3ad69318
+_md5_=f28abfd6b97c9ad09191b1578b9ecc4e
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index f33e9ae14f42..7e4e99e13268 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aide-0.17.4-r3 b/metadata/md5-cache/app-forensics/aide-0.17.4-r4
index d2153f5a88da..0d2166fa8327 100644
--- a/metadata/md5-cache/app-forensics/aide-0.17.4-r3
+++ b/metadata/md5-cache/app-forensics/aide-0.17.4-r4
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/bison sys-devel/flex 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=configure install postinst prepare
-DEPEND=dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+DEPEND=dev-libs/libpcre sys-libs/zlib acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr )
 DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a file integrity checker
 EAPI=8
 HOMEPAGE=https://aide.github.io/ https://github.com/aide/aide
 INHERIT=autotools readme.gentoo-r1
-IUSE=acl audit curl e2fs mhash selinux xattr zlib
-KEYWORDS=amd64 ~arm64 ~x86
+IUSE=acl audit curl e2fs mhash selinux xattr
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-aide )
+RDEPEND=dev-libs/libpcre sys-libs/zlib acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) selinux? ( sec-policy/selinux-aide )
 SLOT=0
 SRC_URI=https://github.com/aide/aide/releases/download/v0.17.4/aide-0.17.4.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1148996cffd848789044220e52e734c0
+_md5_=c9ea14013c058e01b8033e3dc575162d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 539cabcad695..5a44dd692c51 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/apvlv-0.4.0-r1 b/metadata/md5-cache/app-text/apvlv-0.4.0-r1
index d1195a450ce8..f08d96a00dee 100644
--- a/metadata/md5-cache/app-text/apvlv-0.4.0-r1
+++ b/metadata/md5-cache/app-text/apvlv-0.4.0-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/naihe2010/apvlv/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake desktop
 IUSE=debug djvu
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/ebook-tools >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)] dev-libs/glib:2 dev-libs/libxml2 net-libs/webkit-gtk:4= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango djvu? ( app-text/djvu )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/refs/tags/v0.4.0.tar.gz -> apvlv-0.4.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=913f4cc3ceea35c4617009370b77defb
+_md5_=962926e2c6f3531ee2e9ade2b623205b
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b8293cb265fa..ea637f40a77f 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/catch-3.0.1 b/metadata/md5-cache/dev-cpp/catch-3.0.1
index 15c469e34836..e22398af0f23 100644
--- a/metadata/md5-cache/dev-cpp/catch-3.0.1
+++ b/metadata/md5-cache/dev-cpp/catch-3.0.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/catchorg/Catch2
 INHERIT=cmake python-any-r1
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v3.0.1.tar.gz -> Catch2-3.0.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=de8d27b31d14ed84087e6a31609a0a98
+_md5_=e9128d6318f51497c0986576a883f60c
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
index 1b2816592c61..a983e6ea1331 100644
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
 INHERIT=cmake
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.10.4.tar.gz -> rapidfuzz-cpp-1.10.4.gh.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=20d31b4e0cd83653d77891916b224495
+_md5_=fd4a311f6f2be285450e51fcccde2511
diff --git a/metadata/md5-cache/dev-cpp/taskflow-3.3.0 b/metadata/md5-cache/dev-cpp/taskflow-3.3.0
index b10e53b99949..34d4b664e05f 100644
--- a/metadata/md5-cache/dev-cpp/taskflow-3.3.0
+++ b/metadata/md5-cache/dev-cpp/taskflow-3.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://taskflow.github.io
 INHERIT=cmake
 IUSE=examples test
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taskflow/taskflow/archive/v3.3.0.tar.gz -> taskflow-3.3.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8fd1b96e518aea6b1325825ce007626d
+_md5_=725a59a6daf6c50672f50d8cedf8750b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a2704bc8ef71..3351b84cb1b9 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.29-r1 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.31-r1
index 8ae08d5219ca..351b65b60a12 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.29-r1
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.31-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 <dev-cpp/antlr-cpp-4.8:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=MySQL Workbench
 EAPI=7
 HOMEPAGE=https://www.mysql.com/products/workbench/
 INHERIT=gnome2 flag-o-matic python-single-r1 cmake
 IUSE=debug doc python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 <dev-cpp/antlr-cpp-4.8:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.29-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
+SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.31-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a380de91deefba2050b1f19fe54869d5
+_md5_=3cd520c246ccc617ddfe54e3b86057cb
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
index 1f3ad2c9a09f..caed96abb4b8 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
 INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 x86
+KEYWORDS=amd64 x86
 LICENSE=OTN
 RDEPEND=>=dev-libs/libaio-0.3.109-r5[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/glibc odbc? ( dev-db/unixODBC )
 REQUIRED_USE=precomp? ( sdk )
@@ -13,4 +13,4 @@ RESTRICT=mirror splitdebug test
 SLOT=0/21.1
 SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux-21.3.0.0.0.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux-21.3.0.0.0.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux.x64-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux.x64-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux.x64-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux.x64-21.3.0.0.0.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux.x64-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux.x64-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux.x64-21.3.0.0.0.zip ) )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1c9afb88874fda29ab339aca9f3248c6
+_md5_=1827a6a3dbf8a6be724f89ce510e077d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e2c8512d3b1c..f619df69bf90 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/gradle-bin-7.6 b/metadata/md5-cache/dev-java/gradle-bin-7.6
index b6d9dea68b6a..0dad9ca7b3f3 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.6
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gradle.org/
 INHERIT=java-pkg-2
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.6
 SRC_URI=https://services.gradle.org/distributions/gradle-7.6-all.zip -> gradle-bin-7.6.zip
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=c62185d27694066bfc0c810d02fd8bcb
+_md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.10 b/metadata/md5-cache/dev-java/mill-bin-0.10.10
index c24d99064dc6..78081ee03bc8 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.10
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.10
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.10/0.10.10-assembly -> mill-bin-0.10.10
-_md5_=2b4d4ada0013d7b03d498570ab932074
+_md5_=51fc38f30a15ef2b74b631eb3b1d4b1a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e76cf88022b8..d8dc731ba82c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.4.2 b/metadata/md5-cache/dev-lang/swi-prolog-8.4.2
deleted file mode 100644
index e5415da98715..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( media-libs/libjpeg-turbo:= x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-INHERIT=cmake desktop xdg-utils flag-o-matic toolchain-funcs java-pkg-opt-2
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( media-libs/libjpeg-turbo:= x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) java? ( >=dev-java/java-config-2.2.0-r3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.4.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=92d243e37959b27ef564198684045143
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-9.1.2 b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2
new file mode 100644
index 000000000000..351b41ac89ec
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib:= virtual/libcrypt:= X? ( media-libs/freetype:2 media-libs/fontconfig:1.0 media-libs/libjpeg-turbo:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt ) archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) cli? ( dev-libs/libedit sys-libs/readline:= ) gmp? ( dev-libs/gmp:0= ) gui? ( !qt6? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !minimal? ( dev-libs/ossp-uuid ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( >=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=8
+HOMEPAGE=https://www.swi-prolog.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop flag-o-matic java-pkg-opt-2 toolchain-funcs xdg
+IUSE=X archive berkdb +cli debug doc +gmp gui +ipc java minimal odbc pcre pgo qt6 ssl test yaml java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib:= virtual/libcrypt:= X? ( media-libs/freetype:2 media-libs/fontconfig:1.0 media-libs/libjpeg-turbo:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt ) archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) cli? ( dev-libs/libedit sys-libs/readline:= ) gmp? ( dev-libs/gmp:0= ) gui? ( !qt6? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !minimal? ( dev-libs/ossp-uuid ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= ) yaml? ( dev-libs/libyaml ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=doc? ( archive ) minimal? ( !archive !doc !ipc !ssl !test )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-9.1.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=babeb908183dbd46cfbbf653d3fca9f3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 41cb6e47df95..124e6bd135f9 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index 4079c587bfa1..123e333fb24d 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8f80ef1fb0d97fbc80d9a09337f9f6a1
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.6 b/metadata/md5-cache/dev-libs/libclc-15.0.6
index 3b976fdaf5b1..6aa6a9a485b5 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.6
@@ -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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e0878b2bccd03350d17bec8e2acd9060
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.6.9999 b/metadata/md5-cache/dev-libs/libclc-15.0.6.9999
index af9ecebba4ab..7f338297455e 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.6.9999
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.6.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=805906ec5e8bc8a5587adeef8c95d452
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
index cfa6e003c066..d89607800029 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6d87f33e797c3c7b21b27c8186248225
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230101 b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230101
index 43f7992916fe..a2c2dae32bda 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230101
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230101
@@ -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/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=457c40830b53a6edd0343666fa66b7ab
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107 b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107
new file mode 100644
index 000000000000..ba4ee8aa1187
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20230107
@@ -0,0 +1,13 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=457c40830b53a6edd0343666fa66b7ab
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 4082eb206c89..5e6a637c2d8b 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-13.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1
index 704a721782eb..d30bf8f2aa2d 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/13.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b04617812b555ce0e0e1ac200222aec8
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 258e706431f9..e29e3f175b29 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fbae63c9b8e8f4c773111b71ce3e17ae
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6
index fd85bc73a0bd..9efffa1c50d2 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=aae4fd14e592af001108cade1ff7fd18
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6.9999
index 01009555d526..a1d32c604fe8 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.6.
 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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
 RESTRICT=!test? ( test )
 SLOT=0/15.0.6.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=31ce9612f8264beb63ef452e8f3ae5d7
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
index 8f0581608b25..b416eb1ae0b9 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d104c2b9071a4b8897e8436525e8f915
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230101 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230101
index 20fff2744051..ef05f717e774 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230101
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2be491f6e7ddfc31a1e19b555f07f6c2
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107
new file mode 100644
index 000000000000..674716bcb42f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_pre20230107:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_pre20230107[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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_pre20230107:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_pre20230107[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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2be491f6e7ddfc31a1e19b555f07f6c2
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.20.8 b/metadata/md5-cache/dev-python/Levenshtein-0.20.8
index 44f21a7964f4..717b7af05e0b 100644
--- a/metadata/md5-cache/dev-python/Levenshtein-0.20.8
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.20.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=<dev-python/rapidfuzz-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/Levenshtein/archive/v0.20.8.tar.gz -> Levenshtein-0.20.8.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fa6902063f9f6dbb67de5f838373539d
+_md5_=dac6571fb752ef32c186824c85e02a13
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d6e60fc112df..8fbc0df6b4a3 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/clang-python-13.0.1 b/metadata/md5-cache/dev-python/clang-python-13.0.1
index a241bd4f21c2..07650d65445e 100644
--- a/metadata/md5-cache/dev-python/clang-python-13.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-13.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=1314a02dd5552fdefacc1cd766ef4a60
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 f06881bf6d13..dabaf48c0f4b 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=5c51d2e4c795345c6807a2b712b6846e
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.6 b/metadata/md5-cache/dev-python/clang-python-15.0.6
index 8889bfc2f1b1..e37304995e69 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=49954e9ab8d09b2f272b2871b93ca022
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.6.9999 b/metadata/md5-cache/dev-python/clang-python-15.0.6.9999
index 54257539b5e9..9212b1c24d81 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.6.9999
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-15.0.6.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=e761e83df8aff100a24b6bfad08af640
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
index ae9c05f8aced..5fc9aa7604c9 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-16.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=e761e83df8aff100a24b6bfad08af640
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230101 b/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230101
index 704b784cd6b2..2c8bfb299c99 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230101
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=1c0bec4b501c87551892f526e9bc88e1
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230107 b/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230107
new file mode 100644
index 000000000000..4713220ea68d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) test? ( sys-devel/clang:16 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-16.0.0_pre20230107:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-16.0.0_pre20230107:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=1c0bec4b501c87551892f526e9bc88e1
diff --git a/metadata/md5-cache/dev-python/lit-13.0.1 b/metadata/md5-cache/dev-python/lit-13.0.1
index a33b1c3b72e0..d3b71b1398d9 100644
--- a/metadata/md5-cache/dev-python/lit-13.0.1
+++ b/metadata/md5-cache/dev-python/lit-13.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=7ef2c4fc2a2b300e562735da19ed4701
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 6623ccb735bc..c4fa99a6cd5d 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	dcd5f48510105eb95e550ab968147365	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=a62a9c63dc9a58c2963bf6100ac1249c
diff --git a/metadata/md5-cache/dev-python/lit-15.0.6 b/metadata/md5-cache/dev-python/lit-15.0.6
index cf9721f2df5a..56f630cf6aab 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.6
+++ b/metadata/md5-cache/dev-python/lit-15.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=0aec8c4613b136c093bb843f5eada4c3
diff --git a/metadata/md5-cache/dev-python/lit-15.0.6.9999 b/metadata/md5-cache/dev-python/lit-15.0.6.9999
index 992235f22bfe..15373365ac04 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.6.9999
+++ b/metadata/md5-cache/dev-python/lit-15.0.6.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=efa1f4ea248be58f79439db9d2f50b07
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0.9999 b/metadata/md5-cache/dev-python/lit-16.0.0.9999
index 992235f22bfe..15373365ac04 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-16.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=efa1f4ea248be58f79439db9d2f50b07
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_pre20230101 b/metadata/md5-cache/dev-python/lit-16.0.0_pre20230101
index 49a88c5c5b77..036dae0510ab 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0_pre20230101
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_pre20230101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=038382f95418393cb0db4efe2314391e
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_pre20230107 b/metadata/md5-cache/dev-python/lit-16.0.0_pre20230107
new file mode 100644
index 000000000000..214e0c732201
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_pre20230107
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=74ac0e7fe68f607dfa7638154ab84382
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.13.7 b/metadata/md5-cache/dev-python/rapidfuzz-2.13.7
index c8a719a485da..84f68fbd7fdc 100644
--- a/metadata/md5-cache/dev-python/rapidfuzz-2.13.7
+++ b/metadata/md5-cache/dev-python/rapidfuzz-2.13.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.13.7.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b7bfb86655bd787bfa66bf4fedb69531
+_md5_=d3ae9fb1047efe3805c9edcba538eea6
diff --git a/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5 b/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
index dd3ee69b1419..7653ce637e8c 100644
--- a/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
+++ b/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/maxbachmann/rapidfuzz_capi/ https://pypi.org/project/rapidfuzz-capi/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/rapidfuzz_capi/archive/v1.0.5.tar.gz -> rapidfuzz_capi-1.0.5.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1978f43b2a308838d842ac8d4ccff191
+_md5_=b1fdccc500f040177c47695555aa2759
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d3a99e63e5cd..ef89aad44aa9 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.4.3 b/metadata/md5-cache/dev-ruby/bundler-2.4.3
new file mode 100644
index 000000000000..89af3f434f9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-2.4.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An easy way to vendor gem dependencies
+EAPI=8
+HOMEPAGE=https://github.com/carlhuda/bundler
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) dev-vcs/git ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/bundler-2.4.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6a534ad2e5fe7d601eee863871c6eb98
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1 b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
deleted file mode 100644
index 0d7d4d1d87e1..000000000000
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl[ssl] test? ( net-misc/curl ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby-language bindings for libcurl
-EAPI=7
-HOMEPAGE=https://github.com/taf2/curb
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64
-LICENSE=Ruby
-RDEPEND=net-misc/curl[ssl] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9921c5b018842e9b933c9c5af1c1fc18
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0
new file mode 100644
index 000000000000..545e6a1667f9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rails:6.1[ruby_targets_ruby27(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby27(-),sqlite] dev-ruby/temple[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rails:6.1[ruby_targets_ruby30(-)] dev-ruby/activerecord:6.1[ruby_targets_ruby30(-),sqlite] dev-ruby/temple[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-ruby/fast_gettext-0.9.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/fast_gettext-0.9.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=FastGettext / Rails integration
+EAPI=8
+HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=public-domain
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/fast_gettext-0.9.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/fast_gettext-0.9.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.10.0.tar.gz -> gettext_i18n_rails-1.10.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=8da432d6ae21753406ba31613fa1e8d0
diff --git a/metadata/md5-cache/dev-ruby/git-1.13.0-r1 b/metadata/md5-cache/dev-ruby/git-1.13.0-r1
new file mode 100644
index 000000000000..8ae210f9bfc7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/git-1.13.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/minitar[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Library for using Git in Ruby
+EAPI=8
+HOMEPAGE=https://github.com/schacon/ruby-git
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/schacon/ruby-git/archive/v1.13.0.tar.gz -> git-1.13.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a2bc0432e81eb6b9832506eb53f03f7c
diff --git a/metadata/md5-cache/dev-ruby/maxitest-4.4.0 b/metadata/md5-cache/dev-ruby/maxitest-4.4.0
new file mode 100644
index 000000000000..93fe1e8efa2b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maxitest-4.4.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Minitest + all the features you always wanted
+EAPI=8
+HOMEPAGE=https://github.com/grosser/maxitest
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/minitest-5.18:5[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/grosser/maxitest/archive/v4.4.0.tar.gz -> maxitest-4.4.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=3621ba1c7a4dd4e78dddadc7628f1835
diff --git a/metadata/md5-cache/dev-ruby/parser-3.2.0.0 b/metadata/md5-cache/dev-ruby/parser-3.2.0.0
new file mode 100644
index 000000000000..155be61856f6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-3.2.0.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/racc[ruby_targets_ruby31(-)] ) dev-ruby/cliver[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==dev-util/ragel-6* ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=8
+HOMEPAGE=https://github.com/whitequark/parser
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/whitequark/parser/archive/v3.2.0.0.tar.gz -> parser-3.2.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6391bba9dd412bd3f162bfeaf17e5ddd
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.3 b/metadata/md5-cache/dev-ruby/rack-3.0.3
new file mode 100644
index 000000000000..a270f472f6df
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-3.0.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A modular Ruby webserver interface
+EAPI=8
+HOMEPAGE=https://github.com/rack/rack
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3.0
+SRC_URI=https://github.com/rack/rack/archive/v3.0.3.tar.gz -> rack-3.0.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=35d173875d98a8e2841c1a4da08553b6
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.2.0 b/metadata/md5-cache/dev-ruby/rack-protection-2.2.0
deleted file mode 100644
index 61417c48bdd9..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=This gem protects against typical web attacks
-EAPI=8
-HOMEPAGE=https://github.com/rkh/rack-protection
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/rack-protection-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=66c222bdafb31dbc1c8215979c4e4574
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.2.2 b/metadata/md5-cache/dev-ruby/rack-protection-2.2.2
deleted file mode 100644
index 642e44b214e3..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=This gem protects against typical web attacks
-EAPI=8
-HOMEPAGE=https://github.com/rkh/rack-protection
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/rack-protection-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=781190f392884bbb77f98d9f1104c499
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.2.1 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
index 27089a20c902..64d1cd3ef3eb 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.2.1
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/rack-protection-2.2.1.gem
+SLOT=3
+SRC_URI=https://rubygems.org/gems/rack-protection-3.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=781190f392884bbb77f98d9f1104c499
+_md5_=4a36b74eae173dc90ab007f72edc6286
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.3 b/metadata/md5-cache/dev-ruby/rbs-2.8.3
new file mode 100644
index 000000000000..c1209fe7f7ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] dev-ruby/test-unit[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/test-unit[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=The language for type signatures for Ruby and standard library definitions
+EAPI=8
+HOMEPAGE=https://github.com/ruby/rbs
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rbs/archive/refs/tags/v2.8.3.tar.gz -> rbs-2.8.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b1f74147187f31a0176ce70a19eb20e3
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.5.0 b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
new file mode 100644
index 000000000000..8e341bafdb8c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby27(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby30(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby31(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
+EAPI=8
+HOMEPAGE=https://github.com/ruby/rdoc/
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby-BSD )
+RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby27? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rdoc/archive/v6.5.0.tar.gz -> rdoc-6.5.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=9bd51be45612f0377ac685bb35bf8a24
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2
new file mode 100644
index 000000000000..9b0ef19f8418
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby30(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby31(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/rspec/rspec-expectations
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] =dev-ruby/rspec-support-3.12*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.12.2.tar.gz -> rspec-expectations-3.12.2-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6aa4987b77d0769c16a7042f06f956a6
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2
new file mode 100644
index 000000000000..e446c2304c88
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby31(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-core-3.12.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rspec-core-3.12.0:3[ruby_targets_ruby30(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rspec-core-3.12.0:3[ruby_targets_ruby31(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/rspec/rspec-mocks
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.12*[ruby_targets_ruby31(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.12.2.tar.gz -> rspec-mocks-3.12.2-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=0b48afb8f0992aa265794650335e5dd6
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.4.3 b/metadata/md5-cache/dev-ruby/rubygems-3.4.3
new file mode 100644
index 000000000000..866ee28e0f56
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.4.3
@@ -0,0 +1,18 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=8
+HOMEPAGE=https://rubygems.org/
+INHERIT=ruby-ng prefix
+IUSE=server test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( =dev-ruby/builder-3* )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rubygems/rubygems/archive/v3.4.3.tar.gz -> rubygems-3.4.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=629947c0b8b40d5c05a1da273bf7e37c
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.2.0-r1 b/metadata/md5-cache/dev-ruby/sinatra-2.2.0-r1
deleted file mode 100644
index 31dc34e14dbf..000000000000
--- a/metadata/md5-cache/dev-ruby/sinatra-2.2.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/mustermann:1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-2.2.0[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-2.2.0[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby27(-)] dev-ruby/erubis[ruby_targets_ruby27(-)] dev-ruby/builder[ruby_targets_ruby27(-)] <dev-ruby/activesupport-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby30(-)] dev-ruby/erubis[ruby_targets_ruby30(-)] dev-ruby/builder[ruby_targets_ruby30(-)] <dev-ruby/activesupport-7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
-EAPI=8
-HOMEPAGE=http://www.sinatrarb.com/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/mustermann:1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-2.2.0[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-2.2.0[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/sinatra/sinatra/archive/v2.2.0.tar.gz -> sinatra-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9f41291208b7a64143f7adcd77d8edb4
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.2.2 b/metadata/md5-cache/dev-ruby/sinatra-2.2.2
deleted file mode 100644
index 95437a587574..000000000000
--- a/metadata/md5-cache/dev-ruby/sinatra-2.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/mustermann:2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-2.2.2[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-2.2.2[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby27(-)] dev-ruby/erubis[ruby_targets_ruby27(-)] dev-ruby/builder[ruby_targets_ruby27(-)] <dev-ruby/activesupport-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby30(-)] dev-ruby/erubis[ruby_targets_ruby30(-)] dev-ruby/builder[ruby_targets_ruby30(-)] <dev-ruby/activesupport-7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
-EAPI=8
-HOMEPAGE=http://www.sinatrarb.com/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/mustermann:2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-2.2.2[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-2.2.2[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/sinatra/sinatra/archive/v2.2.2.tar.gz -> sinatra-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=736bbca6bb88ec71befd8b4b2ab0a4b5
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.5 b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
new file mode 100644
index 000000000000..05104f245245
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/mustermann:3[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:3[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/mustermann:3[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby31(-)] dev-ruby/tilt:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby27(-)] dev-ruby/erubis[ruby_targets_ruby27(-)] dev-ruby/builder[ruby_targets_ruby27(-)] <dev-ruby/activesupport-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby30(-)] dev-ruby/erubis[ruby_targets_ruby30(-)] dev-ruby/builder[ruby_targets_ruby30(-)] <dev-ruby/activesupport-7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby31(-)] dev-ruby/erubis[ruby_targets_ruby31(-)] dev-ruby/builder[ruby_targets_ruby31(-)] <dev-ruby/activesupport-7[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
+EAPI=8
+HOMEPAGE=http://www.sinatrarb.com/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/mustermann:3[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:3[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/mustermann:3[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby31(-)] dev-ruby/tilt:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.5.tar.gz -> sinatra-3.0.5.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a1aba9ccfb2a4b06b77100200cf8aa05
diff --git a/metadata/md5-cache/dev-ruby/sus-0.16.0 b/metadata/md5-cache/dev-ruby/sus-0.16.0
new file mode 100644
index 000000000000..ed35b5d05b46
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sus-0.16.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A fast and scalable test runner
+EAPI=8
+HOMEPAGE=https://github.com/ioquatix/sus
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.16.0.tar.gz -> sus-0.16.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
new file mode 100644
index 000000000000..8e200c33b355
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Adds String#display_width to get the display size using EastAsianWidth.txt
+EAPI=8
+HOMEPAGE=https://github.com/janlelis/unicode-display_width
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.4.2.tar.gz -> unicode-display_width-2.4.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=703e98353ae5932915ea6a81af9b00cd
diff --git a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918 b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
index a16bc4c7e43e..6ab8d9cf51f5 100644
--- a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
+++ b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
@@ -2,9 +2,9 @@ DEFINED_PHASES=install test
 DESCRIPTION=Visualization of hierarchical data, especially profiled stack traces
 EAPI=8
 HOMEPAGE=https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CDDL
 RDEPEND=dev-lang/perl app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/brendangregg/FlameGraph/archive/d9fcc272b6a08c3e3e5b7919040f0ab5f8952d65.tar.gz -> FlameGraph-1.0_p20220918.tar.gz
-_md5_=d6bb821e070658dbc1be78fab66fa271
+_md5_=919b62cd432c1c028b33960e96941a69
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8e118ff43175..c2a1424c739e 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/android-udev-rules-20230104 b/metadata/md5-cache/dev-util/android-udev-rules-20230104
new file mode 100644
index 000000000000..06c447c99036
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-udev-rules-20230104
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Android udev rules list aimed to be the most comprehensive on the net
+EAPI=8
+HOMEPAGE=https://github.com/M0Rf30/android-udev-rules
+INHERIT=udev
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/android virtual/udev
+SLOT=0
+SRC_URI=https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/20230104.tar.gz -> android-udev-rules-20230104.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=a41aef9de93d4d6e542c72474545abf1
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.1 b/metadata/md5-cache/dev-util/lldb-13.0.1
index f9939ce797d2..7ed8a8130f52 100644
--- a/metadata/md5-cache/dev-util/lldb-13.0.1
+++ b/metadata/md5-cache/dev-util/lldb-13.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5fa8b2c6e45059005928ae2297d9dba1
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 5e0728611316..bf0949a388a3 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=54e317b8da7cb0a1b1a6a2afdcb596a5
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.6 b/metadata/md5-cache/dev-util/lldb-15.0.6
index 60a9aa255272..f037a5947273 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.6
+++ b/metadata/md5-cache/dev-util/lldb-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4c1f99e5e9db00bcf869db6819c67fbc
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.6.9999 b/metadata/md5-cache/dev-util/lldb-15.0.6.9999
index 37cd6eea3d7f..efdab030ed6f 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.6.9999
+++ b/metadata/md5-cache/dev-util/lldb-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/15
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6c65953c70109973bcb08e09f7546763
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index 0a0a521625fb..ca33afc4d6ee 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=688e55c120b94b78bdf93e5439691646
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230101 b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230101
index 469de3f2e158..513bbcfde43a 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230101
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=27ec1e48d74aaba326c90cfabaefde6e
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107 b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107
new file mode 100644
index 000000000000..878e230090b6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) 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_8? ( ~dev-python/lit-16.0.0_pre20230107[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-16.0.0_pre20230107[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.0_pre20230107[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.0_pre20230107[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_pre20230107 ~sys-devel/llvm-16.0.0_pre20230107 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+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.0_pre20230107 ~sys-devel/llvm-16.0.0_pre20230107 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) 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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=27ec1e48d74aaba326c90cfabaefde6e
diff --git a/metadata/md5-cache/dev-util/tup-0.7.11 b/metadata/md5-cache/dev-util/tup-0.7.11
index 4506745268a6..b7cd234d5477 100644
--- a/metadata/md5-cache/dev-util/tup-0.7.11
+++ b/metadata/md5-cache/dev-util/tup-0.7.11
@@ -5,10 +5,10 @@ DESCRIPTION=File-based build system
 EAPI=7
 HOMEPAGE=https://gittup.org/tup/ https://github.com/gittup/tup
 INHERIT=linux-info toolchain-funcs
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 MIT public-domain BSD BSD-2
 RDEPEND=dev-db/sqlite dev-libs/libpcre sys-fs/fuse:3
 SLOT=0
 SRC_URI=https://github.com/gittup/tup/archive/v0.7.11.tar.gz -> tup-0.7.11.tar.gz
 _eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ed597480e69cbcd867d58a104362cd6b
+_md5_=276faf421e86e25271ca8266deeae8a7
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4fb326c28b5b..0ffab06b31e9 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.1.1-r13 b/metadata/md5-cache/media-gfx/sane-backends-1.1.1-r13
index a14ac798b406..15761217e98f 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.1.1-r13
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.1.1-r13
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.sane-project.org/
 INHERIT=autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
 IUSE=gphoto2 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_lide70 sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_epsonds +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pieusb +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=acct-user/saned acct-group/scanner gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:= ) systemd? ( sys-apps/systemd:= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5a16114d734cae9c9833174924a6cabf
+_md5_=e28027ff42ee23363e8ec75cedea9011
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 1678473b7851..101f795fcabb 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2023.01.05 b/metadata/md5-cache/media-sound/abcmidi-2023.01.06
index 07d1691b7a4d..3c471a734cdd 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2023.01.05
+++ b/metadata/md5-cache/media-sound/abcmidi-2023.01.06
@@ -8,6 +8,6 @@ IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2023.01.05.zip
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2023.01.06.zip
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=71c7de92834a1d94685a3579089a9bec
diff --git a/metadata/md5-cache/media-sound/pasystray-0.8.0-r1 b/metadata/md5-cache/media-sound/pasystray-0.8.0-r1
deleted file mode 100644
index 9e3f0400b2b3..000000000000
--- a/metadata/md5-cache/media-sound/pasystray-0.8.0-r1
+++ /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=configure postinst postrm preinst prepare
-DEPEND=dev-libs/glib || ( media-libs/libpulse[glib] media-sound/pulseaudio-daemon[glib,zeroconf?] <media-sound/pulseaudio-15.99.1[glib,zeroconf?] ) x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( net-dns/avahi ) libnotify? ( x11-libs/libnotify ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PulseAudio system tray
-EAPI=7
-HOMEPAGE=https://github.com/christophgysin/pasystray
-INHERIT=autotools xdg
-IUSE=libnotify zeroconf
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib || ( media-libs/libpulse[glib] media-sound/pulseaudio-daemon[glib,zeroconf?] <media-sound/pulseaudio-15.99.1[glib,zeroconf?] ) x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( net-dns/avahi ) libnotify? ( x11-libs/libnotify )
-SLOT=0
-SRC_URI=https://github.com/christophgysin/pasystray/archive/refs/tags/0.8.0.tar.gz -> pasystray-0.8.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=82643e8455f3150ecbdc6ed55b62e9e8
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index cdb74e76ad1a..19fee4600507 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.0 b/metadata/md5-cache/net-dialup/freeradius-3.2.0
index 66ff8c2869bc..079c08426147 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.2.0
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://freeradius.org/
 INHERIT=autotools pam python-single-r1 systemd
 IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_0/freeradius-server-3.2.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b27a69d7f0cb80d3f32727713a4a6118
+_md5_=e962495ae852ec44719eb2e38e421a5d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 3ba1aa07cfe7..e79d04f56a80 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r1 b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
index 78293538c130..896977ad687b 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r1
+++ b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/swt:4.10 >=dev-java/
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz -> biglybt-3.2.0.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b0e9152604dc6194b13bbdc58e245f71
+_md5_=815b473528ee126c7afb8385b68c1680
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 436be33ea6f4..06b999404a5d 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18463 b/metadata/md5-cache/sci-geosciences/josm-bin-18463
deleted file mode 100644
index 9d54904030f4..000000000000
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18463
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Java-based editor for the OpenStreetMap project
-EAPI=7
-HOMEPAGE=https://josm.openstreetmap.de/
-INHERIT=desktop java-utils-2 xdg
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2+ GPL-3
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18463.jar
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6bc17c4ab8ebfdf972371113ca64dcc
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 28485fa8a513..80596e556b11 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-13.0.1 b/metadata/md5-cache/sys-devel/clang-13.0.1
index 78bbc1f05a72..27d0bd295fa8 100644
--- a/metadata/md5-cache/sys-devel/clang-13.0.1
+++ b/metadata/md5-cache/sys-devel/clang-13.0.1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-13.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9c2a9889ed954cc109bfff84aba69e90
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 aeb067b5d3e3..2ebbb9f9c0d6 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2d803d961faf6acf9fd985895df8e9ba
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.6-r1 b/metadata/md5-cache/sys-devel/clang-15.0.6-r1
index 8059b2ab01a8..e95a596dff90 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=612ec39e50f888af0e1118e4fa94c7a1
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.6.9999 b/metadata/md5-cache/sys-devel/clang-15.0.6.9999
index 447809da14cd..bfc8c73c6b02 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.6.9999
+++ b/metadata/md5-cache/sys-devel/clang-15.0.6.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.2-r100.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=264ababe1b13708b9fae29b65a3d4351
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index e8080873633d..b912866861cb 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e3c547d48fedf5839d7fc581669ca393
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
index 2c34c3cd7838..48229f011afe 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=571d624a8242c23b870e1fc6f58b59d2
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
new file mode 100644
index 000000000000..a2565339f225
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_8? ( dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) 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 ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.0_pre20230107: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.0_pre20230107[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_pre20230107[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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=~sys-devel/clang-runtime-16.0.0_pre20230107 sys-devel/clang-toolchain-symlinks:16
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ~sys-devel/llvm-16.0.0_pre20230107: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.0_pre20230107 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_pre20230107[llvm_targets_Xtensa] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e3c547d48fedf5839d7fc581669ca393
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.1 b/metadata/md5-cache/sys-devel/clang-common-13.0.1
index 9f791d162292..1f4467a039d7 100644
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-13.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=a0f8e2bbcfb854ee88990783919716a0
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 5d779a8e5059..4544e3b62078 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.6 b/metadata/md5-cache/sys-devel/clang-common-15.0.6
index c5d56962033b..8fe2e0d4f773 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.6
@@ -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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.6 ) !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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=540503f9a371b876a1359c2135afc22a
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1 b/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1
index 4b460fa7cb46..927fcb7e1338 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.6 ) !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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=de454d42d9ea3559050e3f819d7a2c4f
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.6.9999 b/metadata/md5-cache/sys-devel/clang-common-15.0.6.9999
index 15b964116a26..c5bb906c1be4 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.6.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.6.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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.6.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	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=d97a81fb3465ed1ded01ce30b9155232
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
index 3e3b0e6cf7a9..a08fe481910f 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-16.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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.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	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=6f31a0705bbd69dcb8fdb8d7382ab2cd
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101
index 4a64dfb5f0a9..a6af2f422e27 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101
@@ -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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_pre20230101 ) !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/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=7a1d250dcc58dc8964db8c2c341b7f3d
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101-r1 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101-r1
index 00f2e440a6e0..5a1be41ba6ee 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230101-r1
@@ -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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_pre20230101 ) !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/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=4000278b9bc210d06eafc6801d64aa09
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230107
new file mode 100644
index 000000000000..3b7cf297cf0d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20230107
@@ -0,0 +1,13 @@
+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
+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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_pre20230107 ) !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/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6f31a0705bbd69dcb8fdb8d7382ab2cd
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20230107
new file mode 100644
index 000000000000..092958f6c60d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20230107
@@ -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
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0_pre20230107:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0_pre20230107[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.0_pre20230107[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	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1-r1 b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
index f5351d2a0887..fea85ceb1335 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-13.0.1 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13/13
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d00e25db62f65b54741ee4877c7058c1
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 61caa47e2c11..d3d81a960079 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=12210589a93ffdab05f796a95cf17bf9
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.6 b/metadata/md5-cache/sys-devel/lld-15.0.6
index 2f6b0686a8e3..cd5e5d0cd729 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.6
+++ b/metadata/md5-cache/sys-devel/lld-15.0.6
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.6 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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=727504ff60eac499aab4a69198562a87
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.6.9999 b/metadata/md5-cache/sys-devel/lld-15.0.6.9999
index 7240db9cb010..aeaadb74f5de 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.6.9999
+++ b/metadata/md5-cache/sys-devel/lld-15.0.6.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-15.0.6.9999 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=35b8414fe90575d758c96c2ae8a5079c
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index b276f6301ffb..bc83aab1f24a 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3fa9fd9150393d3a8be081cc3c049c27
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230101
index 1d8e9a31d40d..f6a865b6c6a5 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230101
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_pre20230101[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0b5b4717b26dd51256dd774c0ec3f52b
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
new file mode 100644
index 000000000000..8eef5fd10f02
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.0_pre20230107[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
+IUSE=debug test zstd test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
+RDEPEND=~sys-devel/llvm-16.0.0_pre20230107[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0b5b4717b26dd51256dd774c0ec3f52b
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.1 b/metadata/md5-cache/sys-devel/llvm-13.0.1
index 4d602c72d89a..f2b6150f2490 100644
--- a/metadata/md5-cache/sys-devel/llvm-13.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-13.0.1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-13.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=330ab7ef8b0ece6adf7207c8b883e61b
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 2e729e7bbf38..2e6fdd97d6d6 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -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	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=83bdef93d70b04093c062f89abf6b384
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.6-r1 b/metadata/md5-cache/sys-devel/llvm-15.0.6-r1
index 669204c93cb4..7afbf472c5ca 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.6-r1
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.6-r1
@@ -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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d4eb2798b53bcdaa9b8a7b5a4673f7a0
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.6.9999 b/metadata/md5-cache/sys-devel/llvm-15.0.6.9999
index 7b51934bed52..617cadb25df4 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.6.9999
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.6.9999
@@ -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://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-r3.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6b79b283c2d466334bf299e052f2b97a
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
index 1cf4ec700a34..8bcb3ae76b66 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a7bb707a1080d85fb42956aa84ab303
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230101
index 5c9cb5697345..6c54b511c0df 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230101
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=478b0046e537ea5c41e90036666b1147
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230107
new file mode 100644
index 000000000000..0a4fba2edf9e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20230107
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) 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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks: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(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) 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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a59f80569fcdd70f6a10f010ece08e03
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.1 b/metadata/md5-cache/sys-devel/llvm-common-13.0.1
index 891933068a1e..b39411fe1d2a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-13.0.1
@@ -8,5 +8,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/llvmorg-13.0.1.tar.gz
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=a38e2581d0dbedf6300d878055ebb583
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 acdad10978fb..0fc6a976db4f 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.6 b/metadata/md5-cache/sys-devel/llvm-common-15.0.6
index b85a57f3e2d9..9f93ecb67937 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.6.9999 b/metadata/md5-cache/sys-devel/llvm-common-15.0.6.9999
index d4c4a1f7549c..624f500c60f1 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.6.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.6.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	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2d553af5e8a17dfd7140dd660f48b48a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
index d4c4a1f7549c..624f500c60f1 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.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	2347f8fe2d392b2a091191f94be37e6f	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2d553af5e8a17dfd7140dd660f48b48a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230101
index fcf4c88753fe..9bfc8bff7401 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230101
@@ -8,5 +8,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/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230107
new file mode 100644
index 000000000000..1865542cf3d6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20230107
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=llvm.org	578164f8fbf049db5b0a08076331b7de	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5a6c2f40673d..5ae2a3ff2e25 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.85_p55 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.86_p56
index 07fdf1aeac21..48ca2486ec41 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.15.85_p55
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.15.86_p56
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.85_p55
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.85.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.85-rt55.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.85-rt55.patch.xz
+SLOT=5.15.86_p56
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.86.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.86-rt56.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.86-rt56.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7433e098049f0396cfc033411f0d8182
+_md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 01f5a960dd91..a5499ecec75e 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-13.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
index 01cf5bb82b28..2e09ac310ab5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=13.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c40788a12251633edd2072d003f4fd40
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 10b23b0ed0f4..13f902ff49ff 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f74fd600dc695c39b566ccc4a969f503
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.6
index 373c1b063383..e23ae27af275 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3ad7ff81fa706fc016ce022b06836c24
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6.9999 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.6.9999
index 3c8e4bb05c69..a088256db056 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.6
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9ccbe2192a16eefa1b5960a39d3d5a6e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index acde21e60669..decef7a0a2b5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=81b14448979732d87885eac476bf7745
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230101
index 78e1a343c6ad..5b2ed0b07396 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230101
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7c32aa82860d3b47dc0d231788a24ec7
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107
new file mode 100644
index 000000000000..e408daf31a1f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20230107
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm: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
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7b22c8a330ab67a67eed95507c7c3b35
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
index 573492396450..9d72d4b34d23 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=13.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0f41cac2ed0ead81d6cde38fa9736fcd
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 25cb39250566..47a02e87194a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9f75886330963efc8995995b908944c7
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6
index 2db79cd1a6b0..f3021965e275 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2d2c70bfe013005e58d3ac451475be03
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6.9999
index 3b06a3805c00..0bb9138a3904 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6.9999
@@ -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.6
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8286e2b394c9a005ebb838db58c1c7ef
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
index e8bbb5f94d11..7484762e87de 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4aec54b218cb6e8793adcd55319d0972
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230101
index 5f3dad8d9396..b01d3971ee91 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4a7d7dce0aec01a60595cc40abf58512
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107
new file mode 100644
index 000000000000..115d4607825e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20230107
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm: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
+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/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0191bf75d446532455d3573e83ad3e5d
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.1 b/metadata/md5-cache/sys-libs/libcxx-13.0.1
index 65c7b69d7e99..90a80847e94a 100644
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=36ea30363f82001abf621375ed813815
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index d067ab79b64a..be09897ee29f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=97f4a4b9c630cc8e7b34cb34e5b69b3f
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.6 b/metadata/md5-cache/sys-libs/libcxx-15.0.6
index 5e0f3091d792..9a793c227b4f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4f8365ba0714886ca50dc8837928ca76
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.6.9999 b/metadata/md5-cache/sys-libs/libcxx-15.0.6.9999
index 136f33a9add7..b6355bd3e21c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.6.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=704630e4b652fc6fea6bb6f283dd5643
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
index f5d1000cefcb..658691f4a651 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=704630e4b652fc6fea6bb6f283dd5643
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230101
index 4b038b7b8cf5..bd704a71ae1c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230101
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e12cf8de91ef65e1227d6847e0aae4c7
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107
new file mode 100644
index 000000000000..c78e2440eb08
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_pre20230107[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
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_pre20230107[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b60c61e02349ac3cdcbe2fb6699e9cab
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
index 35f4eb2c89a7..8518e89785cc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.1
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c9b3299e444699c0453473eb00c7d751
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index b6b0d4e8aa3d..c75dadc87129 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=dd841db756d48916d91ea6b6826aa86a
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.6
index 15dacec05124..8dc9b2e301ea 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=15a1410edd37557e42b09e0682723fa3
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6.9999 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.6.9999
index 07035b038954..2ebc142b252f 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=16e6fb4be886f1c920f7e7e40a570ec4
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
index 324650c60941..147326e71866 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=16e6fb4be886f1c920f7e7e40a570ec4
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230101
index 44250068ce87..8178190fd169 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230101
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f6d8ed8db9d19d2642259ee50e5de8f8
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107
new file mode 100644
index 000000000000..0e0e4c9ffb03
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm: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
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!<sys-libs/libcxx-15
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b9ff654b9f191bdfef756c20e576a7fd
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.1 b/metadata/md5-cache/sys-libs/libomp-13.0.1
index ba957aa81c42..a2cd22658981 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.1
@@ -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/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ab0bdcdc62dd489e9490a7f4e9eaffd0
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 6160ad581f77..ee1992fe99ab 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=aaf94818bd444ab6342d56c9f1bcf401
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.6 b/metadata/md5-cache/sys-libs/libomp-15.0.6
index ade900dceaa5..fabcb5bf7eca 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.6
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.6
@@ -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.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ba49ea1a7468c73fbeb3a4043ccf876b
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.6.9999 b/metadata/md5-cache/sys-libs/libomp-15.0.6.9999
index 402c244f5e42..43a35e889044 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=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.6.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/15
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d7b721a7d69351616b6e70c9c7f442e1
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index d6fdc6b4d671..7c3033e237c3 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2ce525b4b27de1f714f6508158b70ce3
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230101
index 9a32f2c66286..00f7a6ab3bab 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230101
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_8 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=57c513fa8f8b59b17518b6134be747ee
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107
new file mode 100644
index 000000000000..0e62f33c71f2
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20230107
@@ -0,0 +1,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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) 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 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=gdb-plugin? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) 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.0_pre20230107[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
+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
+IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=gdb-plugin? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) 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.0_pre20230107[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=gdb-plugin? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.0_pre20230107
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d92be71dc17fd7384c7a26f555dab445
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1-r1
index 7ce30bc50f2d..a16c50504872 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ce3cd0706fde6b934149bc25d56b76ac
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 6b4853acdf47..f2af083cd057 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c96ae557519e433b87bd34bff5de97c6
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6
index 06d5fa685550..ca8e8ab70fb3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=57621b67a5695b02ac29c2dc63a63a03
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6.9999
index ddef3f162b36..a8566b5ddd84 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8e20c5772ce7581be7f95c30ad904753
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
index 4fe884c994f4..df75863ace67 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8e20c5772ce7581be7f95c30ad904753
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230101 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230101
index 243ad0ac25a9..59c6ce48834c 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230101
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	cbc34fac4cd214b4d62c6f4dbadcd53f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=47ccc077878261b3c1475a5fcc40104c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107
new file mode 100644
index 000000000000..d88ca90fc472
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20230107
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/llvm: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
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f1bb556d56b0b38524d25b18ae7d0c62
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 1992ed870bcf..f31c52ccaaf8 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/ikiwiki-3.20200202.3-r1 b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
index e11a22a250c5..678d0ef6c201 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://ikiwiki.info/
 INHERIT=perl-module
 IUSE=extras minimal test test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[perl] ) extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20200202.3.orig.tar.xz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=fceefa45462c4e1eeac5393d5812c2d8
+_md5_=600a2772a608453cc6bc38cd74ee1c4b
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d47ac2824e57..4d4d4b1fd995 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.2-r3 b/metadata/md5-cache/www-servers/nginx-1.23.2-r3
index 31da8ba17b17..f92506865c50 100644
--- a/metadata/md5-cache/www-servers/nginx-1.23.2-r3
+++ b/metadata/md5-cache/www-servers/nginx-1.23.2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.23.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.8.tar.gz -> njs-0.7.8.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.8.tar.gz -> njs-0.7.8.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=27ac272abf7327a8e6d7f4dd5fecd4ca
+_md5_=803ff40b9f74566c476159d697f263fd
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b774b451fbad..328a9ccec0de 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-08T05:39:43Z
+TIMESTAMP 2023-01-08T11:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6Vx9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB9ZQ/8DN3ABeihtjWFdukUtHQrxDf7qxwzhrSGrdgr9HFuw//5anv8LLtYYoS8
-jqT6U6rHbUjkPU2u9GAVxFGY+ztyReChh/0myu6E78hJpmr2EwA9K0GjlGJ/Zlwx
-vPOrVVIkk/uVSBD/Hygf5O7/yIs/p8u3cIGEFgG2N/KYhl4hehjQWI8WjLrQcxFf
-LfcnBg2u8X8vTSn7wXyj96DW9IUbAvvdgmMWeKfx+jTYz1Py0lizSp1dFS0nr1L0
-4FOyafLB/j45rc0z/D4uKjnjcnmZZeeOAIgCiNjYsiUcUy2xwNXQrl+speqkKaJK
-IFgjXgafRefg9gC4G793nDVtVc+RjI/UqjMoKZ2Jl/HPHCUG293ldOOAhIs5W8jk
-I3nsLlVniYJzkDHTthKIdpPxepmt3FzPjrS61cOATRyRdOaQdvl8K3Z8oqO0HVzB
-kEuBI0/vJKyg0f4MWaKMqCB5y2LcK/Y009GN7Iivt87q0awFcYxc9v1+5p7X/+Cn
-IZG7AvhH+hwVCd8ggKEPDQ3VTQYOnsOqOlsUqLz34h8e52phSNMCoeZs1utIWcyM
-yuVPWXpRLazOIsQ3YPflhBz2UqPhBdIP/GVfK2fSsB8f3hi681JmQnKRGJE77YD3
-Bxq9P1NbVxUHFZx2yBKVcH7+BKUFl894Oxwwnhr7xb5ltVtrSio=
-=uRbP
+klDO0xAAoOHIW62730FTPp8KXWSTJqd5plRkzqg6WSxXExIqJhr/dLHPB172Bc9n
+ytFJGxEU/sUb5xn0ifKZAlwGgnGzYZ3wJ3xQ6beLqNYG+zmgPQ5O4QWN5k108ZlB
+vKFo/3CEo3cD0VkG0B9fXLlJIqCT8nJQw/8v6hvvJHN8ttZOO/al3jEUKRhJDLQk
+jqC3ZFh9kib+Fdwv1fQqE1pTAt41SsR+/qhtjBGR/MCA0EzerDaDbzIQvxbg0mvN
+GjlL6vnQFNCcXZLbSChAioSui+dejIaKd2zCeRAKt+bhdGBMdR3t/jckqT/dU5dT
+e3bMFkMdtYC3QxpGkm+c4IeQ/ck9IPOj8IM3JW5KXi1ecnsaAFhjIGpqH6Vp/qGP
+Y+5XWt+iPlpX3sSG0cuv7YI98pmYuS9D+sqDfYSR39smOOQgHphtUtlw+bDLmgJj
+j6WYupWCYfV7TVYFUS5lNjjySQFfJQS1SyehYEOHsyigNFK89M0an8yfMfEAbKVz
+MeOx6oFc8fBvCcR0JbZEUZFWOr0WL2CMdnZiJo2/j+FiP3hG62p3U12YggisDXIy
+SRLk80eG7Jdm44hncLzj/6fEcb6FFZCYBkO/K228qVmcugH/nGXUr6wKr0OgH/+z
+WKZHzGnIRdvJkmUO+sQQ0TCyKLBh2lkgv8RI/I+v4uBTsFtH5SI=
+=+6hU
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6d65f8ac7836..74447015bb2c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 05:39:40 +0000
+Sun, 08 Jan 2023 11:39:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 307b245bec32..5719ea3715a1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan  8 05:39:40 AM UTC 2023
+Sun Jan  8 11:39:35 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ab4e5101b1b6..a2f9ba76dcda 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 05:45:01 +0000
+Sun, 08 Jan 2023 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f3455582ed1a..3f957d5a393f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-43be44e93d085d35235a84853706aaeaabd10835 1673155713 2023-01-08T05:28:33+00:00
+359abfeacff09510a9e7908bcda032e258f07237 1673174482 2023-01-08T10:41:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 59beab340816..b93b72cf19db 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673156401 Sun 08 Jan 2023 05:40:01 AM UTC
+1673178001 Sun 08 Jan 2023 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6d65f8ac7836..74447015bb2c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 05:39:40 +0000
+Sun, 08 Jan 2023 11:39:35 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index a0138d2e734c..f47404f2bf54 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 4949b96b500f..530783eb0526 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -4,5 +4,5 @@ AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b72
 DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
 DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
 EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 909f7f96fce8d9bb46a6003a6ee2714972d284332d12d071157ba05858325a1b42f244dc14d390aaa1ffb3e923eeb586a76b68258fee3d1feacbbc65e4b7fa0c SHA512 1dcb6401815df597de80b8fd4fec6fa78d66bdbe6ef03699df438c1656ea41d22c1f41927b6d6e6b2ca4ca5c419382fde39a80cb9d1ff6acc144375deaa829af
-EBUILD freeradius-3.2.0.ebuild 8315 BLAKE2B 98472b4dd3e5a4bda18eaefcde7e62f4b067161b251a8fff1543b75c586592e5d70b129118b6989d3f25760d0dee8a406a67ed79e7a49620a25cd705bd16d6af SHA512 bac4d9a49a9d7c35c932cd2f9cb6c02a5ea642d53fd88ec61a56ba3e769323d4dc189fb34f00728a1fb707ec71a1874321395243aa3b9ad517ea5939f804a96c
-MISC metadata.xml 657 BLAKE2B 4ae124b2f8a4e2230ff696f06056c4d9ca2a03b989362b6465ba42b9a1d730f1f35776b3de8a455f40956d7d2e0746ddfeb304d13fa44f69347f88e97443a72a SHA512 21137127c400a99a024012defe01c3546178492ef608428e673008ae3e7d677f97a2b33bd6efbd6737b60144e0697cacb583e7d9b477187a109b3e7482d899b1
+EBUILD freeradius-3.2.0.ebuild 8314 BLAKE2B 806762216aa1ce73e6258178e8cde11bc2ab6e6a2779e57b088c90649bfdc9c820776c5cc795c7080d94b103134642fa494807bc0969dbae7af0c78846b3918f SHA512 173c002fb665d629b74ac8b6edee4518db9ab39271b603efea35a7c0962c3e265aeb0bc984b33177ee02ea3119a30a1f08d507043438925106355e06124710fe
+MISC metadata.xml 754 BLAKE2B 2aaf6e500fe361f2c456ea4e4d9da51c3056d8c993725bd3372cc3ebfecec129b8196cecf4829083084d3c664c338569db75fd2304dfc9123e04db3b222642ed SHA512 b6e99eefac90938f55be7abd56604e5ba37bacbcde609f7f9c71deef4d80c6257404baa1b676f426d9182345d4b742591b677b64c016eabdfafb1b18eb2d35e9
diff --git a/net-dialup/freeradius/freeradius-3.2.0.ebuild b/net-dialup/freeradius/freeradius-3.2.0.ebuild
index 32e5bc79e5f8..7063c205a128 100644
--- a/net-dialup/freeradius/freeradius-3.2.0.ebuild
+++ b/net-dialup/freeradius/freeradius-3.2.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=8
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="
 	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 2ae23726ccd2..a97e6b26d249 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -19,4 +19,7 @@
       Include support for MongoDB database
     </flag>
   </use>
+  <upstream>
+    <remote-id type="github">FreeRADIUS/freeradius-server</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index cb0dd10f6f58..85bdf68f4f79 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
index 4f943fac128d..e174e7d360a0 100644
--- a/net-p2p/biglybt/Manifest
+++ b/net-p2p/biglybt/Manifest
@@ -1,5 +1,6 @@
+AUX biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch 316 BLAKE2B 87efcf5b3a0c83da109f51c8cc4829fb96d4940a295f1850de012ee0c3b259226b7150699721ad89b6b14e926527029980301b95ddab00eb2eb6aa5624acae5d SHA512 b1af524f3bf4fbd91c8849732b30ff10b269e07831dec8cb028e16f17cf624000ff5e513f5668d461bdf0cd74c518052719ac93aac790a8feb853a97b6172489
 AUX biglybt-3.2.0.0-disable-SWTUpdateChecker.patch 407 BLAKE2B 63b34dfc13d2c3a6002b66da1bf652a7e98b0f4c92d48d1af90001742cebc0ba89c81c72f5c8d81bb29c6f7a5fb412b00dc1a18daf9f5ab6601e446e49b030c0 SHA512 87743e1a437d15e929b51b67bd5fb329ce67fc44f93c3172634056fe52d575db22102d915d9507df9644c4f800e399fed2cb327f0451eb6506c27e5bf776f2f6
 AUX biglybt-3.2.0.0-disable-shared-plugins.patch 553 BLAKE2B b4844e817c76ddb03ac1f029d4c3626483d02fc81460e8f028719e9252e4b74765db04e2c0e0561dd9237ecbf6687ef93a5c75fed58342f259839935af5e976e SHA512 5f8eeb6caf6b719b77f3b2d7857723335b0dbe8c5c4e09454471ed10e6ad01a82f566e9a42614b65821d5c33e44eb958d6933ffb1d30025512a75114346a6b45
 DIST biglybt-3.2.0.0.tar.gz 34985099 BLAKE2B 385a6cf4f89b0922f06a2a5c7e89a4c9b717922f491717ade3cb13251c88e497cd2f807fa67ce3384bc3fcf3f37af368d20c2bb8984eff9d4237519d2be0f89d SHA512 0a39243271153758482ac3eaef50e4a83464cf67779b531fb29d7289fa49f2ec7dbe5c1c9de1d6b3bed555a6c581c4e95563e333aad4a9e32cf158db1325fef0
-EBUILD biglybt-3.2.0.0-r1.ebuild 3236 BLAKE2B 04a491dc4a8c1e13bddafab9d4a045ec4f7c39a7fcd3d5754982e851d2a19bf56fe6f389671b7d4a279df3e1bb5476fb83cfad229a60f4e0f4bb7b6be01aa136 SHA512 46052bb811a1c2b02cfb3cbd883f1d98628dcd418a1c14dedcc7efa37b3f33b70988bc6e6ce178358445981beebe5d7eb4fec84b170db11ebf1386ea91414eb4
+EBUILD biglybt-3.2.0.0-r2.ebuild 3446 BLAKE2B 9f174451dac227045530f42bb446ae2db73b0e0083f6f6771a356e70d7258d26450ef96cc8a08c235fd98c6354c2b8b608cbf0c6abc61619a17f478404eec5e4 SHA512 cad06ecf5dfa14ec4c858de90690a54fdc521b3246aa2a009463abe7df53fa4e24d4f5c78b814d47374fe1f0210708d33d309e313b32e0c4c0ccfc1659fe63a4
 MISC metadata.xml 303 BLAKE2B 50bccebf39b34f65100881ac87064f02f74e3e896b0acdd31ce764736d51e87c2d86b27c7476bc520cc6a23f8b2d105cd22a0cde40be20bb09b2df4225114842 SHA512 88e1418a7184746f6f6a8eb49451f2b34923ee6770191acf2b776ade8b91e50d659b8ed2f2a48f5c61558a64f0959cfcf9b73bcd1e5a44e8cea44b77227229d5
diff --git a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
index dfe931337994..8847795e7c12 100644
--- a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild
+++ b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
@@ -58,6 +58,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
+	"${FILESDIR}/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch"
 	"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
 )
 
@@ -66,8 +67,13 @@ S="${WORKDIR}/BiglyBT-${PV}"
 src_prepare() {
 	default
 	# AENameServiceDescriptor fails to compile with jdk >= 11
+	# https://github.com/BiglySoftware/BiglyBT/pull/2611
 	# "error: package sun.net.spi.nameservice does not exist"
-	rm -r core/src/com/biglybt/core/util/spi/AENameServiceDescriptor.java || die
+	rm -r core/src/com/biglybt/core/util/spi || die
+
+	sed \
+		-e '/enable.update/s:true:false: ' \
+		-i core/src/com/biglybt/pifimpl/update/PluginUpdatePlugin.java || die
 
 	cp -r core/{src,resources} || die
 	find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch
new file mode 100644
index 000000000000..a1db6dce78ed
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch
@@ -0,0 +1,10 @@
+--- a/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java
++++ b/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java
+@@ -124,7 +124,6 @@ public class SystemTraySWT
+ 				SystemTraySWT.core = core;
+ 				gm = core.getGlobalManager();
+ 				if (Constants.isUnix) {
+-					ensureDorkBoxPlugin(core);
+ 				}
+ 			}
+ 		});
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c2e4fcdb62b6..bad7d99159f8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 25793f01989f..1f33125facfa 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Joonas Niilola <juippis@gentoo.org> (2023-01-08)
+# Doesn't compile currently, bug #853094.
+>=net-dialup/freeradius-3.2.0 oracle
+
 # David Seifert <soap@gentoo.org> (2023-01-04)
 # Out of date patchset, warns on latest version about being "expired",
 # unofficial and maintainer discourages people upgrading to latest (non-packaged)
diff --git a/profiles/package.mask b/profiles/package.mask
index 3b540ce4e56c..0ec7796ef02c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Mair-Keimberger <mmk@levelnine.at> (2023-01-08)
+# Broken since many years, no reverse dependencies, last release from 2000
+# Bug #678518. Removal on 2023-02-08.
+net-dns/dnswalk
+
+# Michael Mair-Keimberger <mmk@levelnine.at> (2023-01-08)
+# EAPI=6, Installs only card pictures and has no reverse dependencies.
+# Bug #805278. Removal on 2023-02-08.
+dev-games/cardpics
+
+# Michael Mair-Keimberger <mmk@levelnine.at> (2023-01-08)
+# Dependencies of games-server/cyphesis, which got removed ~4 years ago, no
+# other reverse dependencies. Bug #728230
+# Removal on 2023-02-08.
+dev-games/mercator
+dev-games/wfmath
+
 # Sam James <sam@gentoo.org> (2023-01-05)
 # Breaks reverse dependencies: bug #889694, bug #888579.
 =sys-fs/btrfs-progs-6.1.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 19ec2e7457dd..7378e43b4173 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1806,6 +1806,9 @@ dev-lang/spidermonkey:clang - Use Clang compiler instead of GCC
 dev-lang/spidermonkey:debug - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems
 dev-lang/spidermonkey:lto - Enable Link Time Optimization (LTO)
 dev-lang/swi-prolog:archive - Use libarchive for extension packs
+dev-lang/swi-prolog:cli - Add support for CLI interfaces based on readline and libedit
+dev-lang/swi-prolog:ipc - Add support for TIPC inter-process communication
+dev-lang/swi-prolog:pgo - Optimize the build using Profile Guided Optimization (PGO)
 dev-lang/swi-prolog:uuid - Use ossp-uuid for UUID pack
 dev-lang/swi-prolog:yaml - Use libyaml for YAML pack
 dev-lang/swig:ccache - build ccache-swig(a fast compiler cache)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 06cc91ab9d4e..b1c5401bfe47 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 139ac4004887..99036e89bc75 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,5 @@
-DIST josm-snapshot-18463.jar 16273803 BLAKE2B 043121ca1e7512207608dfaa549a53d70532a6844028f2fb2554fc187e41f4220a5aec9032c734356f6f1f42478c5bdb74d7498a9c45929daa430e89ba61c64f SHA512 46152f16a3a019d9231a27f584e5bd8b5865c01e2a9bf94179c81c69fd32fcf532b6d02222e41bf431c3981a0bf375ce7be17551b3c2d7fb0734671bc4e59071
 DIST josm-snapshot-18583.jar 16269996 BLAKE2B 1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463 SHA512 04cd705e745357cc6169a2d12bf7ca9b91615201976326d52dc468921ea959f281d30ff2be8eeb2fbde9e780ca588e6240538036d2cdf66b0316def28dbbf684
 DIST josm-snapshot-18622.jar 16311954 BLAKE2B 01d033cb4105f192ef14176dca79667ef2df95a55507df47dd5d163025d7460246fcc5524133e08e9ee77ee3073dce819072470d3898620d7ed9c5eedd405a34 SHA512 7220c007b87b5128bf9a4ace9a61d2fff4a22834248c85c4b3ab96db7d364f4adc63aa2167419f2418f4c3fb1f96bd3cd6ef05727bc1c4cd46280dc161b4fbe2
-EBUILD josm-bin-18463.ebuild 902 BLAKE2B 09809516397c8139b7c7a5aaa8455846a7fb2a7c43aba801b3c437ae56cd885c0e14782dfb6eee7dfb2c21c0e5a42863f7cba0ccc1211cbe1ed19ed05c7b06e8 SHA512 e04057f2dc94db22192bcfad3652cb9154475febe86268e25838a9e2afc78e1452edf748441e032600ad9408bf65b7b74b8a08cee7ee5f4797da0b08c6fe77bc
 EBUILD josm-bin-18583.ebuild 976 BLAKE2B 3cc99f62084b75355c0e3963815f236ce465bf35c898707b5851b9d54d3a528d9cdc043914170d9384eabafa4ee754f5e1cfb8b7af6c7bfc2a04f980ae246b46 SHA512 b93b25ed88efb59224f362bd9c3213488f6e464142f1c3ea01f6a1faff4ac4b041a3780be74257b74c53bead2d33e58cfd0ac614a8212cc34b49d1f1b15a2d36
 EBUILD josm-bin-18622.ebuild 978 BLAKE2B 9b8339955fdfad5ccf25f2243486483febbf0f3c80d2fbe908851ce4ba8df52bfd9367821abf851690c53cadc68b18b4d3b54427ecb34c085b11f83f81094f92 SHA512 d04437ae3b12d9a8b4e3b2ae639d39cb761b503179c471e43bea76577de1f265208204f8fc6c7887e82d5f4a45027f701c23419175b821ada0ce80461c81db40
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18463.ebuild b/sci-geosciences/josm-bin/josm-bin-18463.ebuild
deleted file mode 100644
index 37cce593e359..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-18463.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-utils-2 xdg
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-
-	local icon_size
-	for icon_size in 16 32 48; do
-		newicon -s ${icon_size} -t hicolor \
-			images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d75b2b148b91..f3da33281248 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 7328dc0dd81f..5dd191f58c1d 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
@@ -12,4 +13,5 @@ EBUILD clang-common-15.0.6.ebuild 3509 BLAKE2B 70910eaf42d62c4e570f87d5eeef778c1
 EBUILD clang-common-16.0.0.9999.ebuild 4519 BLAKE2B 4e300b5e2f17d1d0dcb77ba9f45eb49c7cbc0f2616d5ffb6be31b3a131c3364921850330ff44e52b8adc0e009a66504ce06c08c223d0e99a1a5b8e12b8757195 SHA512 e353f1e6b69c695d23f85f0c0b542658d3cdb37bb102ab0cf106c81545f03eafaa8d720d31535e37523e276bbdeb31e9c0fd8d9b0754b64404eb8ba15bbe380e
 EBUILD clang-common-16.0.0_pre20230101-r1.ebuild 4525 BLAKE2B 64b9de66eceb3adf17543dc174250522e6bb894a2b2e74517193a9f9e60f13328976e11d37cf4fefcfbdb4404cd12f0f53e068c91d71d89fe06ef6e197e30ae6 SHA512 9e615c65eea5cc1816dc38ba1c9684a8a9307ec43967ed0a9cc7c65bd68b90d2e5c9b022856e80864478fa75cbab3f95d325b08840762bc5a60e37061c41656f
 EBUILD clang-common-16.0.0_pre20230101.ebuild 3569 BLAKE2B 5aaee932ed1421cb5dc595d2a236eb84e8df04922625e05c24d8e07f7d00589c9251b0eebaab0dc47858cc1e4206fe26487e9708e824c376b607ab8de09f871d SHA512 f05d7cd43849c81fce6f31c6a97c8122351e87f9a98950edfd6ae9fa32097036be52e31444000e9a1fecd3cf761bfd3d9999842a4f941883dafaedfb657cd946
+EBUILD clang-common-16.0.0_pre20230107.ebuild 4519 BLAKE2B 4e300b5e2f17d1d0dcb77ba9f45eb49c7cbc0f2616d5ffb6be31b3a131c3364921850330ff44e52b8adc0e009a66504ce06c08c223d0e99a1a5b8e12b8757195 SHA512 e353f1e6b69c695d23f85f0c0b542658d3cdb37bb102ab0cf106c81545f03eafaa8d720d31535e37523e276bbdeb31e9c0fd8d9b0754b64404eb8ba15bbe380e
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..1b9640fcebe0
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	default-compiler-rt default-libcxx default-lld llvm-libunwind
+	hardened stricter
+"
+
+PDEPEND="
+	sys-devel/clang:*
+	default-compiler-rt? (
+		sys-devel/clang-runtime[compiler-rt]
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	!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
+		-fstack-clash-protection
+		-fstack-protector-strong
+		-fPIE
+		-include "${ESYSROOT}/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
+		#ifndef _FORTIFY_SOURCE
+			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+				#define _FORTIFY_SOURCE ${fortify_level}
+			#endif
+		#endif
+	EOF
+
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			-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 67ed350fa11e..4bd67a06aa3d 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -4,4 +4,5 @@ EBUILD clang-runtime-15.0.6.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae
 EBUILD clang-runtime-15.0.6.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
 EBUILD clang-runtime-16.0.0_pre20230101.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
+EBUILD clang-runtime-16.0.0_pre20230107.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20230107.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..67b42357665e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20230107.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+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 18c1688443d0..0b519859e860 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -9,6 +9,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
@@ -17,4 +18,5 @@ EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 5183c85d6e303ec5dae02e2dab25405b2220
 EBUILD clang-15.0.6.9999.ebuild 11887 BLAKE2B 54096f168b831260dd077223240e581562d0f85f2b251108b222e2e44926a67688d0aa7cf3e2ae301691f89e72219f9a61d87ae22c06e8cfbc69625a28a2f967 SHA512 c02594b7a0be16c064fc411ada88330ee124912effd732e7d0d8a5bd6bd8b0a51619ec7a73715f8cd17434dfd4d66c692449b95b70312b6b2386e5548db04307
 EBUILD clang-16.0.0.9999.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
 EBUILD clang-16.0.0_pre20230101.ebuild 11809 BLAKE2B 5831fc1c041b44c40e628757c3381854ef96d3f4ccab623616b2838bf0b57e91a7846ddd511c8cd44517497e2189535c7e80a518bb80b1e977e200adfd95195d SHA512 ca56f1fbc06cae0aaa2916921ec37c9244e3365d57317be556ce94e3d76d1f50a0aae119a533a1619db995aed304ce660ceeebca3fc733f70a8066484674790d
+EBUILD clang-16.0.0_pre20230107.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..34eba8f9bc95
--- /dev/null
+++ b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
@@ -0,0 +1,466 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	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
+}
+
+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
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# 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=(
+		-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// /;}"
+
+		-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
+
+		-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}
+
+			# Hack to install clang-tblgen: https://reviews.llvm.org/D141092
+			-DLLVM_BUILD_UTILS=ON
+		)
+	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."
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+		)
+	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 bfcfe0752a21..711d78563989 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639
@@ -10,4 +11,5 @@ EBUILD lld-15.0.6.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73
 EBUILD lld-15.0.6.ebuild 2094 BLAKE2B aeec8f68e077b99b19ac53adca8a1d6e4858892fa511834dac8ad7e4f173cda779ef723c4bfcd252aba7d6e04ebbcde9c764496b413208dbaa31ee2b0dd52555 SHA512 028e2be6594734de7d986d02c9d68e2ac3075019fd3752ae6bdbea277d0659c2b4a04ca0e6c7b3228d27193c60b5a91066e69675968ba14e9d29d719a6f244a9
 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
 EBUILD lld-16.0.0_pre20230101.ebuild 2029 BLAKE2B d4790c6a33351f4018d7b8e68735ed3319daa0de15cbfa16d258e53cba7da1ef1db96bde5ecd7ecd861e87f4c5d984a1252405f030f1fff4d27fc76d200e3bbf SHA512 a1125b3210877fb03cae6ac1213ceb90cfed451b69f1b646ee6b0a7e47efd0fbfcd017ad3cf5e26274e4b4bceb6d9593d8c25476d83a334a7ef2a35797f667e6
+EBUILD lld-16.0.0_pre20230107.ebuild 2029 BLAKE2B d4790c6a33351f4018d7b8e68735ed3319daa0de15cbfa16d258e53cba7da1ef1db96bde5ecd7ecd861e87f4c5d984a1252405f030f1fff4d27fc76d200e3bbf SHA512 a1125b3210877fb03cae6ac1213ceb90cfed451b69f1b646ee6b0a7e47efd0fbfcd017ad3cf5e26274e4b4bceb6d9593d8c25476d83a334a7ef2a35797f667e6
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-16.0.0_pre20230107.ebuild b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..35e7ea49ec4c
--- /dev/null
+++ b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	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}"
+	)
+	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 0d3586c13c79..43334f2f9cc3 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe
@@ -10,4 +11,5 @@ EBUILD llvm-common-15.0.6.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca
 EBUILD llvm-common-15.0.6.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20230101.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
+EBUILD llvm-common-16.0.0_pre20230107.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-16.0.0_pre20230107.ebuild b/sys-devel/llvm-common/llvm-common-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..ce5f03ca34a5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-16.0.0_pre20230107.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=""
+
+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 223fb1b4d240..2c01abc937ac 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,6 +9,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12004 BLAKE2B 18e03c138b0626e20f853d747a9198b4e7a075d463ebe430970a7d22b358c0904956a7caf3c6493a8bff33023c8bc6839abdf4e76183e6e1192ad291953be070 SHA512 026c908326d756b1832721443cfc364b0f913ffc4fa28c75ed9a36960fa46773d00aa9399a4dfe9027a4b5d5d4375a31d332319e99c22ee44dc678216825cb96
@@ -17,4 +18,5 @@ EBUILD llvm-15.0.6-r1.ebuild 12550 BLAKE2B 98707805676dc39cae622f39d00c3109dfd8a
 EBUILD llvm-15.0.6.9999.ebuild 12468 BLAKE2B 2707dd2084950f249c86461d401fff3798ac0cc43d8d1303a4293e8b468eabd334e395afc2993320724036a1c1ad5a4f4ccfb0831d8b9a07b2aef37662225d50 SHA512 f7174f0bf39bb5608bbcbc40fddcb26ef6af1c0567f2164884e934c8e1b7e42850f96cfad968ed8c101b2674ba2ad338ad4eb94f602c647902bc3a57d4745763
 EBUILD llvm-16.0.0.9999.ebuild 12342 BLAKE2B eedcd526ae09a0794853832a29e8ab80d5f4d4fa7d7af235d21742fe03a7d4ffcdd8fad0891b192c1546d7e07f37c8aac2ba243e720cf842677a56485f3e2c68 SHA512 666c4fe74b5739c9e158eeef7aa5c7dd1be5acec0decdf2ec761d63caabd8ae2d47dca0ad4d2b13bc6a4660c8abde1bcc6f1b3bb5683235c995939fb858d7b33
 EBUILD llvm-16.0.0_pre20230101.ebuild 12348 BLAKE2B 8f85e3586a4759dc88499fc95697f2e1a783af79f5ccd12b0400f0bb6850a60964b7a3d29d8627ff23d719e4e9ccaeca88119885e566d9bb7938fb58e61de74d SHA512 daf29febc07f608202b49002d514e4b08de2e871e907fcd996a3bc583420129d97b9bba65199122bbcf8183ffc2f7dc12abf7e6f582910d30ded4c4ebe5183cd
+EBUILD llvm-16.0.0_pre20230107.ebuild 12342 BLAKE2B 845d08c526b307d961af0156c4b897479f57ec4e3107691611edad14013b558d1b298200a6ef5c98fee5dc516a9dc891e09890ed90318fe5e2d2dd25ed47741a SHA512 dc5c25103730d363820c5a765e14812ec63768a9e94f98013a126646efe46b65fe59f7edbb79c2f3656f5aec67436520d704a289bfe867ab64270f0f8133dd22
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-16.0.0_pre20230107.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..414646afea98
--- /dev/null
+++ b/sys-devel/llvm/llvm-16.0.0_pre20230107.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	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_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-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 59f2e8a802ad..2841441aa1a1 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 79816e818d27..6a868c53e2ea 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -19,8 +19,8 @@ DIST patch-4.9.327-rt197.patch.xz 169900 BLAKE2B 432b68f260db4970c3bd844a4d1a870
 DIST patch-4.9.327.xz 4449004 BLAKE2B b48aa23af600cafe5117854b76105c9c65adf9f2f026927367781cd360c61c551b174d2ea73eb02543e626408b27bf3bb8cfed62d9c36e9bac6d22c7e1099a48 SHA512 d6a5421cfbd70ff20664cbf05f9c955f03b55c3e22306f7adfd87ed760794817fd7d2211e5d92b169df64d8578717a9250c7ea6ca312bf10287a7283bf66d0e6
 DIST patch-5.10.158-rt77.patch.xz 170460 BLAKE2B 47ed8c8e4f328a233f1e63e203176791a97d740728ec4974c94f3e4a2b64dc6018f1b72a17b3883a81c2f0def23615a5757f0f8af9914dcfdba1de0d5d4b8c82 SHA512 203ca157282fa15cfbd7e8430488580c74bae3ab1dbf7be1200ad20aab396f9ad916423b1b2054aa8f0d06047dcdb917367d0c1a958df0e3e1e994a987737c62
 DIST patch-5.10.158.xz 3953224 BLAKE2B 7e2e664e5dfa7210da2d632229381d8fccbbc7170c8b01437cc00ca81bc9e1f526af87b449d41ab6dafdcfd8408ee2edee7d1f6a7042032b9576d8fae781c3be SHA512 af468d51c18e05492706a0777c811bb8932a3071a25cef4027bb8be9bfafe7f533aca8ea25adce3452ed07bf785e6cbff1a36d3f2db1bd27b64056c985c47299
-DIST patch-5.15.85-rt55.patch.xz 77116 BLAKE2B 2825ca94e8421974fda79038dea146373f6c0815e0bd447a5906a3007f17a61323213cd9cc36c9bff42d2f98293b1805ce10009bacf53b24e437c658ed22f7b1 SHA512 f32664325b99b9db8c553ab9c856cf3ae9fca089e2bcd4f02508b16b658f1351f16e0a23581f4ff3be0c94d89b70a2f287f6e42732194f6b8f054107b612eba9
-DIST patch-5.15.85.xz 3188412 BLAKE2B 8daba6d60a80165db5eccb0755dedaa64f9e63f63640c40177d198fc99df25e13646504c31e23106d07465ba27cf21e4c084ae7fbd01997765e0135fb6773a68 SHA512 aa7d75ab949a266495391728a93096e30d0579ec490ee97b3a5f7cb4ef4268c17fbc3ba337a289e14c3bebc7e7be4dc7656abe86abc3cb8d691e2d5f21a480b5
+DIST patch-5.15.86-rt56.patch.xz 77112 BLAKE2B 0a92210143f617b78f8fc6680431b544d2436c255e7caa5db850e5981c8b412ab7f93b53904c418267451b0899821de4b36debb23f4c14185c8b672fec476a0c SHA512 073d035948e3966a7f1d2759e1e51ce981cf247cedba942a580e5fb95082e928423284046c2dbd13aad6f79b2b8de4c7b20aa2ca880142f8b376aa956fb2ec0f
+DIST patch-5.15.86.xz 3367720 BLAKE2B 669d633a4540188761e991fa680236853ac01ebece18868b4dfc5607ad281c9ecfa9d9cad3ffcc156ae858ae1961965ab4ec0c799db873a8a356b9d183ef6e9d SHA512 c1552ed1c10a44cbfd6e6d995f05adbaa62554460e4f8bae124eaf30efd49972bc1f5ece5c6bcc20c4f21fd1ff05a3d7b662b3d98cd8e2f3a3a7e186f3aba53b
 DIST patch-5.4.221-rt79.patch.xz 183152 BLAKE2B cab43dd724bf7354491d0f3a61c27af410356009d9c703a2295deec06e4cd797c07c1b10626dd90bd67f7578a65643c09408dfd9bb270b16d885e640f4dc9cc3 SHA512 00d173216a7f3874a6e0747ec72ce725bc6637abf594f7a825485a2b47d6bdd7a061e9582ea288ae076ae791daf20cf01cda814793deeaabf33449411facbac4
 DIST patch-5.4.221.xz 4328220 BLAKE2B 170ca250ecd63d70843cf4d21391d6fc8fa45cb5d9c72a3c4d267ae6976f7c6395b7b07fdc617b3368ff94c34e8af192e868bc2b6cc2e603c77b82b144dac67f SHA512 6739072d27a47a94ee93edce3ee34b44249620b53ebbf27b9c4f8e93f36c4b9fdc02dc54792148594d34c8523b76ffe491beb5505b4444589f707ebdcc575ccd
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
@@ -29,7 +29,7 @@ EBUILD rt-sources-4.14.301_p141.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8
 EBUILD rt-sources-4.19.269_p119.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 EBUILD rt-sources-4.9.327_p197.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 EBUILD rt-sources-5.10.158_p77.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
-EBUILD rt-sources-5.15.85_p55.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
+EBUILD rt-sources-5.15.86_p56.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 EBUILD rt-sources-5.4.221_p79.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 EBUILD rt-sources-6.0.5_p14.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
 MISC metadata.xml 426 BLAKE2B 89cc1d5f99d265e074847c32bd90c678e47e5a6a01706f3bf92211d82db4bf2d4397fb8dd62aa11bfbd25ab463633fc62a991d89e719ae0c5e608f1bafa0c3ee SHA512 bbed525e3e382d7fce0ac05a015b816b423b426fac03519d6c8f49a9dfa1b1c6035e9fc85d97198a680e4e0dc20af2f44815b3de7a0393b06d7ce0b5c0dd0145
diff --git a/sys-kernel/rt-sources/rt-sources-5.15.85_p55.ebuild b/sys-kernel/rt-sources/rt-sources-5.15.86_p56.ebuild
index 8e20943244fb..03c59e4fb6e4 100644
--- a/sys-kernel/rt-sources/rt-sources-5.15.85_p55.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.15.86_p56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4f343235603c..362820dbabe0 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 8fb21368d044..05cf5d106c35 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66
@@ -14,4 +15,5 @@ EBUILD compiler-rt-sanitizers-15.0.6.9999.ebuild 6363 BLAKE2B 640625391bc73444ed
 EBUILD compiler-rt-sanitizers-15.0.6.ebuild 6433 BLAKE2B e3b3acbbe3aa4a535fa121bc64a0ed6931193cab155a36bc2bc21695d4dedb97775c965655586b0aa5492b315eba6cc5e2254976e986fc977e4cdc3e36d24b9f SHA512 cc8a14574b4a9ff5bf0bc78b3a3acaa6cf02eba93a4a0e348f94216cf95464785de260d65a5380c95a2c59a61bfebfde90f6ae137fdef50f952227de6f8884c1
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 9845329e29b14c13818de01405cf3932c08c903e562b435502e0da0d3bf269adbb60b320c5f362dd0374123fc57f3d5e90c35a2b755ea129306b861b60e7c2b8 SHA512 2e7c8b7b1020602b1489dde3b0b1993059f1cdcc6d94f6087ddb9d4ce71e7daeed507bdc62fe8a8a0dce59edd8977a9c02e2ffa0f50edbcd2cde95f74dc728e4
 EBUILD compiler-rt-sanitizers-16.0.0_pre20230101.ebuild 6254 BLAKE2B d9b02e300ec19c81b52abacc0fdc868d0ce21a0469ea7b36ecc538d5c1c58b2aeff2e4284ac81b2cdb8da3f91c5a0d87fbd7321bccedbbdd268648e94a896334 SHA512 5b74c6ebfb5bc199547d2de978640fc2a76048557ccfd766625a82498c240b6fa6f9feb2601069604dc2bd85807cd3a2ef4dc20c5eb5e4369886f1f487952a0a
+EBUILD compiler-rt-sanitizers-16.0.0_pre20230107.ebuild 6248 BLAKE2B 1e960045b24dff5206dd06f0908239ea2f104ded0267f3b543dd8eceac5f7d5a30ee22ce1b16ceee74cc021199fd6d46bf64e42e2911ab27620a17cc8ec19867 SHA512 42a478427dae9dd57d55e4f38eea5e8057cd5f52b7e19e8d9393c8a6d83c8433c73dd2934d503fa5cefc444db079ad317c6de1747a2f66b98f7bf59e9af54af9
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20230107.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..2000a91dca1e
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20230107.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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=""
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b6b08d7a00db..0d14e249a133 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
@@ -14,4 +15,5 @@ EBUILD compiler-rt-15.0.6.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de3
 EBUILD compiler-rt-15.0.6.ebuild 4259 BLAKE2B 75d9e13f260353c0d7fe1a51a80d1fac68bf8eafe474226e8334055f5b8d3ac0ba7cb1ff0231b028082bccbe7df6becb68b32255963f9df129973d3e81a709ca SHA512 cb1a1856b77cf399c814780cefa611f7b1911579f21dc4ff761b7da71afa60835ad7a861e31b7e8bcb2a168d4d785babf1a184686f86449454083f3ca64608c7
 EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 25adbf7603984b3cb09b1e3bf08d465e20997654fdf5276f6a992092cc11a43210a134c7aa0c1bab7c4f6b023de517c34e265c1249d2671c577d4930066f2629 SHA512 893fdc38fe3d885f1fcddb4e72e9173f6af74db1e20ef34c1d2a903cd8ef8fe4acae85843b752a5b8474a3abe1212a254657c5f7ca4fb2357cf62b57427f3935
 EBUILD compiler-rt-16.0.0_pre20230101.ebuild 4170 BLAKE2B fbd170ba961fde9eafdb417dd86e40cfe27a89388cd74b462cc0d51ecf1685c61d249a91e31f22646572f151e262f719aeaed27a01c18f8e93d2323ed471b085 SHA512 982a87497cc7689f7519f6b6d28baf75c3f487a94222ddb44ce5ab2bd9d7854b93e8430beaf6ef45b846d271982ad6547afc85cddf94adb83a14807247f7a8ba
+EBUILD compiler-rt-16.0.0_pre20230107.ebuild 4164 BLAKE2B 20bdc1f05c3dfd48ecd5b49b877373f1b8a7711814231f072a706a3483181c4321d149f99ed4f8a1c655517d9e9beeaee468c9e8d0c3216be900bb07cc2cd85d SHA512 1b9a87768a25584df9e52e57e4690ae305bdd8a46702f2e7a0fba2fd1dc484249d8500430c5c3506ad6faf847d4bf22e58a6457cafe1c04ab9cff0b660602e16
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20230107.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..602941c43842
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20230107.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_{8..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=""
+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 dev-lang/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 ef4bfb13ab62..cbb4e6fe0681 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0
@@ -12,4 +13,5 @@ EBUILD libcxx-15.0.6.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c
 EBUILD libcxx-15.0.6.ebuild 5281 BLAKE2B c8f91ffb2101c63241eb9a0dcb22c933daa2bdb2423ee53cf8bffccd674504a871ad96c6d6808d7e128fe8e9dd5098aa4c735d13b8e466ea2dbe2f2615e26e6f SHA512 2f81809d3ce82c9f0cf66ded512f04544722e198528d373880231bfc8467f9bbc7a15b86950cf3f32594052b72a82d99de016ad1c7d8b88279759c6d9ed6e828
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0_pre20230101.ebuild 5244 BLAKE2B 5029ea52576afa4fe238258dfc0cf4ae75428e0635e91e344e8c3e53a8ae08d6f201c3075b1bac32f6bf36b9877762e988ef550d6e5ae94511a1f56dcba1dce9 SHA512 e5a600b76ec90af215e51b529df30c9b119c1906402add03af1581a219e1ffd83398c1066c72fc5bc13a759c6ab04b75eb7f9e920c2856721b88a9ee33e41deb
+EBUILD libcxx-16.0.0_pre20230107.ebuild 5238 BLAKE2B 6d45a312718b66684ec3554bafef9cb4b6b2ac4995291e5217f32fafa0b30a5741d64517a68e8367f227eb5ff7c7db4b7804fbe41974b20ef7988daa90ef3daf SHA512 b04d7b09c3da1a6352ffde885890faa7e1d09abdb4e7221b9dfe1a6d4a4c279474a4c4a6fe82d7d3b1675220319e44213029a0787aa82a85769043dafee1bb99
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20230107.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..1b03c27cafcf
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-16.0.0_pre20230107.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_{8..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=""
+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 dev-lang/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 6bab281152bc..38c5b2d7a175 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,6 +2,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 0da66a538e0efab041fa5f56c31a116c9274bec95aa18f10b5759d6347e3e864922207cba0ddc6821eadad4243c247b01869d34f42e34c213f410896f5ac5b8f SHA512 2eaf47c438cae3b024eb64cecedf2643ff2ecbd35610d5cff6fb2f06847af766ff105d4923dfaf2f4d014944f2ef3ac54edd5f7c83e31d49c071ac57f56cd38f
@@ -10,4 +11,5 @@ EBUILD libcxxabi-15.0.6.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459
 EBUILD libcxxabi-15.0.6.ebuild 2909 BLAKE2B fbe7b5e4b195f3e618c8a037c1f26caf33675687f8b81ad224594a80118ab03c98990ce5f9c3aba8ec110e1638d0dd6bcf65199de9faa3161b21562a99141952 SHA512 604779cc487fa17e7f90a400bef807c5f2af38e4a954e8c9fcfe33c8b33e7c27a49e5c09fb2a5a74bcd6de9b53c84c689567bcb382d9dbdd4b5f6c78842be8d2
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0_pre20230101.ebuild 2872 BLAKE2B 61dbc34c1db8906d7345cc21fa30061163019ab9cd040f86139ca9521ae01f37082be7c791e219f0cae0a7c1c2f1befdf84b921afc3c098443417a70afc6906b SHA512 599fd2842074171ed68b6eb5aa94a7d4c8c34c4acb28aedc2403a1d5b508852e0233e8ff72cefbb05edce56640e30bd3d93f6bebc99cebe695f4f36ee3560173
+EBUILD libcxxabi-16.0.0_pre20230107.ebuild 2866 BLAKE2B 936a18f2cf498976ffe971f0044437941ff1faaac975e5edd47d1fd767a400c3db6d44041b0e71924bc98c3f20228d8291c551e4fdc7b3e2a1c7db2d5c297b79 SHA512 0b82f147a20437a199db129fb9441ff46ed53b0fb4d9650e62c019d4b708ebc33721c84883b68e184c53d63e483a5358522d38238340a7c5132220c386b0d33d
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20230107.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..b87ab069bc46
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20230107.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_{8..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=""
+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 dev-lang/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 736a707add9b..a93778c9fbab 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b971818c831e7b155f4f0973238fdbfb5f2fa91913fef93e01beed45f42b1158af92e56cd8445c4a8157508bb7 SHA512 13f150c5223689e4d98e16cafa11e44164b177eb68d3df213582b85c5194e7f736143b49b2075f4178689efcfa8320e2b1faf34242c09dbfcda923b443d42741
@@ -12,4 +13,5 @@ EBUILD libomp-15.0.6.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674
 EBUILD libomp-15.0.6.ebuild 3400 BLAKE2B 5d32a78862925977f86ff428005e919b949bae48c7e395ea3ad5c022345f17f888709c5de97b1832a29fd9df7391f8fcf1358c54964bb7d1cbf27331c51bd7e8 SHA512 3030bd307f4222dd5f95db117f1528dde85e3837870a7b9dbb0a33d97d7568b1bb19fca28f12ff5144c5e0e86c480d3955895b513e29f2f49492cf188d241af7
 EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
 EBUILD libomp-16.0.0_pre20230101.ebuild 3450 BLAKE2B d8c3d973ae2007d75bb1ddb45c71e98ffb8a49fe8d0ad68af22a3d8772b54f250a84a329777ff7bb7f704ab1d929f48f7bddd357a9e6371fe44645688f7a94b8 SHA512 31b382324247b0408c4724e93e7d70e03e0397ad8d643630fb4f653fd94cc3dcbf1eec08bbff6eb63f272a9560617ed3894f0cbe7cefb55446ddbeabb5e75ff5
+EBUILD libomp-16.0.0_pre20230107.ebuild 3444 BLAKE2B 68cf21a8a1e94dd920542c5f8c9957f530a2d9a32922777df87ca88a92007ce606c26640cc5076a82a6ab6fbccf57827544d3503796f82d989b29200c6366642 SHA512 a22ac88e69773d7604fa8a079444a00a9d76cecb6cc66168ea77302146d1ef78d7183a91bbf285ac1106d8356c64f1693db51e7abe1a03b79ef033e9b8b0d771
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-16.0.0_pre20230107.ebuild b/sys-libs/libomp/libomp-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..c9b535413ffa
--- /dev/null
+++ b/sys-libs/libomp/libomp-16.0.0_pre20230107.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="
+	debug gdb-plugin hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+	)
+"
+# 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 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=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	if use offload; 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 f37c0cfc58d0..a1ee36dbc285 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,6 +3,7 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
+DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAKE2B f9a955e8413b57067fb697792316fb0c1e3eac00b1af208ba5d29db01a9acc96b88c7edca12c43762b1425c71a716a7c74d5d7edad45a442f32ba73f88f548b6 SHA512 5133c32d7856c8280bfeb47c3e5a9c0d8c1c291aad29af93586523110f95b08e582ff416fc6be02241eabfe80c35ad4f0334de5ead2a41bc6504616b1c6fd15a
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 8da1185d1b1c71fe4a84cf068847cdf86f210c181e5f745b3ed05635b8f2824ac7aab931a8066cf199c93553fe4a3a0915972f854af1e09b1a2411f66fee834d SHA512 736810a5a52be3271854a50b476874986618e79fb24022ae3188c68759b31b75071083db9a5c9ab8f9439edff3cf7df2e4a20a847ad330984796ed747eb1cd4f
@@ -11,4 +12,5 @@ EBUILD llvm-libunwind-15.0.6.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e
 EBUILD llvm-libunwind-15.0.6.ebuild 3032 BLAKE2B 5bfba5ccba61bd80b630395ca39e5db7169b52f44f2a8885b69a4b064ae66de36877e09f253ac2b3a6b2d41affa75f955ecc321a5c34fd812ab6d9c484744228 SHA512 d7b33ae5d44edccf3a08b8931406f32c409d035bd0f931cbcd1d6166c75757680d6c3a62b8ca057967626121ee668a33ccef3d2c9eb415621029a3e5268b9126
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-16.0.0_pre20230101.ebuild 2984 BLAKE2B deae7ad5fd3a29c61d82ed929226a88679f7d04912168fba7202b9439566988ff533144f3aaa82ad9f4e617deb8bb408bf9cda6c39f95fe6dad38f100fc9fdfb SHA512 095430a28814e2ae2389132159d46b5c36de11b5e81ee41b14624a819ed164413108b53685577be3b3d5c1239f65a935a0f63e611d9d4997d37620e79bcb6b49
+EBUILD llvm-libunwind-16.0.0_pre20230107.ebuild 2978 BLAKE2B 2422df8215a37c486269162b45e350b3b264d4e2e4fd40d40ee22bcf8634134ae3704e2104f9024ee37f7d534b93c5c282c923108d0ecd94fb0817fdb49a912e SHA512 efc8e109894798bde4048352af6a5180082814d486fb37b000ad43de4cfc8e65e81adef2111106bea704b29645f97140448b5dafc95d2c6d5fcecd4914e1b2e5
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20230107.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20230107.ebuild
new file mode 100644
index 000000000000..b1b5bf2a17bf
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20230107.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_{8..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=""
+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 282da6b97fed..24373a60ca93 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index fa14c3762214..e7dd8eb2dda5 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,6 +1,6 @@
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 DIST ikiwiki_3.20200202.3.orig.tar.xz 2689636 BLAKE2B 2b88691591e72dc7d55ace2860ce6faf0bd62fde119bbab9c8db7d55dda384b84a51b562aeb9397457fcfb8cd405cd327380e418f8a65debf1e311942c05c222 SHA512 a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
 EBUILD ikiwiki-3.20190228-r1.ebuild 2114 BLAKE2B 52beda8293f45105a4368dd8fe8af68d3901b7da990c10b341de47df730032009f2b728b4067f7ceab791e8ef5e7a51e429c9041e53a9deb46f9c4204342f80c SHA512 87ed038729411d1c75911a4d97a833ad80c0b0b635707862b575eeda715e1ef565ba8866c7bba9c60fe65ff24f8fd0424af9f939c9c9d476e9392279b95dbbb1
-EBUILD ikiwiki-3.20200202.3-r1.ebuild 2184 BLAKE2B 41ce6e152a19d161fad48fad898ad8f4a180a1307c33ad7f37150b8c81f509721e8827e4d691a7ac7e5af6e3d7e4b99412964bea68de798e8e8e692700356ad1 SHA512 da83f86192f210c7b064420cffe6dbc6aac20c2ff4c6f7388199b0755d65456f5e06465117189869266295499afa61cbcd3149d00806345af0e2e62ca61d2d3e
+EBUILD ikiwiki-3.20200202.3-r1.ebuild 2183 BLAKE2B 988290c99b15f39cc9315f3b900cc750d5048ba2f3a52c064396b84307dde636b49f07eedb18cfa041d7059f8d74e9a865c9be243a5521548b122b1aa5b97d24 SHA512 dae06db3d4861311dc8e715703cd606652d83f99febf6a5717aef9e65a30af094bbc1fc7e6e36ed187cf7638fc651f17ecdb0e4b9e1b8d1411f613720acfe75d
 EBUILD ikiwiki-3.20200202.3.ebuild 2127 BLAKE2B 1a981093f3ab37e0b50376233ece145804140ee72504896c82c3269a6b4d5abf3743c453f68a6baa287e79b52888af4903862ef2dac245798d7e3ecefd509a72 SHA512 4ece2a1e145cfc61d2e10592109e7277ddbd12edc6e00ef8a2c5c023b41db5025b5b5d252c5094b3d4eb50d80ff059c13f1181f4198a6a2fc2900243eb1da8bf
 MISC metadata.xml 260 BLAKE2B 912094efbdb14e53fb606a8d85604fe8963d5c40162db26cbb43b8d18091d28a0d543d64edc7e300755b10e0fdada949901ca5df997a90ffe5be7f4717507855 SHA512 7ad3a45f173d9755b2b0faa91a3f35d110fae001d94f21b3e403a4933e14d385f2e8b1db9ad30dae6a5b282ca1b82028cebd3605ca3ab5cb4a06cf8059512cc8
diff --git a/www-apps/ikiwiki/ikiwiki-3.20200202.3-r1.ebuild b/www-apps/ikiwiki/ikiwiki-3.20200202.3-r1.ebuild
index ee1d0d53511d..604debdcea12 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20200202.3-r1.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20200202.3-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
@@ -13,7 +13,7 @@ S="${WORKDIR}/ikiwiki-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="extras minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 7e602f82b004..942adbce38c2 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 5a2026821f0a..daf13c35aaf2 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -46,7 +46,7 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
 DIST njs-0.7.8.tar.gz 613161 BLAKE2B f6b10be576119f418cdbe052a0c82b847d1b43278f4f0764ac7a9c7309162bf48fd60b40542b97e43fa925c87817b19785ffc6c83fa0611ca73256932e8481cb SHA512 086ddb2e5189a8853598870b795bfa788e9e75da9d2502541a49314e8149d7c279acca0709c4c517db26611a416dc5fb989be807cf1697c7411aded1bd5b8237
-EBUILD nginx-1.23.2-r3.ebuild 40464 BLAKE2B 8cc8182f2a5f2cec5c8029aabe7563215dab8855b69e206dc2226c8ed7944e092cbee515ec6942630922f169353fcfc8bca49a6132548e1c335fb4b43013f09a SHA512 43b050e0a042c2b56c203b3f61cab9d3944b7a174602cab1783029074658deb7061afd26365d27b471c2ff4b3253b653fec23f8eb9f47f4d45831a2c81f2f2ae
+EBUILD nginx-1.23.2-r3.ebuild 40463 BLAKE2B 80796990687037f3fa6d5334a6f71846f4e14ecfd7f2ed57fececbc92258e450cbeac41547b81be2958e2a89f941113e58d55f3133058947ae33745ca95ee997 SHA512 22e057ea7af20bf1cf0b85d6dbc4de12788c57a36eb8ec604ee2137fa395b8e7619336867959c471ec58cb91bd23d7cf1aee46cb956f265ff0ddefd6ba43dd5f
 EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 EBUILD nginx-1.23.3.ebuild 40465 BLAKE2B 24e4ce7a06600346fd8df476a607a8d836e14a297f4834d0759aae883b12260ddbb11757937adae7407b71cdf24abdbbff006ad93f84401953ac00fbe2b48b6a SHA512 6b3c067f2f7606891f5d886669c0e09cab6d8649140f8b33f1b478430cd11773c3653a9bc35427cb8fbfe703d6b2495a77f409139d480ab5686c448e810049d7
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/nginx-1.23.2-r3.ebuild b/www-servers/nginx/nginx-1.23.2-r3.ebuild
index 7eb93de6c891..d9fcf97c2944 100644
--- a/www-servers/nginx/nginx-1.23.2-r3.ebuild
+++ b/www-servers/nginx/nginx-1.23.2-r3.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
@@ -208,7 +208,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
author	V3n3RiX <venerix@koprulu.sector>	2023-01-08 12:15:59 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-08 12:15:59 +0000
commit	6a57f9ee53dc794f3d47ea68f78d6ef76d00af47 (patch)
tree	dc9e574f3209abd88e91e2ee0d6093f4fe78e2d3
parent	268f9f01921ccb921b794d43092c5f29c1e96c56 (diff)