gentoo auto-resync : 03:08:2023 - 16:53:41

205 files changed, 668 insertions, 3635 deletions

diff --git a/Manifest b/Manifest
index a9491285ccaa..e71ee743d999 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29321 BLAKE2B b07f5df74f00b6e189363a826b39ef3c3d7af32fd03aa1ac754313d1d99e125dfef3b83a58deba74a319951865358e5e9319833afd626e46b805b61a1024685a SHA512 ed60d32844b91cb21925800b56e6a7acd1d54124aed116c8b579fdd3d16b8526835ae7d3778d9748c52d81b22863d59055110c5ffe30e641227e708db5e97cc1
-TIMESTAMP 2023-08-03T09:10:14Z
+MANIFEST Manifest.files.gz 29302 BLAKE2B cead1f44ebbe1fbdec3329037600adc46a04254f1a64fb523fe8cc35985fff1cfeb848f1714b43dca3948be009a9080a5f66df57dcbeee57677a2f50e6d2067f SHA512 1c2e02e7120b02c5bd29b63d172e59a637a7007b09254985fc43b16e5c7bcd24cc461b5ef56b41fe62e3c786379a34a5f3d0cbdbe56c29922a2915f81d225524
+TIMESTAMP 2023-08-03T15:10:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLbvZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLw1JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCuHw/9FD+u50LgNKGowsNWTNlP2smaKNgUZFrlfZjjXKLb07ajrKDdEz2cfe4I
-3Dgo+mMUfabeYmi27Ci1Ax807DpJpgzcmHjqkESSzDJbVvdw67vqlQTw3frVuf9i
-D/22+1qbjUGO3CqTnuUQI+P4dyLI4p+w+/iQeBPLTmQEu1SNYWqsBj8l3Nm3RFhE
-T2bG9UnZgNGHh6CyLBszW7Q9wOXQdqz7jGCTjaYACt8m5+cY+t2Je/S2eND56+Zz
-a+FiiUJELJt1z9dsn/awr0JsizD6X4PhbtFWFW8HkdoC/FLf2qXjU59jLpBiyFQK
-CrgDrCsincOyzKUXFUsEai7zvTZmGQmu8QRtm1elApmzMj7eIa9mhvbIcJ77Etcj
-hJixsDmeUniJXNMCbUEf4St1y67q+s1ClwDdLnJeC+okx9nSh0a0y16U695ghLx6
-xjIV1OnC95J6AHvZ5W2NMsZuEnrZnhRCVQAJbNmcdHdCscm/JEdrg/966eFUvySh
-M6Sd1+eaLqpFuqWAJ/OLSQeO5jMhSej/CfQwZeMHswYMTaf0h9/ckLa2a8qJ+F8r
-kpd6FmOFenvgsl/cyxymqxHmJ9q1IsfH8gvdOiOcUkcKQM97+VKusIRRZ6jl1yPh
-vJSvZmeHfNy9+ZXX/oMqXAZYRfE5S45hEwaks5ZO6SE11CkkYyc=
-=xMa+
+klD18w/+Iv14344xaP2AHIlX4lhR+TZ0t8xNbpp6fIrhnSMQHScqyh1Mpe2ZRKtT
+aq7lT+zWOBKTyKAZJjxi65tPearZn6RIgYKTXLfFcGRM9HWwWGtfxZQSCVnOlx0o
+YP+VF4HJacGJDtdHuYITqsB82q2O5PYVb4+MKkLm9r1TQUChfILtS7I8nvZCMsuv
+Xuyj/HUV+7kdNdydGa7RQq90M2E6FvcYLpMcklSmn+4gK+nBUnUjJvwwR8U11G/k
+eEXNuojGJG8L0pSM9Bf0HgtPl1KVXhnEH1QPpIcQKu6Caz6A3CoKA0KMTYDIcKni
+dzU08t6/Cohyf00M1ukF6LiSNXekhJSho2mLgFQ7h9aXcs2ojrgI1Wn5+Szbie5n
+upkVYw/+PUMP513iXKKYm4QIFul8STW7qkuZRrua5D6IakLA4ZFhllYWv6VwNIgu
+3Bbfy9xosC97HT9yjdVvowzzurzzeCvSjqJcDDeHB9Z3QhZrv4Ng1c+49u8SuMf5
+gJCCrV1OfneBJ0QR1aKru9J4nj3Rul4yC+MWz3wMfHacukYh/8ZaAclMfkz83X3Z
+iSoZcJ+i4Oxvoupd8hrtPt1MmmKFsbe/fr9IUjiID/YIU7TF7BGa98nma2tebFOB
+PWsS6kGCNiEqCpTgi1cvHdwjQkb5UZnZhzKslEPSsn0eM8hq9U8=
+=HogY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5ae2c0ffa5de..10db0182ee6c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f21b62d9981b..664e3371f864 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 15fc54ce647c..c51df6567f8f 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,7 +1,9 @@
 AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a
+AUX drush-6.7.0-dont-pass-null-to-strtoupper.patch 1076 BLAKE2B 3f2335b9d84e95705f38830d692902db9e460686e5b619840dc83116774a0fe5a7389bfe11cc213e2fcad398000a3b13d4c7cfba3c194d0df95d334fffad2b5f SHA512 5f506583a025f989d027519d5b64014274ddd69065890cc1ae3db1f89959b021dae849a25b9a35885f92b4e6ceb137990d13e0d1c0f7b0eb1b60bfac281ab008
 AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d
 AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
 EBUILD drush-6.7.0-r4.ebuild 1731 BLAKE2B 209588f8a0e5a2ec602600d8a5d10e465517230f102a7ab3af0753561469c2ad1fd06ca48dd06be0c18e79ef9f95c65a1bc142ce66adf7333606c08085a947d3 SHA512 492a35026e2c3e781c082a17e2a3d15fbad235bb5ed56bc50f98b501fb7c8f97efd0b98a807257fcbe0d0b420504a5ddeeef67339592dac7f49ad9a78defe0eb
+EBUILD drush-6.7.0-r5.ebuild 1788 BLAKE2B 2a7658b577625606c8cfeda4034e28ff52add96e2db8012d9afcf2092adae9924902ed921f6fc6fb8e3bca27b1ff7b3b9c642c220862dfa6269efc20c5f82286 SHA512 4bf2da1a45cdb1176d37fed7a953462f3a9d63d0e3d036d84fa03c728ab68cf3bed5b522c80aa8ccbedbb32b91e1a48d1a4ac45901dae359d3623c993c2d494e
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r5.ebuild b/app-admin/drush/drush-6.7.0-r5.ebuild
new file mode 100644
index 000000000000..a4f2be23bf54
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0-r5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
+	dev-php/PEAR-Console_Table"
+
+PATCHES=(
+	"${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+	"${FILESDIR}/array-syntax.patch"
+	"${FILESDIR}/${P}-php8.0.patch"
+	"${FILESDIR}/${P}-gzip-mime.patch"
+	"${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch"
+)
+
+src_prepare() {
+	default
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+	#
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym ../share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch b/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch
new file mode 100644
index 000000000000..408a271ce38f
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-dont-pass-null-to-strtoupper.patch
@@ -0,0 +1,26 @@
+From 621cb8db059f3dff434dc369ab46faf3a2efa539 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 3 Aug 2023 08:52:35 -0400
+Subject: [PATCH 1/1] includes/environment.inc: don't pass null to
+ strtoupper().
+
+---
+ includes/environment.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/includes/environment.inc b/includes/environment.inc
+index 7837104..dd2c71d 100644
+--- a/includes/environment.inc
++++ b/includes/environment.inc
+@@ -736,7 +736,7 @@ function _drush_get_os($os = NULL) {
+   // that the path be converted to /cygdrive/c/path, even on DOS or Powershell.
+   // The special os "RSYNC" can be used to indicate that we want to assume
+   // "CWRSYNC" when cwrsync is installed, or default to the local OS otherwise.
+-  if (strtoupper($os) == "RSYNC") {
++  if (isset($os) && strtoupper($os) == "RSYNC") {
+     $os = _drush_get_os("LOCAL");
+     // For now we assume that cwrsync is always installed on Windows, and never installed son any other platform.
+     return drush_is_windows($os) ? "CWRSYNC" : $os;
+-- 
+2.39.3
+
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 657ddbf6702c..bc8e49e78b85 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index ab9e91f94f32..a1937d448846 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,17 +1,13 @@
 AUX godot-3.5-musl.patch 325 BLAKE2B 6069b159c7844d471ecf79d080cb4b3d5b21cf82093379961e163efe52866e1d25ca8075ee1ba653aabcaf912592968dca6fba43cb4907d703711af237bacf50 SHA512 828e5870fdec8cd4c4f132db24de722f73f330dc278b21020cf38aaf26498c69723e1fc75855dd01683452c3628a782a3957ff47d5ecf2e13da1bd8aee3a5805
 AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d479eb7525f3621640f397dc77bd000780a142418a74e671b6f5b241e27898f5cac71376eb684d3e995a9ac33 SHA512 d7f230da26ebcc40ad0c8c59046a863aeca69c314661ccbcab86c49f545df9662c68bc51d72a146033385ed09812ce2de92aae58a32462402f89542a47069202
 AUX godot-3.5.2-gcc13.patch 433 BLAKE2B f9a5e7e700084910ff7c5e5d3d778a6b9f4358e084ae198499626378c99ad6a4cc97941455bba3f1fa74cd80ed570fd855e1665af1260ad861b5ea9b735829c7 SHA512 ade16845dc997850a790ac30f7076f9ffb37a9b586ebc0be3adafc49dd9eace846b56730ee09ff4e7e016ceae345d6b2caa1bb1c55c1cbde680e346dc63b7639
-AUX godot-4.0.3-gcc13.patch 292 BLAKE2B 5f6af5b59779ce6848bb9552674ebf36e43a8ac78cb00e0fe1601af2d0ebc234e71811146b64d7f3f1797a7cfdffdd9e131ab08659897c61f2920adfb39bbc94 SHA512 5edb2d7238ad24ef5ee7f44cb686d7abda6ec7789e648c5ba42176605154084990e453b8f046e2fa4b5e88fd2c10f898e861420cc3a25cfae1ce0e5291853d2e
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9781d81897b1b24a79de792fb967886fa7be6494440fb4e8ab69a83100d455838b986ce195dc30116638db544e SHA512 97b365952a7c1e7e4088ed71d1c98eccca1449b481d05e10fd750a6d29c7635dc6112e0e033ab1555cfe51eda8c0b805df1fbe78e9c54cea2664aed8570fa077
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
-AUX godot-4.1-xkb-no-sowrap.patch 3079 BLAKE2B 0a306608389e2e8dc552e5c6d3f6e90e9c1933a833cd523be4728458ecf167558b76e91e8fe133392a485798516f0d110d9c09b4a00f9652d417a759f9ef4a34 SHA512 40e112083bdb6bcf28974a2d92fec7b677e78ee8d521e809ef4e884e57768267308a3ee970f0eb4ae530bd8fb49344ce782afa73d714bfa3db210db779c9f7a9
 DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
-DIST godot-4.0.3-stable.tar.xz 30203636 BLAKE2B bfdf2f3a349d541039639fbce9d9d10ba6bfc200ae9442900709b1cb3d3c40dcf68b3de10d9ebe7211a1dfc380a5cf8954c5ed1d9a510afaeec8cee2dc4e9123 SHA512 185c3caf99dbfeffc83fa8298c801121ee58c4c6d3854127aeb3cb2128ed08ea1925229b90f08a79e3ea5e674725fe62e219226a58a17789c0e72ae8f27ed576
-DIST godot-4.1-stable.tar.xz 30679684 BLAKE2B dc088aa1496f9acd77ffeb2d35f1e0c71521e6cad4db8301626f1eb1aa9a147bc77e573ec82f84f05f38edcc2962991f45c822da9013797865ac0fd8669028ee SHA512 561473924fdfcc97f32ecdeedc3548059acf8d53701b17074ac5f880af3c95f60dbbcc594e7a9c919e4aa1067b3d362448fce2cfcfe76fe13fe63ad29a7c3bb6
+DIST godot-4.0.4-stable.tar.xz 30267060 BLAKE2B 42f5f0c89edb96eb6f36c54229671f233ed0a49a769361195f9aaf807b45fe3968aeeaad204fc07e200114d852e4651f9dc8eb137c4f3aca7b8e8e1203ebcdc9 SHA512 4dadc123995d7262ffa6c5002d08611038957c59a8bd742284b9b62577de6b7182aad807db7a231180a355df0f25d10babdc914faf9287ed401152d98762bb5f
 DIST godot-4.1.1-stable.tar.xz 30681136 BLAKE2B 18e6dae0428812493ecdd8d76cc99c2264873707d4abac0146a1d9b9cbffe2f678c346951a714d0d211fd380b433f910cc952e1720a2c4933febeb7d64283369 SHA512 9fc4bdff2ef3f5ad173514709591941f1dff32dd7cc54224a85691b34b6a5f1d01addc9b4f8d996bc6f774cee5c722181122a39b498b23e48e8d70629ff8ff0b
 EBUILD godot-3.5.2.ebuild 6661 BLAKE2B efa30faa7c394c5971a62f6ce072c276585e7b4ce3399767c4143cbd444f7a98746a01332532d15dbe47bbc054c38901e46bbe56033c2fe4e815206c7094901f SHA512 ec2c9e02cf77a139d1ee27eec23e36e5eceb64e5513866131a08a9e6c37c31f722bc0a2b6c363ab36626ebb711d3ea6eb433e08c06cb8f24f31e891bea7d51de
-EBUILD godot-4.0.3.ebuild 7022 BLAKE2B 895e7947bce9b6e9ac2887a6552c198eacdc941c34bf859e482c16d47c301db150c3767dfecf6f22947d71ce0c66792ed4808c48d4bb3d78f63d71c83121a934 SHA512 efaaa09e22ea2ac34cbaaa97c1f2a9ce9245f8d00dad915be3a2d14fe5f8503eada573c21379878c74fed12fc52cbd64d4225416230d5fc60b98cfbde6a7dfb5
+EBUILD godot-4.0.4.ebuild 6983 BLAKE2B d089b3cd44737743c572ddd4496064c635f2934e367fbf834bb3527c852061cbaec8283405a7ccad7f59a6bf210fb5a44727c114b228056f98f0f2a819f7e889 SHA512 0aa73012f7b271939e5055f21db46d3d613c5b6eddde7f428418c0ffc0cc7a53aa7038fb417f4ff826dd1ab68e1f6baeea6293148f0a945a41987d01a44ead1e
 EBUILD godot-4.1.1.ebuild 7033 BLAKE2B 5ff93d7024d6404470339708928c7012a4ab843a4e535ddc033e5f05bde3934120f0fa4e174c480e8681a4a6a640fd2a7b37c35455d3a9c65164b718422d2661 SHA512 1b5a0bd0bd24bbbe7b5d77d489217fde719c94a452f113f079a9c575b81cfc62a3220675b6a310bb75e2d5f40e556a1f444fd7b70e2c13ebf03c367091891a8a
-EBUILD godot-4.1.ebuild 7023 BLAKE2B 9877ddbc1e05338fc3d08cb50315f9dd47ef6bf105d191fa03a55a6ce9f2c4175acc2f1399be32ff7b757663f60b37232c7a8cfe2caa968496f9b5f672fd17bf SHA512 974422821c2b1c90ebfcdf09f08717679513a16a4ce86b518efd4401d20063343c9d7395086e29d75b2608b0fc7a6d3f8f458b53aa0d460a641e067010bd07cf
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/files/godot-4.0.3-gcc13.patch b/dev-games/godot/files/godot-4.0.3-gcc13.patch
deleted file mode 100644
index 145303c7ebd5..000000000000
--- a/dev-games/godot/files/godot-4.0.3-gcc13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Issues seem(?) to only trigger when gcc13 is combined with musl.
-
-https://bugs.gentoo.org/906363
---- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-+++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-@@ -17,2 +17,3 @@
- #define VHACD_MANIFOLD_MESH_H
-+#include <cstdint>
- #include "vhacdCircularList.h"
diff --git a/dev-games/godot/files/godot-4.1-xkb-no-sowrap.patch b/dev-games/godot/files/godot-4.1-xkb-no-sowrap.patch
deleted file mode 100644
index c4643b332a37..000000000000
--- a/dev-games/godot/files/godot-4.1-xkb-no-sowrap.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://github.com/godotengine/godot/pull/79097
-From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
-Date: Thu, 6 Jul 2023 14:05:28 +0200
-Subject: [PATCH] Linux: Fix build with `use_sowrap=no` and various
- warnings/errors
-
---- a/platform/linuxbsd/joypad_linux.cpp
-+++ b/platform/linuxbsd/joypad_linux.cpp
-@@ -98,19 +98,20 @@ static bool detect_sandbox() {
- 
- JoypadLinux::JoypadLinux(Input *in) {
- #ifdef UDEV_ENABLED
--#ifdef SOWRAP_ENABLED
--#ifdef DEBUG_ENABLED
--	int dylibloader_verbose = 1;
--#else
--	int dylibloader_verbose = 0;
--#endif
- 	if (detect_sandbox()) {
- 		// Linux binaries in sandboxes / containers need special handling because
- 		// libudev doesn't work there. So we need to fallback to manual parsing
- 		// of /dev/input in such case.
- 		use_udev = false;
- 		print_verbose("JoypadLinux: udev enabled, but detected incompatible sandboxed mode. Falling back to /dev/input to detect joypads.");
--	} else {
-+	}
-+#ifdef SOWRAP_ENABLED
-+	else {
-+#ifdef DEBUG_ENABLED
-+		int dylibloader_verbose = 1;
-+#else
-+		int dylibloader_verbose = 0;
-+#endif
- 		use_udev = initialize_libudev(dylibloader_verbose) == 0;
- 		if (use_udev) {
- 			if (!udev_new || !udev_unref || !udev_enumerate_new || !udev_enumerate_add_match_subsystem || !udev_enumerate_scan_devices || !udev_enumerate_get_list_entry || !udev_list_entry_get_next || !udev_list_entry_get_name || !udev_device_new_from_syspath || !udev_device_get_devnode || !udev_device_get_action || !udev_device_unref || !udev_enumerate_unref || !udev_monitor_new_from_netlink || !udev_monitor_filter_add_match_subsystem_devtype || !udev_monitor_enable_receiving || !udev_monitor_get_fd || !udev_monitor_receive_device || !udev_monitor_unref) {
-@@ -124,10 +125,11 @@ JoypadLinux::JoypadLinux(Input *in) {
- 			print_verbose("JoypadLinux: udev enabled, but couldn't be loaded. Falling back to /dev/input to detect joypads.");
- 		}
- 	}
--#endif
-+#endif // SOWRAP_ENABLED
- #else
- 	print_verbose("JoypadLinux: udev disabled, parsing /dev/input to detect joypads.");
--#endif
-+#endif // UDEV_ENABLED
-+
- 	input = in;
- 	monitor_joypads_thread.start(monitor_joypads_thread_func, this);
- 	joypad_events_thread.start(joypad_events_thread_func, this);
---- a/platform/linuxbsd/x11/display_server_x11.cpp
-+++ b/platform/linuxbsd/x11/display_server_x11.cpp
-@@ -5449,7 +5449,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
- 	}
- #else
- #ifdef XKB_ENABLED
--	xkb_loaded = true;
-+	bool xkb_loaded = true;
- #endif
- #endif
- 
-@@ -5476,6 +5476,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
- 
- 	r_error = OK;
- 
-+#ifdef SOWRAP_ENABLED
- 	{
- 		if (!XcursorImageCreate || !XcursorImageLoadCursor || !XcursorImageDestroy || !XcursorGetDefaultSize || !XcursorGetTheme || !XcursorLibraryLoadImage) {
- 			// There's no API to check version, check if functions are available instead.
-@@ -5484,6 +5485,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
- 			return;
- 		}
- 	}
-+#endif
- 
- 	for (int i = 0; i < CURSOR_MAX; i++) {
- 		cursors[i] = None;
diff --git a/dev-games/godot/godot-4.0.3.ebuild b/dev-games/godot/godot-4.0.4.ebuild
index b1544129a51b..7f1f47669d98 100644
--- a/dev-games/godot/godot-4.0.3.ebuild
+++ b/dev-games/godot/godot-4.0.4.ebuild
@@ -74,7 +74,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
 	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
 	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
-	"${FILESDIR}"/${PN}-4.0.3-gcc13.patch
 )
 
 src_prepare() {
diff --git a/dev-games/godot/godot-4.1.ebuild b/dev-games/godot/godot-4.1.ebuild
deleted file mode 100644
index 865c25d1cbea..000000000000
--- a/dev-games/godot/godot-4.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz"
-S="${WORKDIR}/${P}-stable"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
-SLOT="4"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		vulkan? ( media-libs/vulkan-loader[X] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
-	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
-	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
-	"${FILESDIR}"/${P}-xkb-no-sowrap.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		use_sowrap=no
-
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_certs=no
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111 (for now, may revisit if more stable)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these, e.g. can pass -flto as-is
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9b623567b096..f44eb66343d0 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 4c713363c751..fe3b5313c015 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -2,6 +2,6 @@ DIST vala-0.56.7.tar.xz 3992100 BLAKE2B 09804dba1dcaaef2af2621f7ee6c5c69d0bb06c1
 DIST vala-0.56.8.tar.xz 3994328 BLAKE2B 4d68b102838a854b870865c6223dfb6cf56741db2cf918d393a4c279cc63a5e7af3464d256ef9a7c90eb5a8773812613315815c64a1b11e5b3fce86ac52278b6 SHA512 152a7378c42602296c5797d0425e51c2f9d2c65449f035158ef7f8dbf48f3a6a09e7c9028d196c967d8a9dfcdbd5f5deaa09ffcde5e2a335872e9740cd79ba41
 DIST vala-0.56.9.tar.xz 3996196 BLAKE2B 17b6df6c11c1f3a253ffd3650203b8dae8a1cf45ef708defe857ad642035ad05336deeb1b27a70e7bc620cba8d56d6c958b2016a4db5afdb3cc5108e014f9cc2 SHA512 933bd568477f7fd9465cd041f0b1959ccb55f4533196a272abb4bde811fda8c1e994c1035ad55bcdf7c066f97adcdc7a4f6dcb3270bfdd63b7d2ff1b214fc356
 EBUILD vala-0.56.7.ebuild 999 BLAKE2B 4a53efef87d29147dda03ac4f8e0fe1daefdf1c716b6c2112070f9b617ba6b85341678cc1258583a34bab49bed3773812c6ad835686bab7ca8385e11a6bd090b SHA512 cec6905a1b4967d3c7a3dd1c784b89393fa32e8473b0c123ab69a189882563c4489c6495db9fdeffdac09ab238dd6b57c90e2029f23ac3d87c6abeddd92ca807
-EBUILD vala-0.56.8.ebuild 1000 BLAKE2B 0c40c4fcb8b52657337e16985331f656948ddf458ac73c507df6115744d93e5c2175afb8decbeba08b8d01ad6f7a007678477d8d5a362c273fecbaf4b64a9e15 SHA512 14c69d5b9b75bf196dec2262b3595634972e1f9ee182cd0d283c93b062948073eb03f8d23cca4d13478f2454c39a40068ecce9be0b694125e272810cbfdd1f0c
+EBUILD vala-0.56.8.ebuild 999 BLAKE2B 4a53efef87d29147dda03ac4f8e0fe1daefdf1c716b6c2112070f9b617ba6b85341678cc1258583a34bab49bed3773812c6ad835686bab7ca8385e11a6bd090b SHA512 cec6905a1b4967d3c7a3dd1c784b89393fa32e8473b0c123ab69a189882563c4489c6495db9fdeffdac09ab238dd6b57c90e2029f23ac3d87c6abeddd92ca807
 EBUILD vala-0.56.9.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
 MISC metadata.xml 441 BLAKE2B a67ac153219c809b992ad569958248e09fe402e33526f2c9a8e5ef4908a5496a0018894605f2d649e191bb84db59294526bb14a06e59f4cfca335dcbf18e15f8 SHA512 97774503c4e5cbce834f11865cea98e45b244566373d8a7efca73d18346d425b49a3b96cda02a61484a8c906d9f27d735c2a9899701b95d0a5f62b9df12365f9
diff --git a/dev-lang/vala/vala-0.56.8.ebuild b/dev-lang/vala/vala-0.56.8.ebuild
index 804069eced5a..30f097c1a007 100644
--- a/dev-lang/vala/vala-0.56.8.ebuild
+++ b/dev-lang/vala/vala-0.56.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va
 
 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4aeb02653c4f..ed7c9476af3a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index cd4f7131c390..e3297827ad1e 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
-EBUILD libclc-17.0.0_pre20230722.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-17.0.0_rc1.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-18.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230722.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 117d489acdec..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 84aac45c99c6..6c2d7b8807b7 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -4,6 +4,6 @@ DIST libuv-1.45.0.tar.gz 1307245 BLAKE2B fcd9aad052cf641e5e974b1e3c47bef7968474f
 DIST libuv-1.46.0.tar.gz 1311065 BLAKE2B fd492b6ca873a08ad4df7561b9d83a09d9bd2cbc10c17265c02982a231edb5c6d71698aecc9a14d455ea230f9e791807f42561d8b3c96e37edb4a709860859b0 SHA512 e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a
 EBUILD libuv-1.44.2-r1.ebuild 1132 BLAKE2B 462d64f325ae12da881d7124038f6ada382f5a688222bb2d33d850b7f9004b29df10585eef22c2af61a996f3dd34577d2630e238367206394d9d5679f80efd93 SHA512 0d267c46d2df33bf8f273116c4b621819e19dc5b513c424532efb69f317c9b21d0831e1ab173ca5df5a3e640928726f580b50050d4519643be07c6ca9ace3cb7
 EBUILD libuv-1.45.0.ebuild 1153 BLAKE2B d58136a4794a0bcef8bbfdc79711d3e62349d26fd962476eb62f03f132c57088610f858a5e1a8369ead40ef1e8d9a9ea686bf91d95076d4a72c67c708a893fe5 SHA512 5b5294522131084de0ada306eaac10291e5a6c30fd774aa03d3e632f98cd80af0e839936656cdabec65562b8e82865494b91bd6f71ee6d88333e9966aa046ca0
-EBUILD libuv-1.46.0.ebuild 1147 BLAKE2B 466f931e5d13251d7d51de40087eaa8bc059bab67f32d807e87d5c506cb6302a7bae480f698556d67e90e376e87282db795fc57c911bf469ce7a9abcdfdefcbc SHA512 f9f58526b55266b2e48f7a3f07737cea08c7b7af2a7eb4b4de461094ca9cef442210902a6878120c627ae7f91ce88eeb2fe2e97be95eda4023a054bd392ceb81
+EBUILD libuv-1.46.0.ebuild 1146 BLAKE2B 95c16d240c5d743ad3980becae8e31985234dc90fa753efc17234a66aecd9da2056c359d5c9df4287be5bd5802c993ca264093d8fa0f1bc7542994b9fb684ac6 SHA512 30d67d9c40175fe7fb909626bfb23fada70836ab19fabe10ca1432d6841e7d6ac455f75ed37b38252e4bcd01b1ef01232b0aea5466601af990f519267f677955
 EBUILD libuv-9999.ebuild 1140 BLAKE2B a0e16164a1713792bfd186132f9d981d7554aabc5c5e57dcdbe66e1add0b0dcd60691dc8583a3fa4a952a9946f3a35bb16b94de08b6dc9a2179ecfb2d38c512a SHA512 28e1f90876c2880b7b450205d6441705c11c57c79eb93cc4a4291351a1fef8844a8d49a5877d4af623d61da278912c9019740cd391568203b443818c110d00a5
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.46.0.ebuild b/dev-libs/libuv/libuv-1.46.0.ebuild
index b160cd1a3262..83eda75426fa 100644
--- a/dev-libs/libuv/libuv-1.46.0.ebuild
+++ b/dev-libs/libuv/libuv-1.46.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index dfb11eedb893..b20b1b97c6e7 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 066bdabaf601..ead8803527d8 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.6.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-17.0.0_pre20230722.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-17.0.0_rc1.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230722.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.120.0.ebuild b/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.120.0.ebuild
index 2cb4a37719dc..25a68a7e9561 100644
--- a/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.120.0.ebuild
+++ b/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Accelerate Cookie::Baker's crush_cookie"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Cookie-Baker-XS/Manifest b/dev-perl/Cookie-Baker-XS/Manifest
index eae291880c3f..f1d5ed41136c 100644
--- a/dev-perl/Cookie-Baker-XS/Manifest
+++ b/dev-perl/Cookie-Baker-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Cookie-Baker-XS-0.11.tar.gz 56814 BLAKE2B a62fafe4c5ec0a789865737440c08769b66fd5de637806ffee6f39be3810db21ab141c37709f416e1a3e140b931d05df8296236ecbaa7b676d6481a83319f3d8 SHA512 01c75cb2bd9163cc2e27bf5343a9bc7c596158ca57f93437307ee3a0d991ecc5c1c24e26c3e2a1116e5685fc5b6aacf17d09f22bba99919acd3df55964be762f
 DIST Cookie-Baker-XS-0.12.tar.gz 57144 BLAKE2B b194b009257c8a05f76e7a1ac7a5a0505759dac123477805bf4853c2e6e5ccdcf13104aca8a4865a9f125dca135f9d831710cf28c01b22aeecff8ccaee5ee087 SHA512 ddcce708c8855d00c1cf900d140cb911da60d8928b3c459254ce1b85e006c07ba5bd5efcbde37ab38ad2c563bcbc30487f1c6ecbbb78d8fa273c7b35808d229e
 EBUILD Cookie-Baker-XS-0.110.0.ebuild 577 BLAKE2B e08b0c412bcedbe6661b8bd4e7bc86735115d8e9434b83fc2c4357dd77ee8dfa6495585bd73f135d2f3b7f44ef22e32787cadb84ace6f6708a1c448467dac43e SHA512 31896926a960e02b7a7d4dc957259a338f71d3fbc1e353df5773ac65089685f25708594d197f483deb9341476b9f5882fe3ce3908d135e5ea6ccd48e23f16a5a
-EBUILD Cookie-Baker-XS-0.120.0.ebuild 463 BLAKE2B 6607e0964ed0d414998b9005263b3b24a1f6d28bc4c1f9910be0ba7e1e55e78da49953ddc2c2ac08f7a38db0dd91ca0d23f64dfdaff0db97216fb23045f447d8 SHA512 452d43be8c8024420afe52fbe8b13e016b6fc72efbdeb7a25685136f0be38f1ee2839c41b79b9f682df5f9dd7c98121fa0bba0f89d9b67317b43ca3405ca1951
+EBUILD Cookie-Baker-XS-0.120.0.ebuild 462 BLAKE2B cc687944b4b3652375037e6ee53dd6ef9a174531d7f879fe984866c17362931eca8b30fff57183f058014dd7a63e78b37dcf4c1295f9262669a265db60768399 SHA512 746aa9cdf2352036759672989b991b54c76bc1bf8c41ef629770d5fd0838ce19e56e6aa603b19011a5e44cbcb0c72df19d09ce731e9ea90dad92af0ba95ca037
 MISC metadata.xml 404 BLAKE2B 9cc838ecef3c4468c0c8e2270805ca077a62bb22914646d199113fe9478d3053c166a6d69a8b6a5641ae7743513c8ff57eecf53d5d200002365d6c05cba4b1a1 SHA512 769574029f70eab3a831993b3d1e50fac7fd1bcacc8881295036a3f0a93067480296bbf91efa0c05d579cc9107aa01de6943ae327f10d839338e18960024082a
diff --git a/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.260.0.ebuild b/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.260.0.ebuild
index 59852253c46d..081c479598cc 100644
--- a/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.260.0.ebuild
+++ b/dev-perl/HTML-Selector-XPath/HTML-Selector-XPath-0.260.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="CSS Selector to XPath compiler"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/HTML-Selector-XPath/Manifest b/dev-perl/HTML-Selector-XPath/Manifest
index a711e9f4aa12..9608fb5880b4 100644
--- a/dev-perl/HTML-Selector-XPath/Manifest
+++ b/dev-perl/HTML-Selector-XPath/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Selector-XPath-0.25.tar.gz 32420 BLAKE2B 81eee33c711b1b4a6f6dd7d05baa916bc0c559ffb5ef16d93d24c72289a22ee6cc8d4d3222d7f930d197aa9be4d000ec2d1f7cb355fe52b5e0cb0e81a0843d52 SHA512 91430ae4898908c65ee2c527fd589fed16ac2699af028a51949c6fe2a7c84552dfdd370ad35a0fea4564914b1799b65efbf7025ace0fd9aa06e47081ce9b3bc8
 DIST HTML-Selector-XPath-0.26.tar.gz 32482 BLAKE2B f768f33ae378df35b7d9b6a71e00c501c848f67200b559d5a1a78d550e7e5b5258fc5cd9a5eb41d9c21eff5aa16d6e479be5f4de4c549c9e5d1c21f0282c5615 SHA512 d0f706b61e6676e9e32f8aa81ba126c46df3a5163f40de977058efd220bfeb374fbbfb56df589454543383b5d6be6f851faa968d38512cfa7ea76050411baab9
 EBUILD HTML-Selector-XPath-0.250.0.ebuild 443 BLAKE2B f8197eb9b6553a645f046ec7446f8f844f435a7ca1a40de1a965dc85d7a683f62431cd295cbc95811bf428c1dacc4deb113e453ba661a98981996d6e56709fc1 SHA512 6fbf5c106fc52070e7b0039d8b6020eca42bad5bc50fabe2b1e08f75647e1324beed32e05aa8788c447af8f45417f535537807f30ceec5e44dfcc92a8831201b
-EBUILD HTML-Selector-XPath-0.260.0.ebuild 480 BLAKE2B 59024c52fb8ae339bceefb2f576deb55bc31c37c15a565e9af427c0fb13aafbf342fa477fb3687368766df8bf9a8c383e2335188379730d51534498878dc6ded SHA512 be93242f218e00c7c018b1d1fc76899bd1fb0605c69cfee0779e9814d34d5467fb384decf976dbb0b951393e3c0ae708c7a1f289c69f434298581b6f799c98c2
+EBUILD HTML-Selector-XPath-0.260.0.ebuild 479 BLAKE2B 74e2a8d7c68189f1256160fe69cf8e59308bcbf2fc997c8d7f1ce85bcb200c1ee63c1614e717a9040cb77aeafe2f5887614f769ce6060af58fa7a4ef1dea01a7 SHA512 097b741d442a306b9735dc47d9ae46f44f0e7710827c59d9e793323c9bac955e7e28199e41797e79e92f1d542081fb15485335b7929427adbfa5eb0b98ee751c
 MISC metadata.xml 480 BLAKE2B 4b178c37f6db69f89323aa94197506f680b9d7ad89195e95bd3fc3861a638f0e1db17323c72c1a4c225b2924283aa36cad3b1b02e633915e96dd239bb4574731 SHA512 66cd0fbc3630ba3546a96f7566782b2747932dc8c74c693dd9c6ada1a567b83520d8c77f388a86c827526c9a0dba0696ef52656345fe2c0d95a94ee7657f463f
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index f1a1c6c376b9..98085c5acd2f 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Text-CSV_XS/Manifest b/dev-perl/Text-CSV_XS/Manifest
index 045a00a236be..1ad1f995f2a1 100644
--- a/dev-perl/Text-CSV_XS/Manifest
+++ b/dev-perl/Text-CSV_XS/Manifest
@@ -1,5 +1,5 @@
 DIST Text-CSV_XS-1.46.tgz 256628 BLAKE2B 6a2afe8b36eeb758ae856fbf3939d4628dd2d22cc55689efdb467f9e94bbaaefd6d2ef00989f4e0ae8ba07ab469bc4cb6a9c1d78adfa497d4b062b5ce385a0e5 SHA512 f02b262c6f7ae8c67acd9ace057d049d25e017e2662819c060af511ff18bf729f7de767ece295f66d2944f9592d1cb8a6b4ef9c134a5b943880d76f74a5c86ce
 DIST Text-CSV_XS-1.50.tgz 266660 BLAKE2B a2bbd69b587cb388f2841bd9843e3700359e84b76f336384bbca506864ac3f44e2048d439c3e53486efaf683862619862c7673bab23424864316883c72360a23 SHA512 5b8b7a9911744dc1d244591aba89c4089a6a19333b629b8f92a637d31d7c9f6a7449d3a4e89d86b55330251bff87c1db85bda39ad1c42f2defedf4f8d03b06f4
 EBUILD Text-CSV_XS-1.460.0.ebuild 638 BLAKE2B e4ff0cba0a1f0848e9c1bf1be4427d44bd8b277d7216250a2f026f286edff5fc57458af00f38e002bf019c71b9b76a1ba497ee65dba1f1cf5e0d08135cad03cc SHA512 57ee5bf6ff47019b76b4d0f905f5b12570a6ecc9f302af22d0d904898caf7244a42694d76302727198ade05a606a1d214b7ed924931f7084d24ca35efd9e8712
-EBUILD Text-CSV_XS-1.500.0.ebuild 641 BLAKE2B 5ed8a8ac2cfb680eb65c7cd0b9c464a428ff4481286ad21bad74e169d28cfed6375b86cf64c96036a7666ce0a4b9712054e5006f1724ec2c2456dc97031466e9 SHA512 82a8147edcab4692e5de35039391c84f8366af748a9fe9faee60ea8fb1cc3f576c7d0b2e84d260dec10382856c2bd7912acc279ae54f55a565e90cf967e98478
+EBUILD Text-CSV_XS-1.500.0.ebuild 640 BLAKE2B eb6e4f456b30fd63997525bc9f21149f4c9a44d5f87086b0233a74350ff2cdbf833330f098ae6d4ae4e84890d6372241e6a414e6f7f14580e0641490acdcfc69 SHA512 3f1e5d6e33ef918b5cf9a0ba6006bd1c0f45f32203673a272d266732ff7f7a03316fa8ce16a7567d02498ec5eba60d50ff24c6ddf2bc639a5e335f32ca75bd6c
 MISC metadata.xml 395 BLAKE2B 49dc62f04f2a8c00c686bc25147ef9164388beb74db90b44cc194ad5d29aa8207a7dc46b86b05735999bdc02ef9ddeb0c6c4d8fe0e5c59a2c3a25d890a65b636 SHA512 168391688b7286299452a4c62e8ffed7520711d800ce5f247d1aeaba649803c7bc994e92f3929a544afa2e742e61507c5e698bd770e4a308577bdb853e73a11e
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.500.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.500.0.ebuild
index 48179ff8d15b..e115e8f4e654 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.500.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.500.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 07f9fa24b798..0d1fbf749fd4 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 7f809c3b9b50..2771b07e5b97 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
 EBUILD clang-python-17.0.0.9999.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
-EBUILD clang-python-17.0.0_pre20230722.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-17.0.0_rc1.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-18.0.0.9999.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230722.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 0b4b598d92ff..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/jaraco-env/Manifest b/dev-python/jaraco-env/Manifest
index 3f258c16e66e..3c04cbf0b9c1 100644
--- a/dev-python/jaraco-env/Manifest
+++ b/dev-python/jaraco-env/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.env-1.0.0.tar.gz 6664 BLAKE2B c5559444d386fe34d6f639795f9adb68bc750452a7a3b2360971b07bc9876921466e6da9ff1f2d1891910c94891759de8550af0c4f9da311ae7443bfc7c3bdf1 SHA512 67879bd531bb1056bab0dfa47f92a7257e184b8db2a9bf3d588460070401e76e884cf3134ee4c01a6c517d48a0e111fec3a4759d305ee7608797816b27d33473
-EBUILD jaraco-env-1.0.0.ebuild 579 BLAKE2B f5f550a05c1fb3b826fee733876b900c940195882c7be93f2395b9f1042771813de360116b443193cb441e36cc44071aef1d2bb72e917a06ec9fdf5be928df8c SHA512 0ed4d421e14dca134e8d292f81e45f4b9313f0ea44647ba142207370cc4099d4ee40e7bccfb020ac391a190d2c8f019d8af48c6abdff4d104664e6844d68b0a5
+EBUILD jaraco-env-1.0.0.ebuild 585 BLAKE2B f60941d04b06144be8d3b4404c88fd47b3a8df6fd56b00f52a956837d4f639a748b7b8e96029041265e717e8dc7d79dd22fa3017dd245d1e83fb73566c204f6c SHA512 4aeda00079bd62ca46d2ce661a572b3dd7387f64b671df79a7f1c0b969a7fa1c43e064bca051057154ff98ecc1e6e17d20f71242f4f8c7b7301c87bdca91bb69
 MISC metadata.xml 460 BLAKE2B 13df19da03eef0a09ca1e4d70ebb30a8457d3fdba778a69779467c9830089f49203eb08ac4223533e1596e339adeefb02d9353b4298fc8d5b77d590371cfa44c SHA512 0b4c61f9e43910fc959a60af3c8f86356bab890f21c93da84687a1345e39fc5def993ea78934c4cc296491e6259095c3d532a19db6f903702d4a864611e27804
diff --git a/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
index c5e6951b0472..ac36942d88d8 100644
--- a/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
+++ b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 993d7569b1ac..5484b006b4ab 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
 EBUILD lit-17.0.0.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
-EBUILD lit-17.0.0_pre20230722.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-17.0.0_rc1.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-18.0.0.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-17.0.0_pre20230722.ebuild b/dev-python/lit/lit-17.0.0_pre20230722.ebuild
deleted file mode 100644
index a1f25977a11a..000000000000
--- a/dev-python/lit/lit-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 97a4bc67bc28..62060896e46d 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,5 @@
 DIST pip-run-10.2.0.tar.gz 33523 BLAKE2B 7d19c089da98dbba2faec969f490fcd5ea48881f4ccbbfaa283465ef083521aee7d82b9de8b03a89ec8b08005db1232cd9577030cb98c111b4a0e0f7294cca84 SHA512 b26a00c6ebd8e9e505e6b218fea7070b23b5926de44e1d5a762abb2a4ebd62b1bdda7e19c4092012daf068b518a2e127ab08099f6d1a7ddc643b3ba5bf999ed0
 DIST pip-run-12.1.0.tar.gz 34387 BLAKE2B 306dce020589a0cdcaddc70baf75a41621c72a450af58a2f54c5128f8210b02f4ee2b4df5b8bca1e0617ef53e79ab89969765b053801dc4f9d60bddf7c40e76e SHA512 fa1c36b6b5befada7b54841723f9cd7ef6289bb723b46cbe000ccfc7a6e894181fbf58f472330830e5812aab8feb40dab8708cd82532696e510bd56ab0b70a20
 EBUILD pip-run-10.2.0.ebuild 1418 BLAKE2B 31ea88eff01d38dca9a2c12a727f4c7ffeeeb88f780831a43b27ae3310c5f9b29da23e337fd9ee1050c09e38c612fbcb34875d9dc21aa13bd92018c23096e7bf SHA512 83203da0063c82eabb1889140e4f35427f47e94f3f87cf4272fddc1a7a0d241910102da7082669cb8de4e709cc5764e27512b686443464daa26fefbc6097f7b0
-EBUILD pip-run-12.1.0.ebuild 1454 BLAKE2B 2c86e9c51e9097cd7996d507b180dd8738105ed132110c8036d147d168eea52d920a58ddf33ee620f09fffd44693b9eb85f70350a3aa512b0fc51118882812df SHA512 4611c33b005159cb7feca79ebcbc92f5f67267ce918041879822d3f679e38047056dc1e2ec244e1fde42157ead9cd8dbf655f5117111a1f0e75ffe28447c158e
+EBUILD pip-run-12.1.0.ebuild 1460 BLAKE2B df8ac20cae912fab39bacb7fa9558dd85249c08378abc9b59544ac5b4c88da9907172e2f0e4f9f30d035f4d0c4b15d3a6045d79ac13ea9ee2ae572402ebf9aca SHA512 6810f910108504e6919963a29a0aad82b9ba21ec20c92d9d256fac5255f8b37f716d0634b5703e397469c4ed9717bdc68178c8353a9630bba57efe377b3c9144
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-12.1.0.ebuild b/dev-python/pip-run/pip-run-12.1.0.ebuild
index bc915ca92d84..602660eb1b51 100644
--- a/dev-python/pip-run/pip-run-12.1.0.ebuild
+++ b/dev-python/pip-run/pip-run-12.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index f2e087cbee79..6559ce1fc852 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,3 @@
 DIST mongo-python-driver-4.4.1.gh.tar.gz 1461820 BLAKE2B 42b2f5663bbc632205ebc1e979c6434122d797043cc545b3ff5b02956acd4d8d2b3a6b4a0308ca041fbb82aa3f530b305f4d21d42954c15b0c3ace3da6e1efd8 SHA512 fbdc6bd60eefbd554cadbea2173340e89e3cbec3377c97a592789750bb86ec68818d40f43b020c68023ff6c415bb4ceb36e7fb169d72b3e9c218880c6bfaf339
-EBUILD pymongo-4.4.1.ebuild 3118 BLAKE2B 67bf67f510316cdda15b0cf3806d1a4c4691e08e214a8d971b14250253fd1195e1552ff19d42106d80cbe5596b6b89f5ea217151b97f813e52d5e9468ed27c89 SHA512 ec0cad3e4d065f3d7bfbee1b274afb5278fa52e6e933a4fd8de4872ab987c7e5949e30ba46af54e32c090cc829095aa5b5d0d25dee6cccff16bee3aa72c7b4c0
+EBUILD pymongo-4.4.1.ebuild 3145 BLAKE2B f0d3704a40d5b6dffefc47ffbfbad6e1777bd0c689577fd98ce227159087bcf7903bcee01b4ef19a4b3f892f2e4ccb6bc1dc9a5068117af80c2c25a1d4c81760 SHA512 b97b3b77d967032ec4240342d5a6262273175bf8fd03ab916bbca0a6a6917856fe393221eaeb94168052eca267a3c849d2d80d8dffc30cc420b021fb7f1ebf3c
 MISC metadata.xml 806 BLAKE2B 536379dc753a1e4dcd787d3e00936e0a047e61388f3c9a843a6cf9bece4a2b39e3914cc600cfe9bf8dd3c44cfe44ef5961d66f2aca1e9a4cd1da9c93533f2349 SHA512 c74e54c17e7abe70b0155c17e85493f37da0a2b66d50099e05a5588680f20ad27c46682804a7db117dfdffa6e15abb78e1957587b881029a9c29c86cee890b22
diff --git a/dev-python/pymongo/pymongo-4.4.1.ebuild b/dev-python/pymongo/pymongo-4.4.1.ebuild
index a371ef783deb..a543900a9665 100644
--- a/dev-python/pymongo/pymongo-4.4.1.ebuild
+++ b/dev-python/pymongo/pymongo-4.4.1.ebuild
@@ -31,8 +31,10 @@ RDEPEND="
 	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 BDEPEND="
-	test-full? (
-		>=dev-db/mongodb-2.6.0
+	test? (
+		test-full? (
+			>=dev-db/mongodb-2.6.0
+		)
 	)
 "
 
@@ -40,7 +42,7 @@ distutils_enable_sphinx doc
 distutils_enable_tests unittest
 
 reqcheck() {
-	if use test-full; then
+	if use test && use test-full; then
 		# During the tests, database size reaches 1.5G.
 		local CHECKREQS_DISK_BUILD=1536M
 
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 866384a89956..893bd20e8d62 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,11 +1,7 @@
-DIST rapidfuzz-3.0.0.tar.gz 1230857 BLAKE2B b15bcca17288cc428b485b0c6e1d322027eee5c8c0261b7f0240e4f5908ff2d53e05124855213a1923d96ec7537b75263c17f220bfaf792ab92f2f455d761027 SHA512 bafdb6045baa78154026dc0eb2498eb0031f03c36e8b17a9219d6e0c55041a9b6c164f4fcc0523480903fece0ab4e2e50a8f969a52b6934fcfbad80d8eadba25
-DIST rapidfuzz-3.1.0.tar.gz 1251075 BLAKE2B 3a9e3dd4105910ad393efe795c4b7fe603f77ba922a6fa30a7b31f2f14a708651490c1afccbc9a5f217a348a8c20f779172a600331be51298ef746b0ade819ea SHA512 ff583a7b87d64b3b00d785533af3ba76d1ffa5dbc65111f4b72c2e7d84a43fe149e2f5546c6af130617e58e35556a7b2143ff6ed24dcf199d24b81ff7b46abc0
 DIST rapidfuzz-3.1.1.tar.gz 1279245 BLAKE2B bd3fa008a29fa9d7c2af8708d498e1b6f4497bf23c42d3692a9d5e61ab605b4511fe26213f405cd6b1a9531f106664577fb741eac1da0a8b70c5ef7b2879b3f8 SHA512 d83e07fd3a0b3085e6b93ddf53207110ae329241c23091c561f07fbcabf630a291c4fda3c5bd2baf91d80f5426ac0cdaeda92e87b617214594bfb67b787b85db
 DIST rapidfuzz-3.1.2.tar.gz 1280133 BLAKE2B 5f1d3175bc5ded1900f31c73d0e9fdfd6035533abf3cc9a12be3ba41edd424cb816505d4f82ff2bb4f0a825c53259c3cf1af33cd6b6234680ab93fb5232c91a4 SHA512 462b7b029027a2677ff927285cf614a6b2a6690af622f093633eec1390f0399b70f4240461db493aa9b30a2043f91b44fbbfa8e4bfb65af953516168c2b31409
 DIST rapidfuzz-3.2.0.tar.gz 1472554 BLAKE2B 7946f6139aec1ca9ccc623750bd09601e04171f3030bb7cfeac5cedf9ec1a639c444e9fd3394efde199e447a6834dce46be20dfb8be33232a324e4dea23b9cf1 SHA512 0ea0ecc62e2493519a302edd090521ed7efeae35e73812aeadaca2e2369362b57b1a095a09296edfa8db07b6bf58de4451dc71e96e6c215ebbe96dc1f8e7e995
-EBUILD rapidfuzz-3.0.0-r1.ebuild 1168 BLAKE2B 510f0e415ec6c886f7cfa4dc3ac2d78b5008b4111cce5907f6a22f94726bb8365309b18bad0e3831d869e8ebc8086dc0354b0c1dd21ed15d95cc239bc28e9cd1 SHA512 a5b067eefb891edf64b3d7e1fb9e863fc04d872778b9f04d278a32bb053f1a94fc3c34d66570ddfc3f906999f7015deaa875d884e387cdd2f20422f15d4bcd99
-EBUILD rapidfuzz-3.1.0.ebuild 1149 BLAKE2B d256c05e700c031092ff32c95f6fdb2cac97f3ac92e81c4a42ad3957fc568a44f5dfb54a909278e51ca3315a2f77d87a4d4e0edd6b3914b790de7ef22785a261 SHA512 cd23ffb6281d2ad276d2b2c642b08ed91ceb508e2d32f24e0eafd2d1e898615fd4e85e09e2a429bab351d83aef63f84c658ceea54f742dfe921bdf0055967e14
-EBUILD rapidfuzz-3.1.1.ebuild 1143 BLAKE2B 1a170ee444ba0408d0ec7d0eecec071d6f5b35075a1067d8e6694b06af40b249a68079639e4b7566b5a0789665e38016c558d98bfac54d678e3b5079df24eb2d SHA512 71428d31abece35eb1bf68c4a248577ba25999c1ce0ad56927ede86004ec0f172d886c1dab5c9d4de35e25110a4026252e026fbae62bf31e2bfe67dabc807a99
+EBUILD rapidfuzz-3.1.1.ebuild 1142 BLAKE2B 0cb525c175276c64fdb4c65fa76b6fcd5685c874f6b3334f642dce292ca38b72e11d4a811edf7a9a28462c5f17a8e97dc18c742a85f10d7bff6abbb0363e5722 SHA512 2e80125c6b3602ac24e5f6da0e33b22deed25e4b0b790c875a1d9a58921469c5ec40cc25c3a1239a50509d86c9ef2377297b7f453c02db0a35460becceb5c0d6
 EBUILD rapidfuzz-3.1.2.ebuild 1212 BLAKE2B 5e501dca9b7e9d45d5ea7ab67db89e97cf4f32293c78d1604dbc207c375dc300514ce5a273ceee692f7fc3605406a9ccb44a8f20c19eb4e657f980c0508bcf07 SHA512 f6a0072b6ba8ae0f698a159fbdcdbd1fdd902b0b7406c7647d7637920fcfa98d926413e1c97d53f28b10d9d7f83b1a148dee4d16a7619b6a5cf4fe4faad2f7a6
 EBUILD rapidfuzz-3.2.0.ebuild 1212 BLAKE2B 5e501dca9b7e9d45d5ea7ab67db89e97cf4f32293c78d1604dbc207c375dc300514ce5a273ceee692f7fc3605406a9ccb44a8f20c19eb4e657f980c0508bcf07 SHA512 f6a0072b6ba8ae0f698a159fbdcdbd1fdd902b0b7406c7647d7637920fcfa98d926413e1c97d53f28b10d9d7f83b1a148dee4d16a7619b6a5cf4fe4faad2f7a6
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.0.0-r1.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.0.0-r1.ebuild
deleted file mode 100644
index b2695b5ca7cd..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	<dev-cpp/rapidfuzz-cpp-2
-	>=dev-cpp/rapidfuzz-cpp-1.11.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-	# remove bundled libraries
-	rm -r extern || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.1.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.1.0.ebuild
deleted file mode 100644
index 865d71a0d742..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-3.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/rapidfuzz-cpp-2.0.0
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-	# remove bundled libraries
-	rm -r extern || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.1.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.1.1.ebuild
index a0b6950331b3..b0c5165ad4fa 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.1.1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bf9975105829..f83c92f3805d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 4dfda9274ad4..bb9ddc45a6a8 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -2,8 +2,10 @@ DIST sus-0.20.3.tar.gz 28845 BLAKE2B d10b142dd9d7ef44a453746f859a7d4a66eacd09ea1
 DIST sus-0.21.0.tar.gz 29581 BLAKE2B c39102c006b1fdfec6f40ef7eaa973a0cd5039b73402c8c5ff9234a0c06131c24550070fd04d59dd8706edbd08d46604e943f9b69e071dd29eefda103a1a6d1f SHA512 1fdbcbe814411a0ff3b9ebc72143f64fc76dbe11faea915e9d46bda786da9837e62a5a3070ceb6f28ac6bfe2c4fc8646de865efbc679abe80ee2a7abe327c007
 DIST sus-0.21.1.tar.gz 29580 BLAKE2B 9a30950b4ad9da13af48c50a96951ba9f9cace97fac3a603de5acfe489dc8c8d4581b064f2452c9bf5da96da4db8f488df42f89a2113dd924c8ba8fcf8fd9230 SHA512 73db74f791f47a898840db65cf9c2f98b92f3d2a5319828f26dc55c8aef8e0932060c1075f5010b3c2b887891c1467a3828728f78a84297725d851966093ce9e
 DIST sus-0.21.2.tar.gz 30329 BLAKE2B ea0e9d4ffc994ce0370abbde8d68de668457f90e5f53e0c80e1aa146a28754782590eee7e53dc6373fe17b8816e481b82c5d97c4b2a39829a8a9a5a58faa42ba SHA512 eeced196ffc0871474495fb1afd8aa25f36a1881bad303447499a9b6c19ed94241896256563a4f61e9f7e1b32b8ed5e52e83f5c414c64002e283e81f1fc28b06
+DIST sus-0.22.2.tar.gz 30822 BLAKE2B 483a1e7e48f075e07c549bab9c1ee71ea7cf815ee4f950cb4b0487a5f923a7f509a6354567dd9026936908eb5f9c2c224ff55bedb5a9e300d52a100ff766349f SHA512 e4ee140be1b70947b92983f914a8c8b6c24ab20fa238c26558522fa6b12dd8f63f0842fbc770e8a9378e6a2dcb735504de12305436af100ba9e147869510eadd
 EBUILD sus-0.20.3.ebuild 841 BLAKE2B b434aaf09a256d2432d24b439df9fc2116519c4f3a82d0e99491e208a0a39818d916b0b7e4414eaba9a0edbed60585e02469496f0d240424da909c09e13e4dd8 SHA512 7d7f11f1799fca275b4f957d2570fee153ae01b8bf871d93a158511bd3c15a03802b6058994b4cb53cea1e0a63901e51f42fa5db2b9c554dd9fce4075c179de5
 EBUILD sus-0.21.0.ebuild 835 BLAKE2B 53b841f3f72e29c3bdf6fe876e7a3fa9e33af958f7888473d0a09dde876910ff08583f044385c0f65796f4fec46b4ee75a5e307535fe88634d611c4de354472f SHA512 b61b6a5611d954fbf6646d61c8b869be7012b755558ac7ef217d5849dc7ba6a863bdb8c33fa2f7580976a1c60170ddfe6033fd834a7eedf40e1472c1348355f0
 EBUILD sus-0.21.1.ebuild 834 BLAKE2B ff1b9bcf310292ebdfcdae11eab6952a53aedfde44e60d9df72815c51702788927c21c344e5cf1a7ccbaacc4663576d8992a38ce9418dc9f39e94fa872cc3d9f SHA512 d5d62f380659cf9373221a69f6a6ae83f8a798e7a0478c55d1a2d1cba4eb8c6bc4a3174d5bbab836c7e03d78ca342b857bbd565bf2671b68ae1c8352580e79a3
 EBUILD sus-0.21.2.ebuild 835 BLAKE2B 53b841f3f72e29c3bdf6fe876e7a3fa9e33af958f7888473d0a09dde876910ff08583f044385c0f65796f4fec46b4ee75a5e307535fe88634d611c4de354472f SHA512 b61b6a5611d954fbf6646d61c8b869be7012b755558ac7ef217d5849dc7ba6a863bdb8c33fa2f7580976a1c60170ddfe6033fd834a7eedf40e1472c1348355f0
+EBUILD sus-0.22.2.ebuild 835 BLAKE2B 53b841f3f72e29c3bdf6fe876e7a3fa9e33af958f7888473d0a09dde876910ff08583f044385c0f65796f4fec46b4ee75a5e307535fe88634d611c4de354472f SHA512 b61b6a5611d954fbf6646d61c8b869be7012b755558ac7ef217d5849dc7ba6a863bdb8c33fa2f7580976a1c60170ddfe6033fd834a7eedf40e1472c1348355f0
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.22.2.ebuild b/dev-ruby/sus/sus-0.22.2.ebuild
new file mode 100644
index 000000000000..47dc10e077b5
--- /dev/null
+++ b/dev-ruby/sus/sus-0.22.2.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="ruby30 ruby31 ruby32"
+
+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/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index 42431cfeaf65..25ae29c5340d 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,4 +1,6 @@
 AUX websocket-driver-0.7.5-ruby32.patch 4305 BLAKE2B ba2a2142b496178381b4e568f2062422e802115f3fecee907d148829950e7e085aeb51083eb9a1e9376319582275a877193345b1238d26a070fed856576993ea SHA512 81013e4f3553272eb6ecd15e6c5ac55e7237076342c1e392ee37f55dc81bb2064612aa0a576498571e766d338b580bdc6c615efbaa71a197192106f515f0f78d
 DIST websocket-driver-0.7.5.tar.gz 26179 BLAKE2B 8e7739d6cf48de5a2ef443f476652af74b269c075aa1e6bc13b2ac3ac17ede1699594a9380a137b307eaaed19ac2868b6a1362a66f835262f18e82f81c8e445f SHA512 538c78cd39507fb6cddeaa6196f0e2bbb89d7293f062d9b0231b6c6988a46b718c91b69a50b4cbf5b227067e6ed4ee89c61759bf340fc3e483c4af97052d42f9
+DIST websocket-driver-0.7.6.tar.gz 26332 BLAKE2B e8da76846b519603f7eef9cef53afdff3d48176cba21de1ce6b17e3718dd33b8309aaca721d4d11480e34e04b1ed2bfbb8892af507fbc72c1ff846c800f46499 SHA512 5444a0748821ab651e9e5ed40fd737c9af50eca1f8046b3110ab436bb8c0c56250ee8a8e762ae1668249d9ebfa2712b52802950529a949aba2574ffc66c1c58a
 EBUILD websocket-driver-0.7.5-r1.ebuild 876 BLAKE2B b5b3bd2f5e92ea08dfc2a1b81b7c9813179e5eea156ecf8698775e2df67bfff7bca36d40b6328c0f1a61b595bcb4c1001c804e6feddf7720eed019f15e990551 SHA512 f9649e38e12c45e312c864cce585d579fe63f602f0cdc32385c7a28bddeadb0c5dfa6f7899222dfe1695391e92d7c0e2e241cee786185083c866361ff5af5f9e
+EBUILD websocket-driver-0.7.6.ebuild 823 BLAKE2B 42711453bf33dae58cb7d358cddac263e47eac1fa97418145be7bd13ec12cf4dff7755cd328e40b39cd60fef9b83382f0c603822dee3c7afb31b1d8d00d8874b SHA512 02a71693689ce2d8afefb1c6c8bb255e82e167b5074626dea31bcdbd75e9b9acf60183166c84566d9b04f67c914ed688cf4b69e0ca77b29cd0933b6e61c0efea
 MISC metadata.xml 353 BLAKE2B 6d6cd2bb65746c1d9bcd4ef50619b7005445623a728503bc4a5e99d38cd82a205c3ecf38e8ef4db9c1767d0b3376cf25f0d76c40b00c511c4926beb9648c5d91 SHA512 614b428fb42838fe85b90f37bb24bcffee597e90748b2da88b94098e8f96238a244fb00ddd7913ba414cb50817c0fa36438bfe7d05344a4d771e9d622594982a
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild
new file mode 100644
index 000000000000..ab4fb2bdf58a
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
+SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 9d39ce7d837d..a71778b9aed6 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,5 @@
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
+DIST xmlrpc-0.3.3.tar.gz 35499 BLAKE2B 4a7ce19c9e3c656cd68cfdb3801ad2997f6de7ff2415be583c4a976f191f1775597467b1eb101ddfe9ec7a67a738ec81ada60fa4082849b8bdf16c9b8a82d9f7 SHA512 4f9872d820ba87f04b6f7ccfd0646397d19361d27f6c3103963b274eb71668f038596a66e99e2379d2bb0f636d5f6b7f34adc57289e537efa702a116b45c7644
 EBUILD xmlrpc-0.3.2-r1.ebuild 931 BLAKE2B f64d01876662ab3be7bb1bc06c9c26de554f4f0f404fbfc6040559969950da6e32bbf797e03cce8cd30a6fe9c1bae2d4a26c2d2ff8f0baad6977c00c6f30b035 SHA512 a31fe0b26b1ac6d0ba6d52cf5d2ac8d5516132679e55b239ee2b380e3b8de0f8af5c3c7d041096852049447d0ffb2316b918687f41190a510956e4825e02a1ea
+EBUILD xmlrpc-0.3.3.ebuild 932 BLAKE2B 28957b1f5a34d472645fe546c74f67f81a7ab986b95aa7a9a2fdcac07434b62df562f55d3ac085d1bfdf0f07ddd96bdfbcb9246588cc2825bbcfe1d6a8e3e14c SHA512 5929a3f9040da08f0a90107020972b0fec0754223bbd999670c7f2b3a5728f8891bd23deca95c72ae9ce2ec69e373b015c49a11a522385dffc3cec4113ca4f48
 MISC metadata.xml 338 BLAKE2B 71a438aadd85d67a6e64437e330a9a58458c5a5999aeceeb7cc4db5d14472c5572d642f0a127c3b19a0c6a002f56de58f96b8ed9285b80703e9aad146763ddba SHA512 a14b96828c27fd202324dca423fb2f733e6a6a19d9f6c9ab8807bba60a75c75056559b6a11117f850fd9f8de3521d2ca180437f855cf4958a829c44c685fc2dc
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
new file mode 100644
index 000000000000..1f4f0554da25
--- /dev/null
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
+HOMEPAGE="https://github.com/ruby/xmlrpc"
+SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/webrick"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index d9d5331674eb..5ca960693800 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,6 +1,8 @@
+DIST zeitwerk-2.6.11.tar.gz 127029 BLAKE2B 7d810c1b6087522757e60ed0d70fe73dc8633474769992a9b9864a4437a44b482e804f8a7d10c1bc54395054539e80e98be926f31025a7abde5016df87636622 SHA512 6fb2fcf158497f7c11b8edc815a4ac4318d9794c9c76af9a6bed969cee3192f552624c9dfcde8147aafbdf6a754e6715523721d91eb219174f9b768ef4688431
 DIST zeitwerk-2.6.6.tar.gz 121370 BLAKE2B af3d8d02e3547ae35e6efdda82c50676dcfbb60ddc07710116e6da8e56c63dadec4ec0526fd9e0da4ebcde91de1be6faf0308ef10fcae01b4d9362768fd1dc7c SHA512 1e3cf2961f06d9409cb9992126da298c2f183b73660357301a60dc9b3d1c649701b5d886185b38a233a94a1757d13e684e012d569af1bd5935ccca413bdbc745
 DIST zeitwerk-2.6.7.tar.gz 122658 BLAKE2B 7435f8fb117be8186d56262c0aa8832132105d065cfdd470ed293e9530aa282edd824593f28199b908476a47f90507158beb216b803d39fdaa956d32ffa072ea SHA512 666f527771bc10d34b05a8f27996a9a7adf89466c54fd30a174a1e2e6df2500a2a658e08505964644d25ebd11ed13bf3f741724bfc9fd2a189c3e7b3ce24ffc0
 DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
+EBUILD zeitwerk-2.6.11.ebuild 1081 BLAKE2B 909565ce0f3379671c75c41c10c41e2cd71f63888d883bffa68e59d52fff64cafbe322ccd6f727c6b1309d552a9cc02148c731de0883d9ac712bc29908939b72 SHA512 a07b6d393fbab88b0e6e2bdb2e16bf85db3f1873776a3377a3b48447c651a9fcf89a59e2a8ced926e0a607986378c7a9684bfc0020205bdd8a255778cc458c6c
 EBUILD zeitwerk-2.6.6.ebuild 908 BLAKE2B df2ad75d252cfbd3234570b9c9c6bff9fdad6e5138cf899340f96537d059a335a1c6574e2b46a85fb399201db2d010df3062257c697a614dce40f41925141523 SHA512 08c9160d7a3b74d1bab2af1adae004ada6abaefda5fdb0d6bbad8a2101f86335855f1d676bad0df3a03c7dac9ae25aa56dd906f5b022429288defa17c2a1e9b6
 EBUILD zeitwerk-2.6.7.ebuild 1081 BLAKE2B d4168c85ed2db2e903105327568905ff3b3cae119604355b70d029844de48ca03d01b961cce4e5bfe32fc60a22113ae5da9a8f1a82e2376b4969a5802d0d0175 SHA512 459a0b81827bae44a2a02da8d68f51c9b2ccc8ed4f1ce233ac03f51305485bb33201d42f5144f643fcfba8cdea7ece5d96472f3139d1c3d1f4cf6677f40b1b0c
 EBUILD zeitwerk-2.6.8.ebuild 1081 BLAKE2B 909565ce0f3379671c75c41c10c41e2cd71f63888d883bffa68e59d52fff64cafbe322ccd6f727c6b1309d552a9cc02148c731de0883d9ac712bc29908939b72 SHA512 a07b6d393fbab88b0e6e2bdb2e16bf85db3f1873776a3377a3b48447c651a9fcf89a59e2a8ced926e0a607986378c7a9684bfc0020205bdd8a255778cc458c6c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.11.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.11.ebuild
new file mode 100644
index 000000000000..bb0f7f8316f4
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0806618835a2..cc5cd1a1bb30 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index a5752f0332c1..2f450051abd5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.6.ebuild 2665 BLAKE2B 75e985037a61bfd49b00214e9d31377f6862fd4e5bd1038d316c4b42ed99df48db2464da7a16358a05bd144abf6c2313cadd860cb0d4a815a179ee37f2ff0899 SHA512 6d4ca2fe6f8c76170c6d70304a711113658176ea29616e0cd9e050458f3883ab90eca7ec09908cd56437c13c71e8440b013cd724a74319bf7c0adb7b3af0536f
 EBUILD lldb-17.0.0.9999.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
-EBUILD lldb-17.0.0_pre20230722.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 EBUILD lldb-17.0.0_rc1.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 EBUILD lldb-18.0.0.9999.ebuild 2640 BLAKE2B 8116aeef1b0000e17c70639f82406610fe2f296fb9cf31256e92b529152fbd467836835419503443f881c54a2b92a78b7940fd9217837b2194d79286e20d0200 SHA512 1c7f13a86d7c002318d7cce7ecf6ecff5eeb8a34f3b8bb6ad81a1b7b3c637633646498dce412cbbb7242736f99bdfbbce39368cfca12305aae6beace7b08c553
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230722.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 0b408d9e3c91..000000000000
--- a/dev-util/lldb/lldb-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="+debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index a0c7c8cf820e..e0c063d827c3 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 9545116fa62f..f00917972bf7 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,4 +1,6 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
 DIST cdogs-sdl-1.4.2.tar.gz 35799287 BLAKE2B 76891785f44a6abbe309976b6e706d019cc4c4444c3a58cf83859ad7518a2931eb208b7305ea5d09b2692961d5fd39ff2a8aafce820a9920820646bb1ab81261 SHA512 36bea4eb1f11c4abc752695455f30b6f76b6c3aab02d57ece0f8a77d116c7810a5ebcc211de441a6487bc43d977dfab84ffa56b4aa5a8a45cdff5e2810c4fddf
+DIST cdogs-sdl-1.5.0.tar.gz 35772274 BLAKE2B 70e06897edfe0a35ec5196ef1f1ae2d90b54958e18a68c3c114a88978b5550a3f6ac68a3d69225a7ee1f00f0d1eeaa0b3d6364e9f435acaeb9118c9a8a7c4f49 SHA512 e6ff35d16ad6af109954397f8c14d7a73a561dee55d7451446149a80b6fb8ec1df2a8c46cd220d335d30472202668672d8c9d71a6428653432794272d07469ee
 EBUILD cdogs-sdl-1.4.2.ebuild 1071 BLAKE2B 60db4d549609223b681b23601fe5ae25eb2f0680569908bea5b6be008d7f77776a42e7e5a24e6f6c9c8d6fa64dfa568c0539f098097fd31fd263c1195567afc4 SHA512 aebf0d99ef40ecfffc4692f523444ef862c28a7c33574ff7cef1ae9be01af45a2f3aa16e77055464528525c3690fa7a5eb0ce8e998cd16a343804c9e52076dc0
+EBUILD cdogs-sdl-1.5.0.ebuild 1076 BLAKE2B 1bebc3338ce4b552350ffc2d68ba85b5f308d81b8313d6ed08c6c5c20e0cc8f3175935ff5eb7c8ef44ece4e18fdb3b75a9a0fba9f72645bf68fa61ec8a08f317 SHA512 58f9d0c00f881850e4bcdc1124d189f63e42a3abcd09c52694b03e2b402bf00bd313350df1ffac5b97749231c0a818eefcf531eac85fb60eee45051522719078
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.5.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.5.0.ebuild
new file mode 100644
index 000000000000..19ad263eae35
--- /dev/null
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Classic overhead run-and-gun game"
+HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
+SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="
+	GPL-2+
+	BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[haptic,opengl]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[mp3,vorbis,wav]
+	net-libs/enet:1.3=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
+)
+
+src_configure() {
+	filter-lto #858527
+
+	local mycmakeargs=(
+		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/ # trailing / is needed
+		-DBUILD_EDITOR=OFF
+		-DUSE_SHARED_ENET=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc doc/{AUTHORS,original_readme.txt}
+
+	# CREDITS is used at runtime, rest is licenses or duplicates
+	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index c92e80832748..2037e2a5235e 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 3c18b84493dc..cbefa5ad3d4b 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -2,6 +2,6 @@ DIST libadwaita-1.3.2.tar.xz 3132728 BLAKE2B ca9839af1016fae291d8d40dfc29c82ec92
 DIST libadwaita-1.3.3.tar.xz 3145696 BLAKE2B 1aa9de9cb5852cb2c57f6442c0f71d1bc3a5b62fa930a0a3aebdbc56b2050525be314362e1b886ae7fb9009491913eb8cd0f0921a42ccac0f49ef19478a836b7 SHA512 1ff0ad1cb04c920404eb177743f5caeedb20173e99e8654f1a157928ee00b0d8cb03dc411ad9617d44591709ecc805043a60c63adde1a2d17252a94c6a28a2be
 DIST libadwaita-1.4.alpha.tar.xz 3893240 BLAKE2B 7e02d373dfc23294f2c2689bd624c8c667ad5c7830316e905a2af705af0f8e0580181c2e501a7a044115a2f836f00dccce9a64853acfab6f2986c2eb524933a9 SHA512 a7c61fa76b804aa8c35c190e55a0b25b141daf1c49254741fc2fb396daf8d91779754b4234254a94957b83962611058579235272d6d2e3fe2fb3a3cef62e4be3
 EBUILD libadwaita-1.3.2.ebuild 1469 BLAKE2B 1e8862622dbe0f7389cebc391b90d8f43fb0ec6f8152d62736cdb234dfd61dbaad5a436b017881d200460980f1e3be71dff7e0883ce4e0f956ba4521477c8827 SHA512 0ff709e96c7712b2ae5aed44b2aa12ecce521a55a49e331414febf2f41f5964fa6303142b399b21b8d850a5fdaf002bf5fdf5c86b69af34a19bc85f6ddc3c046
-EBUILD libadwaita-1.3.3.ebuild 1491 BLAKE2B 4dd085199a78c4ec71a15c8a3888ef861c05504ac0125ad654ebc83ba3caa0f65f10f1bd7929c786036f28426e25e250c9de185067ff6d9bb28f45eb884998c0 SHA512 34f4c9b2c3911c50a943aa36d04b2e64aaa6b72c5044f78f4109ed6c8323a6ffd84f66f059526bd877cc313b06533aa4e28357857363ddc8548f615cb21b5895
+EBUILD libadwaita-1.3.3.ebuild 1490 BLAKE2B 461432250ca6cf003816241ecb20e77d37da787fb9f1d621f27aab32336ad1a197e1e4088c55c20880994bc3f131290596425803d1784105c9ed017027ca3395 SHA512 363a45acdf49dca1ba9747626a9811d8bdb14b01cd4025d4167d4463bc8c040285ff2dceabca09fc900078dcb0cf9ed66b45539f21b4f4b76ca9b01b3cc28ae2
 EBUILD libadwaita-1.4_alpha.ebuild 1484 BLAKE2B dc431d8c2a8d5d86ec33fc634343c25432fb03dabc3c521a99e429a37d05b57473fcca0390dd606a8c976b107639d6f759ce156a478a7c45cea30cb78f0dbf97 SHA512 24da16120631b7c3fec3af5feeca9dc64a85db934643eee1c7594d92961229d54656bbad1ae529ec318b419b0adc40af59641aebe41544a1708e5fe14f615b43
 MISC metadata.xml 351 BLAKE2B ae57c9eb56cb12bf754b28c2e6620c09ad7ccc79396fd0476e99e52b93bf6d3900fc84ab55fdf11d98e59ed9e247cabf6f301d45bc5e4c453c0fcffc49b144cb SHA512 dc1333518d24d60f69a180ee7369c4b783f234bda36cd65ec66d483db86f3123eca5ed10cd8aadc7a183b707d698a159d7917f7ebd1c342c212f15e90cb8d5df
diff --git a/gui-libs/libadwaita/libadwaita-1.3.3.ebuild b/gui-libs/libadwaita/libadwaita-1.3.3.ebuild
index 90b8dbb0c09a..dbc677e10f10 100644
--- a/gui-libs/libadwaita/libadwaita-1.3.3.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.3.3.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.72:2
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 94c8d52851a4..011d81e5cbe7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index c018d00eeb06..575a30602d88 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -9,6 +9,6 @@ EBUILD libsdl2-2.26.2.ebuild 6455 BLAKE2B 64dfa0734239285ddbd8fcfc49269f5b414b07
 EBUILD libsdl2-2.26.3.ebuild 6462 BLAKE2B a121f982cefc81f7f1531ca10f93d77da636cb306f62dc7a2884aecc3e6cb920f4ed64098493bfafa1b25e7a8dbc64e3437dac8d7a46e5516b729773c4a81e89 SHA512 54df550b8b14b9570a3f79a0766bc53fdcdb4aef8128b028e85307c833f0d424a6c460b5f25cb0b08cbcdfdca95c7b4be084011bf7ec1feccaf6a7ce03e8c9e6
 EBUILD libsdl2-2.26.5-r1.ebuild 6443 BLAKE2B c6c666943a6dad04ece0402a90cad9ca1a99fbb8138872b066aa569cf628878231178837c68228c0e2dd2e058868e4e335fed3c58d5020181217faf12ba9237b SHA512 b9dbdeb5d43ed99ff29b564a92ee4a344c42282174349dfab828bba1b73730ebe4cf368c4fec7676903c4ba79aa94878bc89a10709cafc981d6d5447cca373aa
 EBUILD libsdl2-2.28.0.ebuild 6450 BLAKE2B 242f27fc4b242cf72fe586500a7946296ce656777c25a30c575b5e39cc9581796be5c7bc6dc56b9918b224737d821961eceaa0deca56b817130f9366d20992e2 SHA512 49626c660ed32937c6de12411c6a8b1c415501a22523dc05ecca34b6ed4c06bc0fec2609b2f5ae090e7f07acd79e9e73c4ec05e0623e53a9c816968fd53c5dcf
-EBUILD libsdl2-2.28.1.ebuild 6445 BLAKE2B 54e4c29cc1f33679fb6f5011bb021478a9804cbfd6eb736b3ae056949dd9a5ff98e069fd5fd9478ac33d9acf038619b0ba7d2795299847f89237d93288ba04c6 SHA512 b37f7c7b11dc73c0595b0de825a118be75fd67bdf51f3b19c14609c23b76731bb8eddb9200c6cbea755670d10c4ab1dce602fe72523dae4904490eacff382818
+EBUILD libsdl2-2.28.1.ebuild 6444 BLAKE2B c1a1c122d0d4165afa8e93b1df6cbd7e69824a28af1d2b76cc688bcf1e8780c8e3d75692f056efdaeacf96657895f05c40dca6b0a507ff450f2d5f434ff4f2fa SHA512 64c6e52f5c5426c43d5dce68c1862fb71f3734d57759d9d22663e7aeaa8c94489b1db4e9ec15c909756b1e53e22e0642db18230f8525f6a09a32d031f5276d5a
 EBUILD libsdl2-2.28.2.ebuild 6450 BLAKE2B 242f27fc4b242cf72fe586500a7946296ce656777c25a30c575b5e39cc9581796be5c7bc6dc56b9918b224737d821961eceaa0deca56b817130f9366d20992e2 SHA512 49626c660ed32937c6de12411c6a8b1c415501a22523dc05ecca34b6ed4c06bc0fec2609b2f5ae090e7f07acd79e9e73c4ec05e0623e53a9c816968fd53c5dcf
 MISC metadata.xml 2003 BLAKE2B b0233c893c0ee157dc23c5b85ac253e0e830955fdbc78f8698c7f1059182076d7d10d842469d50d40abcc8a176e0c356c43aa55def05e1a2048ec178732c5f2c SHA512 7f0e86d7a53ed52f6b8bf39c14e0170a255398fbbd5da6e1707bdcc2e1de20153f4e7a2433e247e5a80b93895f9225eed133cb3fef94526679ff3aab7892da47
diff --git a/media-libs/libsdl2/libsdl2-2.28.1.ebuild b/media-libs/libsdl2/libsdl2-2.28.1.ebuild
index 219c19111729..1592a9d581cd 100644
--- a/media-libs/libsdl2/libsdl2-2.28.1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
 REQUIRED_USE="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ccca951f4dcd..55d87738febf 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index f28616a91345..59c09fe1f9a4 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST mpg123-1.31.2.tar.bz2 1093881 BLAKE2B a5c2d0a5df6067322979176498592a429c36fa06000b512e944b1f6ceeeae29fa3efeb0e5d604c8f2930aa51ae75e53be4312abaf74e43504fb1643b66b8b682 SHA512 eca285382ee3e780353834addf1336c4a2f8f11256af22f95e11efa243de669761c083c86ddfc6ac8c02a920a3c4ab4ad767efa2739fb052e9719f35ef407bc3
 DIST mpg123-1.31.3.tar.bz2 1094474 BLAKE2B 343bca53e067485dba438a177ba65f38d512c4aaac6f413bb1e070f99d6407f9a694899f06fbd3577ef287b4e898b38ac3585f86d18f643cab15f678d3105c11 SHA512 5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98
 EBUILD mpg123-1.31.2.ebuild 2991 BLAKE2B 8a0ed91c206eb68ff907b23c34bd93431f518c7b344b7f2b62256ef8f4fa4b5cb40a18893d17164dfede32c2e39eb906ba7c38ec23b4d8c0c93476305c14af75 SHA512 ddaea7b6484da86fda2622889793e698b49e4ab3e3fe7b3f595cef280cbf264a8ef5c6796a09bea0196af8d1dbd7f8691041629d648d5a79a8308e5807577b3e
-EBUILD mpg123-1.31.3.ebuild 2992 BLAKE2B 0b32c330e84390a1a552040eebad5e1380fbdc7d623dfc7625e6aa8ab345ce05e066a4a1f6543e6268efaf2c50d1018879c553b9673bcf0e6cd1765654e55c01 SHA512 ebd51cda2804d59d1852a055ce9c6759eeadc253a10217ee7a591ed123a3b991c65deea5782d1c63804682719b2638c9fb9d193abc92fcc473ff1b9a08f56ffa
+EBUILD mpg123-1.31.3.ebuild 2991 BLAKE2B 8a0ed91c206eb68ff907b23c34bd93431f518c7b344b7f2b62256ef8f4fa4b5cb40a18893d17164dfede32c2e39eb906ba7c38ec23b4d8c0c93476305c14af75 SHA512 ddaea7b6484da86fda2622889793e698b49e4ab3e3fe7b3f595cef280cbf264a8ef5c6796a09bea0196af8d1dbd7f8691041629d648d5a79a8308e5807577b3e
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.31.3.ebuild b/media-sound/mpg123/mpg123-1.31.3.ebuild
index 39c09787ba4d..4834ae56d825 100644
--- a/media-sound/mpg123/mpg123-1.31.3.ebuild
+++ b/media-sound/mpg123/mpg123-1.31.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 22cf134de9cd..3c9e2b908542 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -2,6 +2,6 @@ AUX qsynth-0.9.1-cmake-no-git-version.patch 504 BLAKE2B 101d5bbec82083ad54cb90e1
 DIST qsynth-0.9.10.tar.gz 333389 BLAKE2B 87ca02e1f15a7b28f5af462d1ef52e9609fc0abc3d15d545493f448da61d85d8d264f5ab908816607de3291424b979348f330205fc6e727edb7287fd28e9067d SHA512 82e04ccfe3193d570e28c4e5da3e9ea8afbc2b1f2e43f54459449b31ee5448a6232a5fe13631eed80a5cf75f4176e5a419ec6467bf3d7d5e30d34083d4d8f7aa
 DIST qsynth-0.9.11.tar.gz 333402 BLAKE2B 72a57a978bad1c4b2abcb287ea27c1c1365c06efdeedcd9bb69ca01a20304f48b19065c5e5181e8d30a3d4137eee56ec69cfba32dd8d2fa29f3ea1140019e089 SHA512 3d6c40066db235fc39ca804de1a352ade9e03e162b5901d0e1170f1f0cb4ec3e1631d2fe2b1e50a9cbab9528bca54ebb0afb8e5d615fb8f0b06b9761ae472f2d
 EBUILD qsynth-0.9.10.ebuild 1409 BLAKE2B d804e0115fa2f5436f758d7e740f5e28ab14c8bcf174fb45ad6ccddef2799e8c7cb5361f072d58a27e819a11bd30427cde5e938c42a4ed02da14e4bf04329a48 SHA512 05ca20f22ab90f52a22f224082857cc1db1effc3356e64d96ff09b1efc6e740c34ecd83475820fd84ad588fa4547c5e1503eebe02779819c37681324fbd651a5
-EBUILD qsynth-0.9.11-r2.ebuild 1437 BLAKE2B 2e3d53ab8b02fd4942e275bb3304282921c8c8e0f90897731ed7348d711fde579f40ecdd93e8d5f390521bcb4eabaa8ee537356968ded0bb6f707df69706d362 SHA512 cc1e36a7c57a47de01dcd2266604f22358df7bdf8967e85541c438238de53471e9d3b301d005ba9020f74b5dcf404e4c7fc2e524c80a59e0a57bc1b0e4419ff6
+EBUILD qsynth-0.9.11-r2.ebuild 1436 BLAKE2B ff9c2dcc0ffc04cae14ffb3bb66fe5809a2ae499d80897abce1849ac41f8bc418135af387f25d39cc77e0453fb77d1b309e871bb9c9127d496e7d4ee9e4b85f0 SHA512 b4ed35bbd616ab59c294894bb2eaadf6190965bfa8d84166753efba9d66a43b0b1c008fc01388e1d916b9ddbc624ab165ae15e8a16983be1dc7174c7281d45cc
 EBUILD qsynth-9999.ebuild 1437 BLAKE2B 2e3d53ab8b02fd4942e275bb3304282921c8c8e0f90897731ed7348d711fde579f40ecdd93e8d5f390521bcb4eabaa8ee537356968ded0bb6f707df69706d362 SHA512 cc1e36a7c57a47de01dcd2266604f22358df7bdf8967e85541c438238de53471e9d3b301d005ba9020f74b5dcf404e4c7fc2e524c80a59e0a57bc1b0e4419ff6
 MISC metadata.xml 763 BLAKE2B 871d9e5edd0dcd434d496c2d40f997717d424502a5d7072264886477eaaf4bf460e32746bc899a124d97f5cadf116c0cdd198d017ebd4e9cbd769ba2af8a8512 SHA512 147e494f3b468283759a06d361d286e211e95cabbfc6daef67c406e5f19a9eb04ec611f41273ddb0c712dd1fd9afa3a71922bd9cfe749c388ab61d550dc86def
diff --git a/media-sound/qsynth/qsynth-0.9.11-r2.ebuild b/media-sound/qsynth/qsynth-0.9.11-r2.ebuild
index ab43ec3a943b..2db9b4bf81ee 100644
--- a/media-sound/qsynth/qsynth-0.9.11-r2.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.11-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 067d714df3ba..70454f4dd62c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 31fb77e048c8..169ee7c3173a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Aug 2023 09:10:10 +0000
+Thu, 03 Aug 2023 15:10:06 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bcb6675c417c..eb79d11b2d2c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-03T09:10:13Z
+TIMESTAMP 2023-08-03T15:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLbvVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLw1FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnjw/+IRJxVsE5Maj/T+dh+r+tlp4uzEcnryiVdWZR+Nhfsbm030CV6fHGMu0c
-z/AuWQ+KcqBgs+phr1p7gVStt+JhxcRzhANtB2/TPlahlNTWw+pQMzTR0TjM7soP
-W+5L558peImUWgKlwuUExfZhZAAdGMOEd+xhRLCMBNtNLOuaxRp1WtvIKIpywTj9
-jSXsUkVJDqnTToQFmxstrYVDkxpRjvI7NHUH1VkepqfVh4jxfRLAHtrINhZOLeMW
-Bh9YVwTHgR/wr4MZtQA8B23pRn/4AO19kOlypnogrCAOj+I8HbWCEc+c87dlsXCE
-d9ComvMDvOKsE8tcHcpLQojF5Luw81FbvuEH3Zz+Q29qDQUr8zsL+UA1Os2pL2pG
-QPHHf3PV7Adff0VOx3AyTRaH51CBO3qoafwcUWFs395xQZzuW2EOYZRlnA5l62F2
-g5v8PDGMHbi6BtLiz/HcYdBZLMYT99dXBzX3dN0q5nqkhLqKUYxsdUvS4YmOrA7b
-wSdt+aC9N+hBGJ9ZJLe+EAJzF13vbyyciqD9WdmuGZ/XUgI/8pq8jsXqSQG31NRB
-j+1gacJVbGh+C0vx4sbSjI0cEznbA2dMRVF4WKNGj2AfQ9kb/jdcuWcfkNiivR0F
-0wtvoogSttvEt8i6H7/RYe8reeauwghout9AMD1tgc7xCQ/ZUEw=
-=FhjD
+klB7xA//VWc0lj9nI9xK2Zux9h0jPvTD9V1R0wpxRZVLpbWSGknONNLuXmeHQ8N7
+noKHUNrnQUDYiGM2azkxfGYRtvPZAsM8LWJiLEs3w6caesACMhRxBZwot/oDOJ7p
+qZ03STAsZ9NvR7/hsisfu77/T1kEluLVv4K2JpjbiRvPvvF+bYdWh4QONZjQ+L1+
+JUrWh0QgPcS1lfW7hAS+HhoiCBFL6uuyGfw49IQvEQynpW7n9Klu+2Q12Aa9CEKO
+zWtQ3KBIogBExK+pVJpXwF/VQfCLia7VNtyAJjF8Vk2WnWu3QuMWjKzUdRvM8G6+
+9zPlnNeUSXMpy/0SU8A2oF2+YObd41WXQim43R2HCZ7GfFyaAn29x/mw+9TJDw+/
+n2rCkZWpPkl4b3v0JTcdQwKxRg3ZlgEpvO2oQT6I1wFgRA5l40z2SFV3l7BuG6qc
+KAB8yzKsPmOjCq/B7ab9HwFxtVXEAc9MugEYti7ZsqyVSBf2BCRTU0JBVIK2UdrW
+rxvGjVSuq6KZ8d8Wrk/qzbD89VAXrlNE/+uZA4uqpws0aUEC8TIYon9VJBXYhgHH
+tzOsrmGzJfSeRrUUQPUPC0iTlstilWq108t10Z/i+tHYfktkfIhoh0ekYGvh57lg
+S0DFTbOYD6t0gpOS02EV8l30GrYxdypMu2KHFyjRmc0P7UmmIjM=
+=Y5+a
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 31fb77e048c8..169ee7c3173a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Aug 2023 09:10:10 +0000
+Thu, 03 Aug 2023 15:10:06 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f6a5b3c821c3..aefa5c5f7dfe 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 18713fd2feb7..18df7b61c941 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/drush-6.7.0-r5 b/metadata/md5-cache/app-admin/drush-6.7.0-r5
new file mode 100644
index 000000000000..be94cdd461c1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/drush-6.7.0-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Command line shell and scripting interface for Drupal
+EAPI=8
+HOMEPAGE=https://github.com/drush-ops/drush
+INHERIT=bash-completion-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table
+SLOT=0
+SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=873084c9013c92026a684bfe17e671f5
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index c0f9244eaf97..a7b6bd07d67f 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0.3 b/metadata/md5-cache/dev-games/godot-4.0.3
deleted file mode 100644
index 123dfb4ab628..000000000000
--- a/metadata/md5-cache/dev-games/godot-4.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
-DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
-EAPI=8
-HOMEPAGE=https://godotengine.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0.3/godot-4.0.3-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.0.3-stable/godot-4.0.3-stable.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc69294761c321094d18a886d28ccd6c
diff --git a/metadata/md5-cache/dev-games/godot-4.1 b/metadata/md5-cache/dev-games/godot-4.0.4
index af2e3556b98b..fc197800703e 100644
--- a/metadata/md5-cache/dev-games/godot-4.1
+++ b/metadata/md5-cache/dev-games/godot-4.0.4
@@ -12,6 +12,6 @@ LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) t
 RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
 RESTRICT=test
 SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.1/godot-4.1-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.1-stable/godot-4.1-stable.tar.xz
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0.4/godot-4.0.4-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.0.4-stable/godot-4.0.4-stable.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ea5305501373c9961f00dac9a38dc890
+_md5_=786386355f61cfc7c8b9566e4690d59c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 7dfa2da4f45e..2cb5923a5b48 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/vala-0.56.8 b/metadata/md5-cache/dev-lang/vala-0.56.8
index 1cc8b2e2a6fc..8fb8f6c18998 100644
--- a/metadata/md5-cache/dev-lang/vala-0.56.8
+++ b/metadata/md5-cache/dev-lang/vala-0.56.8
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/val
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.8 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.56
 SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.8.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bd9df625ea2ac8a7e60285970c96af78
+_md5_=1706812fa0ccd4c1ec26a13ba5465fd3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4c3da942c955..0d2242e9e9e0 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-17.0.0_pre20230722 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230722
deleted file mode 100644
index 7539d7b3f387..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230722
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c25593020d9be21204d9ee8339d4674
diff --git a/metadata/md5-cache/dev-libs/libuv-1.46.0 b/metadata/md5-cache/dev-libs/libuv-1.46.0
index e72a0886f50f..dab59db67413 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.46.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.46.0
@@ -4,9 +4,9 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=8
 HOMEPAGE=https://github.com/libuv/libuv
 INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.46.0.tar.gz -> libuv-1.46.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=4a4b765a63fa862fc1ec64377c31ce82
+_md5_=0aec88664f65d10cdf8a8129c4d2d583
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 70b1c24ae8f3..7665fa4c4507 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230722 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230722
deleted file mode 100644
index 198966162f85..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230722:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=+debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230722:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230722
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7242d061b363021e575e5077773c3498
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.120.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.120.0
index 9021025f8352..8349f6c3e48f 100644
--- a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.120.0
+++ b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.120.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Cookie-Baker-XS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-XS-0.12.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=7168d92b4208d3429a559fe96b55271a
+_md5_=edd7fe5a95ccfbe5db7002e9b958714f
diff --git a/metadata/md5-cache/dev-perl/HTML-Selector-XPath-0.260.0 b/metadata/md5-cache/dev-perl/HTML-Selector-XPath-0.260.0
index 045b0d05e739..2a0d4638545b 100644
--- a/metadata/md5-cache/dev-perl/HTML-Selector-XPath-0.260.0
+++ b/metadata/md5-cache/dev-perl/HTML-Selector-XPath-0.260.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-Selector-XPath
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.26.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=3bd97c7dda6c6989798c926423e7b091
+_md5_=ebd8dad2276b8f28d8bdd0b55ce73d57
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index f14f47035058..983d82688a02 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.500.0 b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.500.0
index 71e9ca5756bd..8d6a0ae9c62b 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.500.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.500.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Text-CSV_XS
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.50.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=2e7313965bbfb49fe36a690b111e74fa
+_md5_=11006d533c65afd7760c237d3d25376e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fb9a819b97cc..263e158c59b7 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-17.0.0_pre20230722 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230722
deleted file mode 100644
index 699426bb822a..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) test? ( sys-devel/clang:17 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-17.0.0_pre20230722:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_pre20230722:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=d756831b3d11ced76df3063b053f3e77
diff --git a/metadata/md5-cache/dev-python/jaraco-env-1.0.0 b/metadata/md5-cache/dev-python/jaraco-env-1.0.0
index bb935e346e19..d5e02dcba443 100644
--- a/metadata/md5-cache/dev-python/jaraco-env-1.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-env-1.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/jaraco.env/ https://pypi.org/project/jaraco.env/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.env/jaraco.env-1.0.0.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=55748e6c208c13ecd6342e11fe7e1e57
+_md5_=4d553b215d8eb5925cf088e52990e882
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230722 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230722
deleted file mode 100644
index 16089384cdb9..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230722
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-devel/llvm ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=fe6b9c8c399961cbedf5987b128971f4
diff --git a/metadata/md5-cache/dev-python/pip-run-12.1.0 b/metadata/md5-cache/dev-python/pip-run-12.1.0
index 9c397d7edc7e..e9a757334c51 100644
--- a/metadata/md5-cache/dev-python/pip-run-12.1.0
+++ b/metadata/md5-cache/dev-python/pip-run-12.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/pip-run/ https://pypi.org/project/pip-run/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-context[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-env[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-functools-3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/more-itertools-8.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/path[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pip-run/pip-run-12.1.0.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=183b1e1d468c7a7c0717438c2c8b5dde
+_md5_=7ae694372c268abfbe804dc212c8eca3
diff --git a/metadata/md5-cache/dev-python/pymongo-4.4.1 b/metadata/md5-cache/dev-python/pymongo-4.4.1
index bd115ea2d5ee..75871142ff29 100644
--- a/metadata/md5-cache/dev-python/pymongo-4.4.1
+++ b/metadata/md5-cache/dev-python/pymongo-4.4.1
@@ -1,4 +1,4 @@
-BDEPEND=test-full? ( >=dev-db/mongodb-2.6.0 ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( <dev-python/dnspython-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] kerberos? ( dev-python/pykerberos[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( test-full? ( >=dev-db/mongodb-2.6.0 ) ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( <dev-python/dnspython-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] kerberos? ( dev-python/pykerberos[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Python driver for MongoDB
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/4.4.1.tar.gz -> mongo-python-driver-4.4.1.gh.tar.gz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=0b34d20bca7d231edfa38c10c82f8020
+_md5_=e602b975ef8e27b703d2ef2566a7e888
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-3.0.0-r1 b/metadata/md5-cache/dev-python/rapidfuzz-3.0.0-r1
deleted file mode 100644
index 62158a7b75ed..000000000000
--- a/metadata/md5-cache/dev-python/rapidfuzz-3.0.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.16.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/taskflow-3.0.0 <dev-cpp/rapidfuzz-cpp-2 >=dev-cpp/rapidfuzz-cpp-1.11.2 dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/rapidfuzz/rapidfuzz-3.0.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=98533e48e29493dd1291c7ca98dffeb0
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-3.1.0 b/metadata/md5-cache/dev-python/rapidfuzz-3.1.0
deleted file mode 100644
index bf8bd997d771..000000000000
--- a/metadata/md5-cache/dev-python/rapidfuzz-3.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.16.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/rapidfuzz-cpp-2.0.0 dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/rapidfuzz/rapidfuzz-3.1.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=6b1c6e0078faa0881102cf55aa9a0cb9
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-3.1.1 b/metadata/md5-cache/dev-python/rapidfuzz-3.1.1
index 1f15bd42f57e..7929a2c85737 100644
--- a/metadata/md5-cache/dev-python/rapidfuzz-3.1.1
+++ b/metadata/md5-cache/dev-python/rapidfuzz-3.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rapidfuzz/rapidfuzz-3.1.1.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=ee1364b9439bf4cb26eb0297dea0bf6e
+_md5_=1048415663320b0597a4eee9b83fccee
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 971c18737d59..38a1ba5a7ca5 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/sus-0.22.2 b/metadata/md5-cache/dev-ruby/sus-0.22.2
new file mode 100644
index 000000000000..5953f358dcf4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sus-0.22.2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A fast and scalable test runner
+EAPI=8
+HOMEPAGE=https://github.com/ioquatix/sus
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.22.2.tar.gz -> sus-0.22.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=5cf66dc103602feae15d8abcd14444cc
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.6 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.6
new file mode 100644
index 000000000000..3c872b8873b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A complete implementation of the WebSocket protocols
+EAPI=8
+HOMEPAGE=https://github.com/faye/websocket-driver-ruby
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0.7
+SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.6.tar.gz -> websocket-driver-0.7.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=415c6a63bbdf86d37ebfa5d184090e0a
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.3 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.3
new file mode 100644
index 000000000000..143296867559
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/webrick[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/webrick[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/test-unit[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/test-unit[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP
+EAPI=8
+HOMEPAGE=https://github.com/ruby/xmlrpc
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 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 ~x64-solaris
+LICENSE=Ruby-BSD
+RDEPEND=ruby_targets_ruby30? ( dev-ruby/webrick[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/webrick[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/webrick[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.3.tar.gz -> xmlrpc-0.3.3.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=eb0ddb719e847f644320686fa51a2782
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.11 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.11
new file mode 100644
index 000000000000..e91eb3f228e3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.11
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Efficient and thread-safe code loader for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/fxn/zeitwerk
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.11.tar.gz -> zeitwerk-2.6.11.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=b6a979a6a7844a3e4a714c8da876717f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6d0d39f234e4..4c68dbf76924 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230722 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230722
deleted file mode 100644
index 6020e254db5e..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/six[python_targets_python3_12(-)] ) ) test? ( python_single_target_python3_10? ( ~dev-python/lit-17.0.0_pre20230722[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_pre20230722[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-17.0.0_pre20230722[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230722 ~sys-devel/llvm-17.0.0_pre20230722 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=+debug +libedit lzma ncurses +python test +xml test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230722 ~sys-devel/llvm-17.0.0_pre20230722 python? ( python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/six[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ff51bb18b647bf2b1d0c4ae79b74aa5b
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 02506be87ae6..6d9152670f3f 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-1.5.0 b/metadata/md5-cache/games-arcade/cdogs-sdl-1.5.0
new file mode 100644
index 000000000000..75a3927f3177
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/cdogs-sdl-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mp3,vorbis,wav] net-libs/enet:1.3=
+DESCRIPTION=Classic overhead run-and-gun game
+EAPI=8
+HOMEPAGE=https://cxong.github.io/cdogs-sdl/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME public-domain
+RDEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mp3,vorbis,wav] net-libs/enet:1.3=
+SLOT=0
+SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.5.0.tar.gz -> cdogs-sdl-1.5.0.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b3dfddb14418112fe62175c6a8c8f672
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index f9936b7aced5..7c409b5d7279 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.3.3 b/metadata/md5-cache/gui-libs/libadwaita-1.3.3
index 2dc0d9c559c2..2b6662436e67 100644
--- a/metadata/md5-cache/gui-libs/libadwaita-1.3.3
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
 INHERIT=gnome.org meson python-any-r1 vala virtualx
 IUSE=+introspection test +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.72:2 >=gui-libs/gtk-4.9.5:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libadwaita/1.3/libadwaita-1.3.3.tar.xz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	vala	db97951caa799e73a831a5f48e717da8	virtualx	817571665ee28575da44ee08135089e5
-_md5_=1d368186b525aaca5f482f1625724b90
+_md5_=fd23d937264ecbf783da640aa187c986
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1baccc9a5228..1dd837279f42 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.28.1 b/metadata/md5-cache/media-libs/libsdl2-2.28.1
index 87628a8a6374..c1694241b6de 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.28.1
+++ b/metadata/md5-cache/media-libs/libsdl2-2.28.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.libsdl.org/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=ZLIB
 RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[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/mesa-9.0.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(-)?,gbm(+)] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-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(-)?] >=virtual/glu-9.0-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(-)?] ) pipewire? ( media-video/pipewire:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.20[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/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXfixes-6.0.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXrandr-1.4.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(-)?] xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) ibus? ( dbus ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) sndio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.28.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=ddd277ba3d8c6a2307c7b769cfb10299
+_md5_=6c8cfd64f7d78bf56ac1db4ceb4cb5df
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 74b4cbf61100..dca4c7eb4c39 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/mpg123-1.31.3 b/metadata/md5-cache/media-sound/mpg123-1.31.3
index 45ec8c70d788..f6048c66133b 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.31.3
+++ b/metadata/md5-cache/media-sound/mpg123-1.31.3
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg123/mpg123-1.31.3.tar.bz2
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=e00033a4ad80e3e5bfb265c3f7b687c0
+_md5_=e97c991af43eea426699e848a0441e3a
diff --git a/metadata/md5-cache/media-sound/qsynth-0.9.11-r2 b/metadata/md5-cache/media-sound/qsynth-0.9.11-r2
index d8d1592c4f78..23d44266a6e5 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.9.11-r2
+++ b/metadata/md5-cache/media-sound/qsynth-0.9.11-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://qsynth.sourceforge.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop xdg
 IUSE=+alsa debug jack pulseaudio qt6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.9.11.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=70e83a8d6585642998381579aca5f7ba
+_md5_=b82f74537ebf1903fc13631c7f2c65b8
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 27d3dc810e16..fbbf7ad3ba19 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.15 b/metadata/md5-cache/sys-auth/munge-0.5.15
index 897ef92d4529..2b124f9076f6 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.15
+++ b/metadata/md5-cache/sys-auth/munge-0.5.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/dun/munge
 INHERIT=autotools prefix systemd tmpfiles
 IUSE=debug gcrypt static-libs
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( dev-libs/openssl:= ) acct-group/munge acct-user/munge virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.15/munge-0.5.15.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=aaf322b61d5782e690c25d1189243222
+_md5_=0fadae0acdc74f3ae4c24ab6cecd7d0e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index a2faa646cca7..84a3e8d1b6d2 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230722
deleted file mode 100644
index 3d8cb9512abd..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230722
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/recommonmark[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230722:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
-IUSE=+debug doc +extra ieee-long-double +pie +static-analyzer test xml test +doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_pre20230722 sys-devel/clang-toolchain-symlinks:17
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ~sys-devel/llvm-17.0.0_pre20230722:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-17.0.0_pre20230722 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230722[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c7b5d2157229c213826bccf09459603
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230722
deleted file mode 100644
index 5e2d6fd9caaa..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230722
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230722[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=bde681da3a50f0e3d93ae7f19b35c354
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230722
deleted file mode 100644
index d8341675e592..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230722
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.0_pre20230722:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_pre20230722:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230722[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.0_pre20230722[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=17
-_eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/gdb-13.2-r1 b/metadata/md5-cache/sys-devel/gdb-13.2-r1
index 1896cd258ebd..265c3bbcfc9f 100644
--- a/metadata/md5-cache/sys-devel/gdb-13.2-r1
+++ b/metadata/md5-cache/sys-devel/gdb-13.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sourceware.org/gdb/
 INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
 IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-3+ LGPL-2.1+
 RDEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-13.2.tar.xz https://sourceware.org/pub/gdb/releases/gdb-13.2.tar.xz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=1013a88573a0d351a7eb53e5295ccecd
+_md5_=8fbc47efa7a27e97efb19e5f5dcfb5cb
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230722
deleted file mode 100644
index 1e6bd0dcbad8..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.12 >=dev-python/lit-17.0.0_pre20230722[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-17.0.0_pre20230722[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-17.0.0_pre20230722[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230722[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+debug test zstd
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_pre20230722[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=17/17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=117b83d9f1de10787a6835fd3eb43460
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230722
deleted file mode 100644
index 18cd312a0765..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230722
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.12 dev-python/recommonmark[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin +debug debuginfod doc exegesis libedit +libffi ncurses test xar xml z3 zstd +doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=17/17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3040b97fc116b91f1b2d1be26e175a49
diff --git a/metadata/md5-cache/sys-devel/llvm-18.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-18.0.0.9999
index 6c5c838d0471..52615c2d5443 100644
--- a/metadata/md5-cache/sys-devel/llvm-18.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-18.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=18/18.0.0.9999
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	2358a7b20091609e24bd3a83b3ac5991	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=55ef0c4467c1f7b0cdaa9037a735dc36
+_md5_=97d14d6505c7e7188a8ab4aec5db76c5
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230722 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230722
deleted file mode 100644
index 113aafc47abb..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230722
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=llvm.org	62ec235562890626e38fc934344792b0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 244e85cc3285..22e53578dfee 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.9.5 b/metadata/md5-cache/sys-fs/multipath-tools-0.9.5
index 574472993f71..05847ad92aef 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.9.5
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.9.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://christophe.varoqui.free.fr/
 INHERIT=linux-info systemd tmpfiles toolchain-funcs udev
 IUSE=systemd test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 sys-libs/readline:= >=virtual/libudev-232-r3 systemd? ( sys-apps/systemd ) virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.9.5.tar.gz -> multipath-tools-0.9.5.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5a36da0b9ed3bfc4be9818a55bab2fe4
+_md5_=04d9aba3e8862790bd6aca3a8c23fba4
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 7673eb3da12f..19c6734c4039 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/gentoo-sources-5.15.124 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.124
new file mode 100644
index 000000000000..3453189f2bb7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.124
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.124
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-130.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-130.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-130.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-130.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-130.experimental.tar.xz )
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=d51392727cefcedb67393a7a60178824
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.43 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.43
new file mode 100644
index 000000000000..041166fa551c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.43
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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=6.1.43
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-49.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-49.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-49.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-49.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-49.experimental.tar.xz )
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=6de05bbe79e3e674d11eaa38913dd9d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.8
new file mode 100644
index 000000000000..8951fbb3e507
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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=6.4.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-10.experimental.tar.xz )
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=a60983dbeae3c2831847a97d27e589db
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.123 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.124
index e0b25d6a01f2..c0ed7ca9762a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.123
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.124
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.123
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.123.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.124
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.124.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.42 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.43
index 992c987ec4e4..632d84ecaa65 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.42
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.43
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 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=6.1.42
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.42.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.43
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.43.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.8
index ceef7006acbf..039fb04ed38b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.7
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.8
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 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=6.4.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.4.7.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
+SLOT=6.4.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.4.8.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 692ccb6dc17a..3c9c2e45195c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230722
deleted file mode 100644
index 10ee3ed13254..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230722
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-17.0.0*:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=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:17 !!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=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b0a0b282c4ccd4f96c9c43d4c2c33c71
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230722
deleted file mode 100644
index ea245ce33144..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230722
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-17.0.0*:17 sys-libs/compiler-rt:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) >=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:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e26921ef701e5a18a3371db5560cd66b
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230722
deleted file mode 100644
index 9d8d37aacb89..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) >=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-17.0.0_pre20230722[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230722[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/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bda559eb22aadb5a2d419e1064419e9d
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230722
deleted file mode 100644
index 0cd937081fcb..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) >=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:17 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf2c3961dbb78d266b1443b879ddf3f7
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230722
deleted file mode 100644
index 73ddd977b2ad..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230722[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
-IUSE=+debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230722[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
-RESTRICT=!test? ( test )
-SLOT=0/17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffa8d6cf9afbdda21279751244879570
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230722 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230722
deleted file mode 100644
index 833f6759f077..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) >=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:17 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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/5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz -> llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	llvm.org	62ec235562890626e38fc934344792b0	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f03b71fcb0a64c2743fa781ab031f01
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index eb192af2b7c9..dbfc5275d90d 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.2 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.2
index 8e329995ff92..bc7dda9223ee 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.2
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.4:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.2.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95b3922b4fc6cab8634b1c09ecfa2f15
+_md5_=ad2c4b82a751d86e6d3558afb61d8f65
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 2b8ffd472c01..65697649a7b0 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2
index 5ad01abf84b0..ee2fddbfba49 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/screensaver/start https://gitlab.xfce.org/apps/xfce4-screensaver/
 INHERIT=xdg-utils
 IUSE=elogind +locking opengl pam systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.18.4:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.18/xfce4-screensaver-4.18.2.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c8366d39d96a0c533b90e184660bae19
+_md5_=b2bc42b579582783083483c5b093d5a1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c3d95864da40..a3f0e1d5d993 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-08-03T09:10:13Z
+TIMESTAMP 2023-08-03T15:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLbvVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTLw1FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAzmA//Z6wetnjPKgfjB2hlBeNTFVl7B6hOVrAeBFuM5Y2VN4t9/zMsMSneHQUe
-x1UISuD7mfYas27uXxsj59WbVbcb2ZPBwRHeatp7vetBwk8/BG4Z1/HZvhswRFr0
-OLoqdpP1yj+n/wCSuJiKWirpI/XzmiFtU0t7Qy5KzRT+/3ttK9TzteQGOk1fN7gu
-F+yR1rely5usv9GbQEf9oOrpSInI0gpzXDtVCJ7/WOz5alaLCes+iGCuSfrh3xOY
-Rsy/1JRPSm48qOqSKNrbVCf0lqzg8R6Q7fJJ7wpu+3qzLyeJQd6NT8fNczDgUWxU
-XOqElJiTvS8pUDNb27+BOspX4U3FpzBl6CUgPMylUlcAs8EpzJJKOJ1y/WUpG8m+
-TaoUHRYMAqtAHhIWVbo9UQIgBfx8tGhHCttoKARbYfuy82u5MXjAtE8e9kg6HOg4
-x9MqQFX9AVubOHbfSC0g0rP69fkrWM0IWL0sJoksfNTFm2pAwtVKuWIwvJvycaWr
-L2SZmhYDFbhXsFWKBoqcHhhp2XBxSELBO00YxBFxFIThOeKZMlag0ILZU+6klwCk
-D/klieiCXMYlFiY/Cn9UR8iVnBGCHf3iE9shXwamD0cgs5E2smAHMMkalRgH+wzj
-S1eyoARD8c/wmc9JQLKvuZiDy5dOKu/D22/IlrFODr1I8CIdDNU=
-=IS2V
+klDldA//Y30u9XTFjrsYZ8Bc3Fylgjedmj+zYyCkTkGxUq9kHLLoNZvQZcpd+B6r
+R245RlFWNscaJNmtARblv7knUEV2tD+425aQKq7xn4B9mCMFGW6qXHEtooMDcp9D
+q+N7CbQAZosme1cvnt8ymovb+1o2Qm4axcZxtw0r7GDjBiTuy5Y4dOYnLWtISDqI
+SvgUtC7qhTlSE2YAQNzQhd5b6+GbsGZDwKrb6Lp8blzwcoRnvQJI/YLTVzjSCF0J
+U9r2LkuAtpV4vR/oHRF7WgODUWES9x74I0sS0/NzqZtGIDjH27X/HDvvonEJU25T
+Y89tvzDGaJOIYKmhtXOxxamNIjPlNY6CkQQr/8fax1Dy8DcKsrNTeK7ebbhr/Jht
+0FamaCSjrd4K6G1w3ZurhalzbGOhDDmaUTKjJUiNIVy4RxhYTis3+e+pO8jht6D6
+MMVciOqUU0KgNJ7C9UBpevGxkfPDtNUih58nFCa5VG+2EIPlNcGrv8Sy+02DiN7w
+VVmre3KSIqLm3hIgcM2JsJypWrIzE3pQ3tbDd7M0mJUN2OngWFGKBe+cZw71VLqj
+rAVfrsovu/omoryvVEN4fKqX8Wvr6rn+7J2oiYMl67c6/kBYtAIvTFWYWVIt64nm
+gEQHilR721rTxCreDLgyfAUrP3sxRwfFJovcHYHFM+fjHTbv37k=
+=ymJd
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 31fb77e048c8..169ee7c3173a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Aug 2023 09:10:10 +0000
+Thu, 03 Aug 2023 15:10:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b61d41bbba59..54623437fbd6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug  3 09:10:10 AM UTC 2023
+Thu Aug  3 03:10:06 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fc9da460b7c0..4208d2321cff 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Aug 2023 09:15:01 +0000
+Thu, 03 Aug 2023 15:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 35e218733413..674a6ab37bc1 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c2cedc41d257ff4cb6a71c69104c6f2000c42d02 1691048727 2023-08-03T07:45:27+00:00
+10184767a9a3cbbd374819f34c107c4ecae20454 1691070401 2023-08-03T13:46:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3d4a5c74a3cb..1e82d07c49af 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1691053801 Thu 03 Aug 2023 09:10:01 AM UTC
+1691075401 Thu 03 Aug 2023 03:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 31fb77e048c8..169ee7c3173a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 03 Aug 2023 09:10:10 +0000
+Thu, 03 Aug 2023 15:10:06 +0000
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 33e8ec464e11..79090f8a084a 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 33cee512ed11..a2bdc7b487be 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -4,5 +4,5 @@ AUX munged.tmpfiles.conf 32 BLAKE2B eaea9bb118a9ca1a33b6bfda69d4bd77614001d7bea6
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
 DIST munge-0.5.15.tar.xz 459468 BLAKE2B e007d767d29bf8f492f4b8b3380d4beffd6eed4ff648492130b7d7f049bc90f1047c059bac6263947aa46f7ab2b0366f7d5079ddee39225e5a61870d20ae363c SHA512 266af1cf2df30f6bd7338527bd69736c0cf91e7390e7bbeea9a225af4829d456907be77a1e77ecef4716f2fff634d144d4b3d5cc3d0afc12f5c2d1acfd6974e1
 EBUILD munge-0.5.13-r2.ebuild 1505 BLAKE2B efd7c66d1588ffd02c8a49c0f5a8114f2b5908e357f841fb3c9e09a097cd72f3359b2c4855dd2c238ca57fcc46a0b43c22f406865345910f8ea53df49ffb5993 SHA512 57b5e37ba490ff956d6c89128ee0a954ef3ab7eb03e15561480cd34197a244570482aaa7ba4de6416032984c5eccb250b3b4b4d905ce73cdfc6554d8b13eb5db
-EBUILD munge-0.5.15.ebuild 2002 BLAKE2B 5ba09c218ba5f15b027ac977be8576692473c848d9549cf39cd6c437fdacf769795f21f6e306acc6f0e47147161850c19cec78d5e64823ea17543c13c9432850 SHA512 5fa7f0df03327e72a4967870a80d7ef5264718b99ffd9b09729f79169c247fe9fde2af85db7826615dcd0540f862a359f5968aa2c472357b3cecd2ce45d50414
+EBUILD munge-0.5.15.ebuild 2001 BLAKE2B c1bf7a4df4006c8e8a411392fc817847d405d71e2e95021c4949f140795d47f81549abddfe2507c3114acbcc15e13cb21d8876cf66770625399b1a881a7d4dc7 SHA512 c8aa340a712e505382e664efffddd0a189ee1a3da595a021d55fdb6eb526ddc9ca2c6c4ffa8cd10268cea1fe02d6a6ba1dd6371d6e0d8faba6ef332d823ce5d5
 MISC metadata.xml 1060 BLAKE2B a520e4060bfedd84813f4e491a5af8514095374a862274efb6a4731cb25ff81831d8fd8733fe91c39cd538e0261ee92b9ff85240882e3812350f1994587d3a7e SHA512 f0195cff8c4adb4dc7d56dd078d1f99e520b0ac9a63ee585b7c90d21dd0e581348bdeabd191a78efaef9c9a323707f22875b0c6b09377c08cb591d961ec35459
diff --git a/sys-auth/munge/munge-0.5.15.ebuild b/sys-auth/munge/munge-0.5.15.ebuild
index 2b3fdceaeb22..a1a5d61cf62c 100644
--- a/sys-auth/munge/munge-0.5.15.ebuild
+++ b/sys-auth/munge/munge-0.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dun/munge/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug gcrypt static-libs"
 # TODO: still tries to use ${S}?
 RESTRICT="test"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d7340046ec36..1503ccc08833 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 c328aef6ffb2..14da7d66cc81 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -6,13 +6,11 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.7-r5.ebuild 5090 BLAKE2B 39974630209630607d10903585223df68cd809fb390fc9eb2a80c4235ce70ae21120083f8eaf749c769a93f738c4e971e31e978dd637a0b87d07260281db4b83 SHA512 6cb37a7eb373d300d165e851e3643fd35e11d78a6a88617b4a8c0063b83558d10d307c32861e9ba2d0ac902c1cd2069ece6bd1446e309a6753f13adf8cd8fa2c
 EBUILD clang-common-15.0.7-r7.ebuild 5462 BLAKE2B 098697c65115e672a1e878167997d820c93cad6a71c5a1dc17c731a031d37f20e50ef41e2f1d3238bc91065ba23bab5db4ab48e8274be9db3cb086ec6cdf7868 SHA512 7500bf0c4fde82b90aac68d09b95a49c241fae8b0d2340f7780e9baed1c85d855e45c4296a7daaa0b831a07f442e0be4faf6510a335fa5c979b3061e28fdb99d
 EBUILD clang-common-16.0.6-r2.ebuild 5523 BLAKE2B d1679b6e4b3f8430b9840c0e43e16d7deaf26990822c4754e906ece5451f142a201d70d8f9207ec461c9be4c28960811bb4c4f3f253c23d2c9abe5e3e66278e3 SHA512 8b9f63bbd13006f1c2e207ba889c3e4a03e8edd63b7c51d4bfa78bb10ccbb6f64636a0ccf2fde91abc43fed16b5c5993375a8bc6226315c80fb9fd3f2d0ebf14
 EBUILD clang-common-17.0.0.9999.ebuild 5439 BLAKE2B a9e244677be20b2eb40ec21906a2985ffe08936908f0680adf258e2bb0d0cb4c58c17d9914cca82f46845c862266be4c595c54a99fe3ed21e2e7f7d2fa37cb8b SHA512 68b40b0470e25cb50c2cf9ea937a99bd01db8abe8d22c2e51de9ff98ea6cb2389133343757a5c341110c51bb9dc7de5ae66d01597ddc5b9689a578b7158594bc
-EBUILD clang-common-17.0.0_pre20230722.ebuild 5439 BLAKE2B a9e244677be20b2eb40ec21906a2985ffe08936908f0680adf258e2bb0d0cb4c58c17d9914cca82f46845c862266be4c595c54a99fe3ed21e2e7f7d2fa37cb8b SHA512 68b40b0470e25cb50c2cf9ea937a99bd01db8abe8d22c2e51de9ff98ea6cb2389133343757a5c341110c51bb9dc7de5ae66d01597ddc5b9689a578b7158594bc
 EBUILD clang-common-17.0.0_rc1.ebuild 5439 BLAKE2B a9e244677be20b2eb40ec21906a2985ffe08936908f0680adf258e2bb0d0cb4c58c17d9914cca82f46845c862266be4c595c54a99fe3ed21e2e7f7d2fa37cb8b SHA512 68b40b0470e25cb50c2cf9ea937a99bd01db8abe8d22c2e51de9ff98ea6cb2389133343757a5c341110c51bb9dc7de5ae66d01597ddc5b9689a578b7158594bc
 EBUILD clang-common-18.0.0.9999.ebuild 5439 BLAKE2B a9e244677be20b2eb40ec21906a2985ffe08936908f0680adf258e2bb0d0cb4c58c17d9914cca82f46845c862266be4c595c54a99fe3ed21e2e7f7d2fa37cb8b SHA512 68b40b0470e25cb50c2cf9ea937a99bd01db8abe8d22c2e51de9ff98ea6cb2389133343757a5c341110c51bb9dc7de5ae66d01597ddc5b9689a578b7158594bc
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230722.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 9295c64406f2..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index fbcfb4ffcb5b..9a003ca5c034 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,7 +2,6 @@ EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e710563096
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.6.ebuild 1435 BLAKE2B dfbb6047c0541de72f3447fa61f00d96c2b7c4b96454fa82796f59bd2884ecdbb01539bf08741d3b5ed866b18f4003bca6878cac549b6ef46aa5c6a15bc56c85 SHA512 d63983cb60299866a743ff6b71279b433a10f011fc51e53f3d3d6d6b99dffc080ef0110e21b4dd6b8a54bceb47035d28bf670e6e81fd0939630b593912d77eb5
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
-EBUILD clang-runtime-17.0.0_pre20230722.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0_rc1.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-18.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230722.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 67b42357665e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 bd30fe1111be..188c97dde5d3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -14,14 +14,12 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-14.0.6-r4.ebuild 11942 BLAKE2B 74f901e40ebb6d9daa56aa59a24b9cce51c9c6584424e25011368d516ca7746fa10a3e08ec5a97dcf1b95be503153c32bab878ccd8346f7f8c1bc546c5a5ff62 SHA512 9c43472067e086137be395a73414f3d42d238d0bcaf8facb5fcdfefae16bfbb4319b64eab042923d181e5e6c37e327bb0b8394e11bc45e2d80556b6a0a596f34
 EBUILD clang-15.0.7-r1.ebuild 12617 BLAKE2B 780db8dc3c92efab35280d32f6b7d4ffcea912d7839b995a18aa603d0cf59df1199eabd53eb5a475e67da7a45e10fdd08e9879b871a25672f135dbdb001a5f46 SHA512 f6302415c9a4fb8571613ff5ebea4096f1318333ba4bc0f3c0b63b04eb0d10755c4555f55186875db0d34bb5d2c0b245b758aff387b97033bc643a1a291d1195
 EBUILD clang-15.0.7-r3.ebuild 12548 BLAKE2B ee294ceb058c489007ebb5b9f6bfdbd8fe0f5f77d32c1f71f97aa29ae2bb8234df687a931bb88865f8c5684121623f288620e538e2778dfb8f4fb3f900d14c46 SHA512 0e31baf473cc77b213e0fd7b8e1817439d9f8c94130f388fbb49900306378491b4715a3eab533ffa94e88c91b7e8a9a9303371a73e564df8a5fb2b4319765c94
 EBUILD clang-16.0.6.ebuild 12462 BLAKE2B 532fbc03f98a4135371238de3f3d933ac321d4ecccb1e1ce2511563a6529a7bd55444dcdfa4b46140b4b592e1174d534be82e9b29fb1161522253e25c86f75fe SHA512 6e2dc62b7281caf5aa2378eb19f8c24023b62814be4f82e678ee8b98f92cc032de64d5feef0f29c7512aadb34a16b8f50e05a8eadc3bf6663f71504045ad3822
 EBUILD clang-17.0.0.9999.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
-EBUILD clang-17.0.0_pre20230722.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 EBUILD clang-17.0.0_rc1.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 EBUILD clang-18.0.0.9999.ebuild 12066 BLAKE2B f8a467f1daa8688c5ff80977800fe0368b39d0c6061d3c790597d4ffb791e96f40013030ce634ab0a38972cca8f79562121ab16f8ecc31ac8a8ad6a283efe114 SHA512 df09fadd53294456b3ecd05c226647195731d3fc787362193c9f5c929aaaa40bc8c1dc02cb8d63eef356f54df271c3fa0a73c4910c9c43afd06f2bd7ff86d9c8
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-17.0.0_pre20230722.ebuild b/sys-devel/clang/clang-17.0.0_pre20230722.ebuild
deleted file mode 100644
index aae7c602232c..000000000000
--- a/sys-devel/clang/clang-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 9f1e97c271a8..63868efdd724 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,7 +1,7 @@
 AUX gdb-13.2-fix-sparc-debugging.patch 4736 BLAKE2B 1c6161bca2b29cf035e68231d1c44ff96fead25c6bbaf39aa45daa61be8672b61c7375980f200bdc9787405bd61708b5499764708c4fea6ed41370f9f0f7f18f SHA512 9bb802ddc69fc8d3791590948c4283492665187c7d6eb44bd646176eede2fa1a743e36aa3aba9a60229b2baec9d1cd2ebce1489f84c197694d1a19f48af0b590
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-13.2.tar.xz 23664644 BLAKE2B bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f SHA512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34
-EBUILD gdb-13.2-r1.ebuild 8696 BLAKE2B 0b252de36c3ea0cdab9a651de07ad6eceb7918f763f8c356a86809648e37e171d3e276a8fda0cf103014974a8ce4681844a2ed269d28d77b8ae1399ec3bab36a SHA512 2823125ebe9a6ac9bb4a1658c702ac7ecb034514bce444920d636460b751746544f592ab00dad9e0f41c48e4ea22685de76fc749f76bb85fbcb69e4cf4f27791
+EBUILD gdb-13.2-r1.ebuild 8695 BLAKE2B 2a3b6bcfde55f6721f2e95b71faa0aaa8d71fd24df2bc11f21245d8b94dad339a619734a2a4860e37a8f04cd2194cbd5b07c83bacac6cce867cb5198c8737358 SHA512 6a466c782b2d5787e8a32656d87ee906706a65231721868cea910b3f2b572f21f642df711230c8532f7b5c1d237cd79daa0739d10e8501d05ac66a72ecafa619
 EBUILD gdb-13.2-r2.ebuild 8658 BLAKE2B c892f7dcee1a95cfe40ba350200b673157d949d96cf81ce95d731e68f4607ce26276a6d1f706748c368a93ed7ed2babc2a1922e3bdc03d1dfce608b600f4eafe SHA512 a4120810b9e2278f399dfe38fb8a1fff945e58ee3e2f9e7bf11469b897cf2e7aa137fbfed3e8e9b6ca4fec56b31e386be825a4911b4d22a4c7d75f66f00f0ffc
 EBUILD gdb-13.2.ebuild 8648 BLAKE2B f5d2ab303fb9fbbbe83aa34627418d9d68715336b2ca4dc7a599e978dfc5dcb5b4c514fba37ec7c8dbb3dd74171a2670b232379593612f1e7f691783b1d7f9af SHA512 9fe1903c5705560be32886cb590454e93bb9bd0f5ad0dbb67379c728e5693b3535fad78dcccbe84171da06317a2d07260c354377f9cfe65e9a74d0f125cb0c7d
 EBUILD gdb-9999.ebuild 8612 BLAKE2B a58184c3ef73ad5617299911d0e673bcdf01ff558a781210a04701f5775bb53f3b4f5664474427ac4b7ef7b97cc98e1270bd33d5db8a7e4aeea6c5259296a1a7 SHA512 7269319e63801048dd10df53eaeedfcb26eabd1051fb87d47ba5e2fa3cbb4a63aea33c8ccdccd95e213e9b1837aa09f7b583766b04cb62cefe2806956cc83765
diff --git a/sys-devel/gdb/gdb-13.2-r1.ebuild b/sys-devel/gdb/gdb-13.2-r1.ebuild
index cbebebd83176..83b9a838d200 100644
--- a/sys-devel/gdb/gdb-13.2-r1.ebuild
+++ b/sys-devel/gdb/gdb-13.2-r1.ebuild
@@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 56178fde1eb0..c4d97f33234f 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,12 +7,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
 EBUILD lld-16.0.6.ebuild 2257 BLAKE2B 2e373b90d8ae4ed4131b05eaea51c909705e1132acdab1e21ad2152e66fb18b3caaaa83e9bb64b47f34fdd1ddacc7df622c6e5397c38765d9a2535db59071eba SHA512 a3d75597522d6790257b04fedf41512ab5193f78303efce2d74f03d91910ecb56d60142baa42f27e42759f7e5756c2bfaf394b79c563eb2757b6b23705b9d791
 EBUILD lld-17.0.0.9999.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
-EBUILD lld-17.0.0_pre20230722.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 EBUILD lld-17.0.0_rc1.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 EBUILD lld-18.0.0.9999.ebuild 2158 BLAKE2B 8688bb182c4483ef12b6301f9b77aecfa481cac7fa9b0fbf4e1851d0362fc01c661897e46955c956366c9e4f689444f20fb9fbeea275fc455d0c27023ff22fd0 SHA512 9d3383bb3df2f87dbc8a269c0618dfe5248c42ce0394b7499cf0fa8422fda471014a101b1d8dc910922374b68662b3c7ca1b0e9da64454523bf50bd88d299f98
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-17.0.0_pre20230722.ebuild b/sys-devel/lld/lld-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 085543e50762..000000000000
--- a/sys-devel/lld/lld-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 715b6ec2b596..8ce28948fc91 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.6.ebuild 608 BLAKE2B 0fbd471136d4fac398c87b43a4dbbc939c93a54336670e4a58022a32f64c92a78c273746edb9815f733d1fb58823864be7e621a6f1adf441a6fba3c06a0e652b SHA512 fe4b57e1e9335ae3957aed622cc1114677c4b7d33637db85fadc1fa3a09cb02767dddce5b2f84f45034cdd119068d69d35530db996ec1ac08966d86d494cd2e2
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
-EBUILD llvm-common-17.0.0_pre20230722.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_rc1.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-18.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230722.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230722.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 644c54d49535..043f58b29635 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -12,12 +12,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD llvm-14.0.6-r4.ebuild 12313 BLAKE2B 2369fc43e915e41fbb62495870e8cbd2d9edd94867eee5d121dd5b9b20fca6a2f5a1b2b0372042a9244be1127ae3ac53ef03f1a8298621d30746e1f932d7045c SHA512 57d12cd942e26e45b70f85e94a912d39759aa65a5232ca17db30e2316e47e2f5d9cfccd37a8e095497b76b815e4899f76778537a3c1586a2d459a36019765906
 EBUILD llvm-15.0.7-r3.ebuild 12486 BLAKE2B 1c62b4a9f7493b3cf9bd2ca388d9c09da2077a5be4b19dba2628352e0524e37df1e3481cc3e0658d3ce8eeb81fe7b4e379be7d5ba9e20a60376616e5a38f6264 SHA512 d6eea0d3330e29a4a27bb758cb5abec08b35f5b0d6a9bacfeddcaf031b0c125ba9454d4eb77a65fe6dd5b379654dd895d603e0a01008b57476502be82ffb392c
 EBUILD llvm-16.0.6.ebuild 12510 BLAKE2B 5b5c8f9fd24e31c4e84ae4b805823cc88d3d8d7998d7de2b4920a3db619b400882e25313cd87a2e6c34f31bf6e210ea20c65a915adfdda94c368515ca36a2259 SHA512 4ada6a4b029c43c988efaeccd88a3772c52f2a476973777b97a4238591199a4bf0696e6a7b7d484e3af1c6eb772c2594bb3637962b1baa23d1b91522f4627c5e
 EBUILD llvm-17.0.0.9999.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
-EBUILD llvm-17.0.0_pre20230722.ebuild 12690 BLAKE2B d893c2d895dce9ceccb53a848ad3c242febebef21a3d261c36b18664876453470c4cae04ac4707777178f06799fcd6b0645e688ff385ec92382c5008a7328f8d SHA512 3f0de58fd4d9af36675189a26d3f56c85f062f03c65a5f0ae24ffb1942458fd4d4c89cb28e033e0aa229a8affa65e7d8b7326dc6ddb64cbba49e775495c6fa29
 EBUILD llvm-17.0.0_rc1.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
-EBUILD llvm-18.0.0.9999.ebuild 12688 BLAKE2B f0bd9fbe40fd4a4f4f4195b8466cf7a140033038b0777ac0bf296d80d0f3199b0aa82eba7f1807bc9a9bc16480751fbc801445afb4968043a3681e3bf6420ea9 SHA512 baa56c55ac24f1d9cfc62c9fa93878b9c24b9877f4958178c548187f21496221a8193d61e079ccc04b16abb82030f7ffdca27a7d567f02e72286ccec208b8010
+EBUILD llvm-18.0.0.9999.ebuild 12662 BLAKE2B 197f93ba73d9a6083c9bd9014199183dace77ef12727484de5c685df5530e4c24ad894fe3e79f4061684a5b0adbcdb49019b367161666c2567064ac1d8a09481 SHA512 d7a356937690a0cfd1c8a8a59f1c513b591febf7afd77a798211ae7f83d3afbaa31f6939e152529ce3f0848fbd141e08ea741b77016ae5d405f7ce7b00520937
 MISC metadata.xml 2782 BLAKE2B 4bd546287f630462c3f5d98cbd15a59a4cdef4023f86a5f4fe64fc5f10256cae7014d18823bd0909f4af4e42f299b6e7983c9c3c569cfab1ad38b0160f1eae40 SHA512 6bf1dc4f71f50e1eecc55cbb8366d8ed82a3dd328871acf1d808fc5e3ee4d203d623f81d9968bda45a87c72a2f20ed69b735b0a289b0052b048175cf6502e124
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230722.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230722.ebuild
deleted file mode 100644
index dd7be5a60d95..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	ncurses test xar xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_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-devel/llvm/llvm-18.0.0.9999.ebuild b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
index 3b29671ea107..8f7c0ff09445 100644
--- a/sys-devel/llvm/llvm-18.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
@@ -287,8 +287,8 @@ get_distribution_components() {
 			llvm-rc
 			llvm-readelf
 			llvm-readobj
+			llvm-readtapi
 			llvm-reduce
-			llvm-remark-size-diff
 			llvm-remarkutil
 			llvm-rtdyld
 			llvm-sim
@@ -298,7 +298,6 @@ get_distribution_components() {
 			llvm-strings
 			llvm-strip
 			llvm-symbolizer
-			llvm-tapi-diff
 			llvm-tli-checker
 			llvm-undname
 			llvm-windres
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index ea30606e87dd..e0502ace8504 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 0123b001621a..a73ad3526af0 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -7,5 +7,5 @@ DIST multipath-tools-0.9.4.tar.gz 554381 BLAKE2B 297f002e23312415467d8c4935da3b7
 DIST multipath-tools-0.9.5.tar.gz 557469 BLAKE2B 1a9b9b01c28c8a4e9d4ae9bc55896cb764308f5118ac2f8c983163c0b2e49c0c4a84536c7edd7464a1bcb8ca6aef92452d5c25d4a1d9d490e0e3077b10462171 SHA512 39c2e5d45542c6076eb3b17b9994629b4c1f74347aa43e0119001fa2d07d3a606fd5e617962906a11b313afb37a115bd8eec2ef24447e980e61b5900625f9146
 EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a
 EBUILD multipath-tools-0.9.4-r1.ebuild 2003 BLAKE2B 392d31c886e8ed95d49de4cd7d5015ad65b74a582f81646601f83cfd67e5e6d69044752c6da892929fdf245cc90cdd5bc7254d192159872810f4c159749bb7e4 SHA512 3a513bc65b4d13cbe759b53a7d45cd51deecca962d8c2ce1f1a9470736efa2041fa749fc6739c0230eaa34a5d761ccb34bd63f579f453d8e165b58248cba11cc
-EBUILD multipath-tools-0.9.5.ebuild 1959 BLAKE2B f585874ed5eb5b09f3fa1244e6104594740102f30157a379f9735a992191b019ecbdde4001c80c4598f16ea8956fa08eb486025a826c28dd6d25c1b32b29eb2c SHA512 9339b8a6dfaefe4c8f7bd3937ef70e16aac2b408242a7a12f60d7434d3d7edcf796c821f9fffb95a74704cca8a71c2f534ee22d8eb2dc3d1a68e5ad52a976cd3
+EBUILD multipath-tools-0.9.5.ebuild 1958 BLAKE2B ad92406184dd7ae8e4b01ab941d6fbb338178d5a2a213d844694e3fb8647dedfe4b91deb004a862d62233c7fa67012b314ae41cff9d917f6cc3e8943edd588d7 SHA512 c34061223a5f1e5e9cf39ef329a1a08f1ed25a8e7829274f2f0a32359787501eeaa63566167976f6a1d427887fd14b579185f59f9a3a05f788f004197d7af6e3
 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
index 68a0ebacd489..95274e758853 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 85328bb488ef..8b981865f58c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index d44c53e6d1cb..abd09540c78e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -25,6 +25,9 @@ DIST genpatches-5.15-128.extras.tar.xz 3932 BLAKE2B 64d34eee4a4ee36c8d2431d83417
 DIST genpatches-5.15-129.base.tar.xz 5079636 BLAKE2B 9dc533ca9995f272c9f69c277e02f028cf04a1161b6ff18082dc132861549bf9a297a99768bd779ccf0c5ccd26e2bae321e8e233986c23123b3fa549f47a4c35 SHA512 43fd5a4739883915187fa04a5c04e106233ce8e76492240585b6b7dca8f74687c8326117383f84f8d4b8fc1de602b2a9aedfa596ce5a1275777fd15ae0f7a142
 DIST genpatches-5.15-129.experimental.tar.xz 5420 BLAKE2B 1a20306350568f4d08dc5320a8f33c816606ee8428149e653a7416b6d65e4104e4193f3f63fdfceb5252938cce99272bb4a7f15ced5a5ac88ad20897358ae9ed SHA512 3cb606f6fb43f42157d2b28de66b71461dd02fe8c436abebb90b6e1ce1c5c6a0ca80e6d36d708e959d06be4fedd0929bd8233efac0ef1034de85cd797ca386d4
 DIST genpatches-5.15-129.extras.tar.xz 3932 BLAKE2B 899d47c7df1aa674c6438d2e0e5f70aae7ff0be55ab663d533191721791673f60c90a00b8b42167d99e750a428a65604af84f47aa385049ac91b6599db547b72 SHA512 ff342b8a47ccea5ae86bc4a499a145a331e9c5c52f2ea84b1baa8b17e11d5aa6504fca9d594960c903cbaea65cdd53aa6e634128296b0c76cdb6d4e9bc9c1ca5
+DIST genpatches-5.15-130.base.tar.xz 5153200 BLAKE2B d06514f48706208faec58f2a0f15da99e6e5ca6e311678b307f1734d6d0bc1f86252c6a68f144fec10298e05d27bdcc9d2f09bc2be81b2afb0c2cd2c1cd42d55 SHA512 21943da272b5279b4b85a1ad16a05b6ec21157adf6aa925d97d3ad34cbd46f084df7ecbe6519915ea9ed26de47312aaec92d2a76c30eb5b8da1289a4e3f34d28
+DIST genpatches-5.15-130.experimental.tar.xz 5424 BLAKE2B ef01e053d0aed4b8b8440856d0a43e47c21f55b3cc13e2d62c1a2ecc105372291a700e3f759dd160e40a2fc8af9e27889210b26584b71a2b43747946fb4fa6c3 SHA512 bc15f769b8ee2b0b48ab798d715cb17d911923d50be37355e773dd693c136f0677cd3a77c8be41c9f11d245ee6a895be13b41ce23c48f545a729d4518394c46f
+DIST genpatches-5.15-130.extras.tar.xz 3928 BLAKE2B b4b1c6d6ff12356679a50263b39108cb8f9123baa6a3641a33d102fae71fcefb49303582e2509884183c251dbb4a5cff3183cfd60122ed5ecdbd859505bea6bc SHA512 3f0ac344f138b8f7bfbf136a814c4fa3eab7740657cb9b6284fbe6e0465dbbd4c0d411db8cf8621c53f91df05acc42611e5948d9b6b56e75e8b9be658ac555a3
 DIST genpatches-5.4-257.base.tar.xz 5959056 BLAKE2B c3c4f47328f4e3ade669e1cb4586a2420618b647fe6cb5d96210cdb8d5baf767d6eb6d9efd4ac48eadaf0f2b108569656c43b2b43a687b635daf9c91475491a1 SHA512 1231ad3f7ceb0451d9aa5a96be803eb48a5656fe63476ec55ccb71a96eadd2c12d2e44074b302b9c2770569abda60275c0ed161b3786d2dd7be6b0a49d4e4f55
 DIST genpatches-5.4-257.experimental.tar.xz 16904 BLAKE2B ef6366a178627998f8e1c73665ffcb062b9c28ac9ad05910f70faba7b24a7eab10869ab71d41606553d29d05d8d7814d132c8f8fd936ad7416b5bb217a2e9217 SHA512 4a05286bf9297092dbe776d3806a65042bf2fa4d22e3080381a506d2c1d2bc6c8f502685d59372d53868d55f426a1d45a373fcf560d9f25fb276b09841954947
 DIST genpatches-5.4-257.extras.tar.xz 1812 BLAKE2B 480e82ea79feb52785fc6643c883093f42240395a1d953cd1e5331c012cf64c6f4b292e878a938a9c5bb297e96ab9f80656839de6044c9f1e76c668c2c8e1ec9 SHA512 5322116802c6c0a44abc81911bb83fd7d4aa5b5f7fb4bb35ca78c47c6c0afb188e21a24cc5ac4e2810affa13689c902e97062d66a751630cf0722a2b28b1d83b
@@ -37,6 +40,12 @@ DIST genpatches-6.1-47.extras.tar.xz 3812 BLAKE2B ea44d25a1637abff3a87ec17e397ef
 DIST genpatches-6.1-48.base.tar.xz 2983620 BLAKE2B fd09d2c761c3652502d590ad189db668a27d48e2c0c336b1d2e96f9a90a3c365409d012319b6daff30e6039330b90746636e89d6e4f5bb302851b3ced0e57286 SHA512 5abc93002ba800f13d27ffa8bd9485cfb921cd8e43d4cc15325fa2b833eb334e062cbb9b751ff2fa285a7f61f0e0809366d58fcfb4fd4a71fc08f2e48669b5cc
 DIST genpatches-6.1-48.experimental.tar.xz 83360 BLAKE2B 0423a5bcf422597922c09b40e654adcf70b5d38b8c790d21e8320003a97b1722caf01d2ef5d20ca831e1d26c2091fc478641c4791a3fcef2d17d20e065bcc5d0 SHA512 c79accbfc263bae3df02de5939a82abcfb60c59bfd0621981703d5488a44d393d60d0621ab071c48b94dca77cc2601e0190764bbe043f2ea804954d1929e13d2
 DIST genpatches-6.1-48.extras.tar.xz 3808 BLAKE2B 5f31be220d97582f049f58f796f0d509c1d2c82ca41efbcb178a9f78db64e0de0d0297096a6109c4989777cddc0957fc8efa7caf333737157a4b6352aaff64bd SHA512 d37be3695cd96f3226265c4f689aef9e98f0528d34b554e53e98fe9497e1b8a26ebe2661d8a04e9c84a615e1bb4966263358d759d228c950af3ce70bf6340e0c
+DIST genpatches-6.1-49.base.tar.xz 3063788 BLAKE2B d97aa1abfdba4aaf84d392e5ebc26822a1651fe0249b3bd84f4f5f2c413955d9d216bc1e9e2e2ef388e7aad4153ba11863cdb7854cd2cf1dea478da3ee8c065a SHA512 7acb3101165cf8f4beee7b80880510a5ce4afe0148641c7edad91cd6365239b52b55a51c550408ed0291aa3ad74512022ccb6ef85c6ae8765a0ff2d49ac84bc1
+DIST genpatches-6.1-49.experimental.tar.xz 17464 BLAKE2B b4209960b0cce4854e0a22902f2d77b92afbf13d6f6c344936faaef7e2928e0c154c6aec43230756b6b119fbad558c16bd9ca1b1dd3f8f9c2eba78de50ea16ba SHA512 aa7d381e323f47ef72feeb09db629ca8104ee0801a918851353f629689064b88cb6ef552320b013e0cb05fab2deea32095ae7d3860570c92c833979435169886
+DIST genpatches-6.1-49.extras.tar.xz 3808 BLAKE2B a200e4d646d8b99db4a5fde73ae51727c475b18b9f080b3d55e27d4b6f247cc8950f772e0676cfb11d301d3a9042e929d4957f96de0073bc99ef65c53668bea1 SHA512 4fc28b57b4a99ddec743d3804a78a5027d9922641135f1995016f2c5806282f0bb33e9f78cc7378ab8388b582193df457a6c397b0986e197fd5e5cc4bba85c7b
+DIST genpatches-6.4-10.base.tar.xz 568848 BLAKE2B d9f28beda8bd4f69e1e5d586e274df43a8661bf51733a25f320469c1e3e42d9602b0911d4e98a40942ff182f076501ce6721e534cb92aefc3d453fc43ee499bb SHA512 218c38f99a07c2be1fb25737b0a9604a9a50fe3f72c507404d92da1e8dd7823142edc2b81110e510aef7e645edefbff2265aeb3ce7f376131801c3adb292b8d0
+DIST genpatches-6.4-10.experimental.tar.xz 5756 BLAKE2B 5c9c275f12bd6476dbfe388093497005577a08d6c88a04c27846500d517e9f126f2e60bc07f91f007525d0efec04abdb7fa96093130e73a22729697d399aed72 SHA512 1453bc5615c687522b9695951ff023771c8743ebadfa26f0f6c96ad65d16c78d333b8f2d3b30e4f422017b2e259b1839b31a5d880de4adaab053cf8bb42eff93
+DIST genpatches-6.4-10.extras.tar.xz 3696 BLAKE2B fa0b8d593543f3624b1cff626e2cb2dc93ff0e88fd54ec71a7e467c716481420da7f361c1dd353e36111425a74f6632f1c491e618dec47fa4bc15c6a6d9e26bc SHA512 9dbfcd1d65daca0b56360290f0a6369fa007f32dde0f1a62657d1697fb50b84668e8a14c62efcfc3d12ba6a4a911731825df260421506639d2ba9b8764962e87
 DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729 SHA512 6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0
 DIST genpatches-6.4-8.experimental.tar.xz 5756 BLAKE2B 8df6d8d1e724ec77bc8b54f19faf276cdab44b29e340e30dc464c6e5206c30a6271040956dbdfd89615ec48efeb90b3a2dc96fdeac5e2266364e267ad2c4319a SHA512 177e197752cf4795ac2499fa1a337744da068dfcb1ff7409383206c23f683372cfd4fe3747f882da4b38b27477502a73d3ea01b4e6ab30b1327f6d8737a77b44
 DIST genpatches-6.4-8.extras.tar.xz 3696 BLAKE2B e1d121a35ab69fac09e935317c18299817c65867fb7cf7a6810f560af913a254b411259a78b61c0a31518629ad33e13e53910fbd9701602c733016869106e088 SHA512 11240038d70202c53ee17763de3f60fcb5ae0dffc8cf005d324a7cd15a865313b9da2a3e74e184090b2d674ca1a1515a1db9f2efbff7a0f5361563fc7895e87a
@@ -59,10 +68,13 @@ EBUILD gentoo-sources-5.10.187.ebuild 741 BLAKE2B 54a4fe75d641f4f28adcadf2404c17
 EBUILD gentoo-sources-5.10.188.ebuild 749 BLAKE2B 937fb2976a3298877b71b88c97ab3f57f5d48e2941160ce9f7c155e0c2d7614cbb8d36a490633d5b1d2a075c917c844e1ed4a463e82d9fb8d8d4255c478ac943 SHA512 0aa0fde8952210187e5c47fdac93bd58dde7ae8db9f499cd9ad07856a50289a03985802f9f758d1997a60416ffbec4a3ab86280bd8d2a1b1e0b11020beca9962
 EBUILD gentoo-sources-5.15.122.ebuild 741 BLAKE2B 4243cb93ef5c3a805fef078584d4a9744e6c78494c0105e5cb329eb9ffd40dd494b71500a07ca5c54c1ee3071bc32af0df2ba61f6f9a90919167478db1bc432e SHA512 3b8c904558de51408a6e2e4ebda3585abf944db7e4abeac97b27a6b127bd4b00dce370722c56932c016a1f953c7e0cd7fc97f2268eec0c3c00705cb4cbb207b5
 EBUILD gentoo-sources-5.15.123.ebuild 749 BLAKE2B 09955fd39ef455aa3eca45cdef13fe10fa871450579ef3843d2b42f674601dca861d9375085c301e622ce7bd8e60032bbd9fecdd0c409c4f45191934d849f5c1 SHA512 02612c3b957ff58151039ffcbbf004f59bed0f45b0f2edd2eebf258955c454fe4e21dd47dab4e4df02301225844e3b3d31157668d50536ee92e780f62948a947
+EBUILD gentoo-sources-5.15.124.ebuild 749 BLAKE2B 7bc54afa5e4de9c64e00d9c0fa17efa31d2af2c536da6faf19e95b9ef45a57e6b674580cc784e149db768b6a2e30d8244b89ad53a4e61cb458fcce5be36a7930 SHA512 209bfad4d52b19c1239f50682a86bf797098a274affba6c545eb2c35f3b6abb3de326d33cc2aeb79ef41d078f19f692342462c16d3361ba8dd46e7e2cff11c41
 EBUILD gentoo-sources-5.4.250.ebuild 741 BLAKE2B f3b1aca87a5f9ef3b7e1f71a27b59fede13c231942e2b32f7f3917edf5ac9dac01e6fa86c6fc8af9243e2b07bd0a24cd8072f1efa6a7afccee527b43a28a3176 SHA512 dbf77194e2f4d7c788ea3042a2445e90aa7f08e0fe5b698f24abfef1d55bd3859e71e178bdfd9bc1f3722d6ac7f57a7af6c76d4da6790ccc9a8764d523233a49
 EBUILD gentoo-sources-5.4.251.ebuild 749 BLAKE2B 3ad07f5e323bdd2c49d33029ebc800e838e6ecb777c92a3b293f79512cc4c615382a2ed81dccc3e83fe2c82b5f607a2f2beaa1fcee6db48b4a57f67101c32337 SHA512 b3d4be1d9bcdf6823e6597dddb26078e67c4df0556ae6784755bd08d410c7df165c0b425d3947cee2764f38a3f118d882f2b9989611e06820bed718bdbe42f42
 EBUILD gentoo-sources-6.1.41.ebuild 740 BLAKE2B 3acf6b8a5566d34de107e9277c6ec40c3c3abf9198a6c7cbd9d3c314aad4dccfa7ff6bcdb1b563315791199a022fe5b1ea9a552f7ce4c42fd56b42e810d0e7b9 SHA512 1abaf66397b102c5029f71697ea5f51b993b8f26c2565b302e4b64d62ff16dbe4ae9a3a531264ee0869a0517db0d2f1399b6bb57d3bb1497e2e06590bb1dd893
 EBUILD gentoo-sources-6.1.42.ebuild 748 BLAKE2B 11717015309f24d8a3d8e48ddc4e0505dc01e8ff4fa21215d8b666b0de8d7a9cb44258c526b9ffdf54acf46be21f7b8a6fd5e8df30d1e24fe670bc4ca226b4be SHA512 3de8bd8f419de6cb25900692798ec493f14ff938245169dbee751d28353baa3a7b5c02da3cacfec2607b2368f07df3d17fcc9cc5a768ffaf3308c9ad34ec0b95
+EBUILD gentoo-sources-6.1.43.ebuild 748 BLAKE2B 47f81323297c0fbdc0d86b20cfb66aad5cab86de65b11fafaf081a87fd6a0d5a246db16b7df794bf1c21c52774f6f4515f7e98cebd6c272197ad5dfadc3569ba SHA512 5ee323683f7de3c645fe2756be028b7037568a130aafc35630ce32f4efd782b5a92c688b8ab20d194c3c30d1faf13c95174e111d04701516b997e113b7c5b7ac
 EBUILD gentoo-sources-6.4.6.ebuild 754 BLAKE2B 75ddb6e2afc7441ce24603c9d4c6bf3f15e5174dc7bc31bafb28762bed2c0b297078325083ca8f3d3eb7b0ea83bc18197eb64e8b527a2818de91f53a5d608053 SHA512 0da5f47a973aa9bfa67c91ae9d826a26d7ec1a89f483aff830ec0ab5d9e89ee37015bb77dff85317010a073cfcd4c444ad7493c3d513252256be6ae13e80de95
 EBUILD gentoo-sources-6.4.7.ebuild 754 BLAKE2B 287a65a6b273311f53d869f2fa779cd15056f9bc5ff4857a0fa7fd465ffedf085f664719e9f7b82795f71ca783b05a7672c29d2454f4a2e4cf265ce956e4201f SHA512 de0a5251518112027e278357ac66be9b0bab494747047fbe2a82dae09ecf11cbc138f42fe765b8d2413990358c2d47b8ca2645437e3a7be6bad2c967911a93ac
+EBUILD gentoo-sources-6.4.8.ebuild 755 BLAKE2B 5dbefb3a1eb2141a90b445645ab173946d3353346b952f912b9a0d589ffa441a62f2add71d080a36cada0496090895fec5d39b4814bfddee288ad294bada30a9 SHA512 e0dcf84b5d80041ecff19b0c97fe81f4f2ba80a52949b3803bfe62ba41a55fa0e783af72c3972a7cb02a96d2e73753d829ccdc351970230904ebb3bcc4fd47ab
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.124.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.124.ebuild
new file mode 100644
index 000000000000..552712da4065
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.124.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="130"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.43.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.43.ebuild
new file mode 100644
index 000000000000..51ca7d333305
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.43.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="49"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.4.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.4.8.ebuild
new file mode 100644
index 000000000000..ceb323b036cf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.4.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e80834dbb60a..e20a60b28c0e 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,15 +8,15 @@ DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb85
 DIST patch-4.14.320.xz 5193412 BLAKE2B b01d0d1f932cdfe10dd274a223c906f67bde57c8d09369f18ad5f62ea73cf35cd75b87a54e75df5b1138477056b3a08db818ea16ba8b2fc06e367df8eed08ef9 SHA512 1e9059966448f34c7049e99d13f29bd77b67be97c1fb3f98d2978f7f4a3780301cfb4f1ad5bf0ae56ea813a003ade2fa9c8dc4c53927e8022063f6c4afcd5d05
 DIST patch-4.19.289.xz 5477732 BLAKE2B ef0e20b6f76def5de719b9222883f51bc914c121962b801bb1835a72625f9b9bdc2d6b7ad5a288af1a08529e26e21c509ebf43ab9f3fdb95dc2fdd0df2d6642a SHA512 d1fe948830ef5e9dcd97a15facd1d6865a3e9ef5c2d10aa1b2b3681641348b4e62b62b0a56fd7484572720f13c70d8035972de7f244f29e98f3103497cbe158e
 DIST patch-5.10.188.xz 4937420 BLAKE2B 634f904f6ffd4f82619b412d0d59d6a9ef4dae031b16e7dac3858e06e83612c23939e6882ffa7ead3e71fba08ce1c0cf10229f58013d19497f4262ef73ad5684 SHA512 00f20d81e96495f9274a5f3cb2995cc37362d92bb5bbf1727db2242363ff4b284cd23d8e988bdcf5bb103cd0c75fb1c03ad40bf8b7fbe10446bc671871711e95
-DIST patch-5.15.123.xz 4455512 BLAKE2B c0fb3b4d4f1e63edb630a6cf4cf10cbff9dcf8510d7a0046d1794e778a33c464e3fa0eaba91d6dd7ef7a8df5252f69f773bde317076359a3444166676bc5dbce SHA512 778f449933235a2c526c3957e6dcd17a8bc0695842880398bfccd2008bc1d508a2d1cd7275edd4146abaf000af8959ec54c54a5c6ae38fa934abd1b4757639ab
+DIST patch-5.15.124.xz 4517296 BLAKE2B d376cfa3911d67d9353cc6f71aa7ab1a511d773ec9fe83e63e44add26bb09378dcb1931776a590ee0262f50057cf20b3dd431b201d0ea5caddcf4173bdf1db55 SHA512 2b4a94e8d9cd2c943355152f2b116a89ed9ba3753a8e59e64c2aa3dd1e27a996d5dc1f202be7b33ca05c539be5c34f77700b5489eaeb7bca4279b58f988c7298
 DIST patch-5.4.251.xz 4998536 BLAKE2B 33d1b3cab4ffd5a2dd356bacfbc8e332a2fb07703129f0523e409eb755bdc0e4c8106d01770d4217b786c0c133193fb0855b03ce0e7000fea1f98f62cd86514d SHA512 616e0780d84536dcde9fe9179ea0018b4a63dc94b24d0c5435e93c389d3012c9d12788a459dcbfef2d71872ddd09a2ef3c70a357d327f1a9c61a713fe0d27a3e
-DIST patch-6.1.42.xz 2779980 BLAKE2B 5b09242e890c605eb23554752153608c87ebeac4994e1b4fc57db79df3bec41f5158898098521003a27a228c2e39ce2af89f283defacde4ca87f1c5937246c97 SHA512 ce9150df4b7025848a77c96245d3152e43cac1dc1d0f5809d848363ebcb2f7ed7d332c938756c1428eb3ace4af1493c264c7e50e09a09802c7ffc99c33c4d6d8
-DIST patch-6.4.7.xz 475848 BLAKE2B ec57048ac66574e89fb80d6eea3377926e5822d104f2d5f5e751b3db64463961a05409b2f4df886716f66c20adb94f69473a44552f1091b6391151e57c4a2b3f SHA512 529268873268d0d5ad9e30f780be27fb1e8e16d2bf7798837ecc66fc6f2974069b84d54b3e722fa2dc703d6215ccbc9c0bb9d2f5d8ff27b28cc85b551e5bce0e
+DIST patch-6.1.43.xz 2844644 BLAKE2B 6b9ed407505a9fca5b16c1a84e65c56d6fe9f3275f922552235da6f85016952ca660fb599d6c1759fc43d6a889a74b2ce0306b35971a9ae510b7a31b70340156 SHA512 0b142e16c4a52ccf1572ddeb333a33d67a6dda46744e3ced18248e11fff4e5edcc1cf5173cbd6c9c3cf28e1dae56a36230ccefacd6b23c4cfc94a976a3803480
+DIST patch-6.4.8.xz 557416 BLAKE2B 54327796d297aca9769320ab73d70cbd8b35c6fc3c21b751ec5ddf47a6300452e1dafd25c1998289f557aaa69a743ac8a324f7a6f0e6f1d0300c6020fbd75dbc SHA512 f2a87a5c8d812b3147af2ebbf52575505e06c13bd7d204f28d7e763e09597ab065c63b9ee063915ee876d71f1a2727dd5b9922ac219741021ef98e0c7b4f6d77
 EBUILD vanilla-sources-4.14.320.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-4.19.289.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.10.188.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.15.123.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.15.124.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.4.251.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-6.1.42.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
-EBUILD vanilla-sources-6.4.7.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.1.43.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.4.8.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.123.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.124.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.123.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.124.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.42.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.43.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.42.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.43.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.4.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.4.8.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.4.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.4.8.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index cb6e8763b0ed..c253e3cc7364 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 ab9bc5d16b2d..db311446678e 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -8,12 +8,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6526 BLAKE2B 371b7d7bfbcacce1c04cf039b15f49bf5c8fb7de0352c4f477b92d1efe0c70442770ec0c6b60572cf5877b5c14492328cf727b2aa5c1dea761eb909aa1e1df6c SHA512 ee1f054abb9954eedd5b098afb1eb741cd2d7b1b329ef66ed3f25f8ed050227a31925852e3d893b0a9913e2ef2ac34efe89c66c19b562c586f7c0352a10a5814
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6578 BLAKE2B 79b9477f9f426c7e5ffc07fe9e2abc86ee568d8e081ac5e5e3da3e3e169920fe8c0ce34f9a8ac03a4389f27ecb0b0ff7f5cf91622d614e03300f17ea97d20859 SHA512 9d23f6974edbe69e5d9fa53a3885e8e44741b5e5d90b0e72c6d191b70827d1e590a7c5a3373bc4fb4945a50db0eea5e119baeaeea956c6d92bb087410ce919b0
 EBUILD compiler-rt-sanitizers-16.0.6.ebuild 6546 BLAKE2B a57ff221344f88afa92722a883c5c5eec064b2a9691f2262e633914a75df013c295352b1b1fad83b7fc7579c7d59d6e0f04bc63e1f27556e950438f5f2e72fe7 SHA512 32641d64f2a370bd4b907ff05ebf975d3e149e9bc6372cd60e46ef04463f374984a62002cab76e58acee31f4fcbd0138749bab5c5aa1afd29a8713083b90a402
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
-EBUILD compiler-rt-sanitizers-17.0.0_pre20230722.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 EBUILD compiler-rt-sanitizers-17.0.0_rc1.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 EBUILD compiler-rt-sanitizers-18.0.0.9999.ebuild 6250 BLAKE2B 0166eecaea9e102e761ff0f82deaac5b37cfdc534b1a6262f2e839c9971ea41d4c6123387ef6bf09ee98fefb6cc40aca4d6999378568ed831224e0fdededafdd SHA512 a61cc40f865d512870a881d990f5908c28c9dfa85e30eb5b80aff15f5dcfb8b190cdb9c5e66a57dbe1ec2943412a7600660144ad0d2bfa75c654519fc34b6380
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230722.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230722.ebuild
deleted file mode 100644
index b0a49349926b..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 68c574a4c3c1..02c0d74851b2 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -8,12 +8,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 56b00f1c57cdaf1cd6dd7f15e13c714461001c0c2fb25e565c1677745e3fe6e61714e2f037814fef3eb32ef6866d517c391cb5f63c852ed132d74b1b5b7ef393 SHA512 31cd40fe6c58a6a653d36e99586230c7686ccb2bcdfa1c8ead4331dec2fd8dc53afc2a1e9bdf165dc5b4f7580c8cd25bc7a68acfa9c881fd775187bd82e28f11
 EBUILD compiler-rt-15.0.7.ebuild 4260 BLAKE2B ae8a86217b480bab08dc99d4c5a648bf99a0ef91fb41233956b4a5d1b10d5ed6b3c14d9c02c43e2c0b11dd19f4773ca995c113e48b14475b95b7ee7b821a72d1 SHA512 79da724a1d2483af0dbcc792d008fe994c4fe075db31c7dfcc64192005427137f0157e81345a4027e5a8ba9104f662bc51bf492bca96e1b46c35a44a1849ab84
 EBUILD compiler-rt-16.0.6.ebuild 4240 BLAKE2B 8d053fdea7a992043010ab0c845e9305ab302e52447d1ee9b30c673d4ff4be235db599c53f8d833029d738ede7e8cf23198f22912e3cebc417aa61e2840a51a9 SHA512 4c135eafcbbba3efa35ad550fe2e24e4e6102842ed96c2cc064970c1921be889078de88d65bb5fac87f223e83dfa508f2c033b3235ac50187d69826d2f5341b4
 EBUILD compiler-rt-17.0.0.9999.ebuild 4167 BLAKE2B b0ba171817aaf242be61a372747b538666f1c05010c6e086c8db6e5bfa0e5dc9394b35b7d5d474b4a81cbfaae74605518f5a4a90b45bec395ece0c48b95f8a0b SHA512 f78666a3aaead3587b14cec2af7def9fced4bb9a7f89eaa2888355c217243e1fde668154c2dcb2ed163aef986e71899003daf1bc93abfa3e29bd1db40ea75189
-EBUILD compiler-rt-17.0.0_pre20230722.ebuild 4167 BLAKE2B b0ba171817aaf242be61a372747b538666f1c05010c6e086c8db6e5bfa0e5dc9394b35b7d5d474b4a81cbfaae74605518f5a4a90b45bec395ece0c48b95f8a0b SHA512 f78666a3aaead3587b14cec2af7def9fced4bb9a7f89eaa2888355c217243e1fde668154c2dcb2ed163aef986e71899003daf1bc93abfa3e29bd1db40ea75189
 EBUILD compiler-rt-17.0.0_rc1.ebuild 4167 BLAKE2B b0ba171817aaf242be61a372747b538666f1c05010c6e086c8db6e5bfa0e5dc9394b35b7d5d474b4a81cbfaae74605518f5a4a90b45bec395ece0c48b95f8a0b SHA512 f78666a3aaead3587b14cec2af7def9fced4bb9a7f89eaa2888355c217243e1fde668154c2dcb2ed163aef986e71899003daf1bc93abfa3e29bd1db40ea75189
 EBUILD compiler-rt-18.0.0.9999.ebuild 4167 BLAKE2B b0ba171817aaf242be61a372747b538666f1c05010c6e086c8db6e5bfa0e5dc9394b35b7d5d474b4a81cbfaae74605518f5a4a90b45bec395ece0c48b95f8a0b SHA512 f78666a3aaead3587b14cec2af7def9fced4bb9a7f89eaa2888355c217243e1fde668154c2dcb2ed163aef986e71899003daf1bc93abfa3e29bd1db40ea75189
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230722.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230722.ebuild
deleted file mode 100644
index f31c17f1962a..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	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 c2a16d0e2877..d74b59c1466c 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,13 +9,11 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD libcxx-14.0.6.ebuild 6950 BLAKE2B f4f8068f1b9dd1a8c22abd4acb4206da1dd7bb4eb029723a2edfe8c5db3a6ed74a677ba00c508ff54806a33b60b131ffd4b9729ed0d6d0bf5296a1e53e2ababf SHA512 a602e45046d931f28d2656bd733823d3289a993acd7399c5cd29915e65eb9ae0cb601f2774dad34534299366ecd9c038488e037b13af8b732f254e561f56c592
 EBUILD libcxx-15.0.7-r1.ebuild 5308 BLAKE2B aeeee8aab5d3aa09f6165186eafe5bd2802105f763295d4160d81563779999fa03aca891474cd8eae9755ee43ec73bfb7ae3d9fa6d32c7c01040cc46f85858af SHA512 7780ac83f357ffc9d4fc72d2649b2996b7ba5f9473d75ab56e04ccff99a8811c4d14f69de4024fe6472794dc0ed267ee2f34b9430f4d8ed054c65b018abd1778
 EBUILD libcxx-15.0.7.ebuild 5283 BLAKE2B 09c43241bab7e5015d3dae5466e49fb24337b87a6925116056d4ad9baa048c3f23c61a5e93403addfa97676f733a04ef33cc9238fbed9a4abcf985ad8d939965 SHA512 d90583d3fe5724ed15a91c70241457e9120d848e9cbcce2bfb3f3932d9d36ef726830d76601af530e2e28e552d7ad2049dd74713eb54f6eca55206cb4f35f8e2
 EBUILD libcxx-16.0.6.ebuild 5311 BLAKE2B 6ce4c5d11f98384867feb1832a13f790f5e7a447c7d2cbd0d80ac415744fd880b4812ae29f23e9359223a67632e4f6a49f084a429eb53d324afd18d2fb10992f SHA512 c9a9ec7632986467001614271e6d721d08e6a4edd433284900f65f209a053911f669dfe7c5a7d86ba6210d7daf9fad5b10fbc858317393826aece8956c6b652f
 EBUILD libcxx-17.0.0.9999.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
-EBUILD libcxx-17.0.0_pre20230722.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 EBUILD libcxx-17.0.0_rc1.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 EBUILD libcxx-18.0.0.9999.ebuild 5241 BLAKE2B d2cefdfde25f1f87a3a1419268aa0600dba7a3eb7a62a508b8be403134ab9398e881ba8344753fc5ead6c3eac198eebea07d3554a1d6ee3a5676377b5830729b SHA512 e96c1769afd4927dca8ed02a1add344cfb137d0072651524d4077558b31e9dfd70b6179c86c5aa2cb3c80e5864c5ccdaf867350d3f8f9bf696f92e059db71591
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230722.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230722.ebuild
deleted file mode 100644
index bb005b4d8ec8..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +libcxxabi +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index f80553917b5a..bf186f59abab 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD libcxxabi-14.0.6.ebuild 3386 BLAKE2B 25c436f437060cdc323ff18e34d8694f558f100f81b990077ed584b7cacabb54fcaa74e67c07179d84dbd8e184f51d157b2bc8d2f48efc607985234b716840f2 SHA512 481c84912363d33b8582b61ed655be3dad86038de100c9ecf072f8bb11d850e25aa587fd43bd19dd84c280a968d2950360115f414f61748d726224aade36da6e
 EBUILD libcxxabi-15.0.7.ebuild 2911 BLAKE2B 5f2004d2f68fe4eddb0b22be82d28fcca7954d0e3ad9a5510744adc4d0dfd7a1ab9fd928404adcd3eeecc58703f51117d0a80e5895b53e0ae7b71621ad5a435c SHA512 5b8e2c6abdec785649aa41b7f05ab86ecab30ff0631d6078c9b1052b406c320c5847b8f16ffa6d9e62ba4a6bca5959b18770810924d6e6da264fb08d6ff738d0
 EBUILD libcxxabi-16.0.6.ebuild 2919 BLAKE2B e281e229f747de5d8f976852b5e4f27126d220f65c9f6a380968a5f0f1957405cd36a2f01211af46c3962a09a8258a03e0a06af63733b0f46663048207034f03 SHA512 debe5dd103de3b600fbd8e58e464e4d11e48e762711ae64406c64d05e6258e5c025ff1bac9f3d10f4cef49abd0058e86696a658f8f82f4000ef749108eb760f2
 EBUILD libcxxabi-17.0.0.9999.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
-EBUILD libcxxabi-17.0.0_pre20230722.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 EBUILD libcxxabi-17.0.0_rc1.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 EBUILD libcxxabi-18.0.0.9999.ebuild 2869 BLAKE2B 28e1f3e4567b4dc38d3e2a687711b4d25049dc3c3e8c2b336697f5296fd6b3345e327f64ef01d791904e7914b243acceac8285e08b18c3d7459b3ff37b0d273e SHA512 ee68103cdbab5d6d510fac94fefb689cb17f7229cfee7389ca3a15e649465fa43017ccf312b8c2c642fd690fcf9ca6be3d2021560f0053beaf90f747b5a8e42d
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230722.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 4fab65aee6f0..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index cf1d817d36c5..f8c32324e4ce 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -9,13 +9,11 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.7-r2.ebuild 3474 BLAKE2B c75fddce61b7e8fe837b4c5bc1b7dacfbe4bc1572537dd7c44c23f894d05b104e8946d896b3b19d78de32a87d866d5911a0f3a8f81796469bba2753d051b2105 SHA512 7dc7c5fd7cd370acadfdf6e15ed09cde0798312ed3c72e770596aecb5817a4ec1477cc1092e3c159d1988bba4200808259705206f80d8fd0019fe07c34f4455d
 EBUILD libomp-15.0.7-r6.ebuild 3480 BLAKE2B 89d638d156dba3a56ad23baef8b14084f1d890ad31980427700a0b04f7199894d24a60df5c40d40815f469ca1e8ac726e0914538bad52ea94702e179cb5bd85d SHA512 005b5f4be5b2433c9c16c483235500ebb22a56e6df70cc53e62ac73aed14cd8c65e2dbcf1457f3cad1d0cb6ca68a7d98e8543803fccf32cd5457f92c0db27df8
 EBUILD libomp-16.0.6.ebuild 3988 BLAKE2B 31eee2f5b764917a62cb307fab6dd0744594dc0ebdc04c359a85eb6372421a42431dd9de792671e1f0d326d798df1bbae5949529a22d7f2a99cae02d6734a37b SHA512 4e62220e10ab0aa1b64ae9557055b1ac6ecc145ae81cbe94445a335ad4e0d7e541dd13db4ffcffaaf80a50e2f13136982828d4d0211e5dc925a0b6ef2a2825a7
 EBUILD libomp-17.0.0.9999.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
-EBUILD libomp-17.0.0_pre20230722.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 EBUILD libomp-17.0.0_rc1.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 EBUILD libomp-18.0.0.9999.ebuild 3922 BLAKE2B 88bb2ba5b0e1e7258e20849b0774c22d6d06969adf97e2df5d2663eb83c3591494a686959bfec17e037d97d04c8fed38cefa42678ea0b40a0c88969b0f81add3 SHA512 3ab5aeabd0f94562ed3792a91e1c87f3acee86562cabbba46e39f30756815b3d82e4fb2f0b8a01da4f4d7ad2a07ffa91e2ad14e63cdd2d4ce7b79bfa21aae579
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230722.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 31560a1c0eef..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	+debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-		# prevent trying to access the GPU
-		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 0caf53f5f906..8e628c8a2021 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,12 +6,10 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd271691c259925b8047d8425b0eafb55d2c1daf637c3a56903b88e50283667955e780a47f61e7215a1e3a1acd3634c62960cf17317f SHA512 fa7ebe7fad14087861dc0eea08f68e8aa01dcc6560d70163ec38819a7fd799484f6ab1e35a69393a14962b45fa0a469c9d6c5fd2882b3609305bd01bc9f6701f
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
-DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.6.ebuild 3040 BLAKE2B af0ca343905805b2aa88dd6d5f28321d50efbfb52e483eff47eaeec23bd3eeefa2269d542070b17db8bdb8ba7f0501ce7d1eb9c8085ce759ba9ce76161ffa64b SHA512 304872d8138323e91f45cef61e119b1bde128d3aba77a4650567a9d9fa3cf0a36d012a1f08168171b756b44d7a2e676eaabf8d3e3ca144ff3731909e38650a96
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
-EBUILD llvm-libunwind-17.0.0_pre20230722.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 EBUILD llvm-libunwind-17.0.0_rc1.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 EBUILD llvm-libunwind-18.0.0.9999.ebuild 2980 BLAKE2B 84824dadd6f60390cb0c0609c06fbafef864a7106853e46617513358f239ff93ee2325e75d47d6463e1fe15f1c7e16c222468dbedae20cf8d0ac1d71bbfb29c1 SHA512 9eb7d59d4141eed7c93e8005976212cfc41b9ec455b13afd7579fefa052d798edc2c8da1ce0f8c575893073b4a97d3ba0b784bab8d480be08a923921bde34d57
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230722.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230722.ebuild
deleted file mode 100644
index 43f8868fc308..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230722.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index b3a1de4ac738..74b11abb1563 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 90c5a1b1e033..2b3357b17f30 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -3,7 +3,7 @@ DIST xfce4-power-manager-4.18.2.tar.bz2 1205603 BLAKE2B 375be9354f32a71d748eeb14
 DIST xfce4-power-manager-4.19.0.tar.bz2 1449836 BLAKE2B 0aaba64f689ea263bddf01fedfda1919d36152420acf9e068ae23c138a8ce0a7bbaf64423144ac4a5fb5313a7cf3da38093157f5a88abca2d2dcdc0d6a91840b SHA512 56803b41867080df34d6e460e8bfcdf0f16c05fa447ad34ceab7831c41efc38d82c692bb06cf94725c4b4d63ac0721be8c0a999712fba112e352c9f05e46bfa3
 DIST xfce4-power-manager-4.19.1.tar.bz2 1458474 BLAKE2B 2ba9e3741d48ab8c9c39da1f5f56bbea150b3647a9dc0088ea6db935b694d130c180b27b700299faa70553c34b1ba47a3bfbfb3845d0f49770bcc2108350031b SHA512 dc085f8702d35525969441770d84e742977d781869ec239167d7c4f964fcf2a483da3984ffdcd7b4c42e17d9e3d695f1f41e80c50ef92e57e4ff681129b0745f
 EBUILD xfce4-power-manager-4.18.1.ebuild 1616 BLAKE2B a300c82827b7aa4b7a1e9e0187c9b41a31e18c13dcd551964d7c14f3317356baad8ea0e7e379f198e61fbb912a0d9a0dc3ff481c76df240fdf0a4d2c4bac965f SHA512 cf09f2cf76eab1b55cb6ed24b20afb5b58dce76ee847462b3a921516107322429fb43aef9bc0de8d315ef041c8bd5c2c3339a466c3514b9b26ea215399078686
-EBUILD xfce4-power-manager-4.18.2.ebuild 1622 BLAKE2B 6e1cde73f461ef8ada142abb3f09a9049d367ae0c989d17f0b49a79784868b1d246fd76c8a520f04cb5c285f0ceab07b8b098b6222c93998a1ede8f5a692f8e5 SHA512 a148b8bd62cc0ebca2b078a34cd859f07d0540b894d4e8d1e8585c11077e0461f4eb3a28fa09d301466602152556a4f3a8bc424380dd93b02d69f6b871491815
+EBUILD xfce4-power-manager-4.18.2.ebuild 1620 BLAKE2B 425928421614399c407ba1f61471445b1c3507581f3577c0753c46dd919a3e3b6c98f0d4e31cab9b5d27aa365717ac133f5bef6c3a8734d48174d6b2f23f5ddd SHA512 7cc204898e9cda773e3419deec38b4527174aea0194548720bb4b3f8a0efd4303d4a72453fa18e80bf1d1a808a93bbf869e85c41c61ecf9c427839498d052023
 EBUILD xfce4-power-manager-4.19.0.ebuild 1644 BLAKE2B 3cd4e38cbdfa99afe040d127b103dfeff31c6b0371f8b10c76a1998b1bf032206130c791a30d776c3f52dea175f7484b19d403b995311118a19ea929c34d0570 SHA512 257d4ae8dee9c117dc62f1d1d03d2ac25ae13482b602b1acb06c9042de9a03e0ff895a9c9d7ec2edff50ff71cc0f5ea153d215c0af26ccdd924223ba2d280f60
 EBUILD xfce4-power-manager-4.19.1.ebuild 1646 BLAKE2B f0d8d473a3ea6f9be017b249018d2fcc3608012de9260f329ced0546d3ec45c72ba88d7970fbf05c79a6fc60f1ab4a3f5dae0b7a7c4281b3c9792a3083643fc7 SHA512 4a5732c2c3a19b561e07fbdfa8e3c9ec4b0a59a5bfc6d4f1913ecdd97593adf505d339c4d3b28908f7b36de9e4354f80dbf6a33d84bdc4a8b2ae91aeb79d8111
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.2.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.2.ebuild
index 4405361a96f1..c3a24d172392 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.2.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 2c63b2c994f8..ab44f35cd8b7 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 863dfa0d6a09..9f7ea296642b 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screensaver-4.18.1.tar.bz2 706002 BLAKE2B 2976c977d0ad1f292564e257dbfa01ab90ed5ae5a02fb93aa247363e81bdd60407ddd4cfbe8ccae0f37cffc03d37151ac77a7857fbd8b3d0ce6c6278b488550f SHA512 5b9fab018db6f933480e6da4a3b62fab0c3744f657db76df0631ac2468c20f5169c54a0b09bfa59b3311357a8effcddc40ba49d6baa2b5fec6c5815e72c63701
 DIST xfce4-screensaver-4.18.2.tar.bz2 714671 BLAKE2B b83e9c0a77672f7ed24d396c2802b77a57eab39d9b93d8df6364821fda426a2ff3b4ee8715d66920a319c9b838defc098e8dafa4cf85d66c92c0162b5ee40cbe SHA512 5ffeeabd1c8c425a6de8e70cddb6afb54a2e64d6df821655f564e118a9924da4fd21e2300515583fe97caa1c76aba3745801cccc377eb056eeecb98303b08df1
 EBUILD xfce4-screensaver-4.18.1.ebuild 1851 BLAKE2B 518f0ca095d1d2e9153effce33e7702e99986b9e961b907e18e32244ac6a2c4c2b745d7d283f7e2ec305d689d92fb79c0bd56a5817411d1f7c0bbe5ad4ae98e5 SHA512 181118814c20553401f630750c7c235c7bd4bef11bc632480ac54d6d6b2909e526dfde9742de1773156ad9229073894d38e39521074580ae546fbf5843fe3445
-EBUILD xfce4-screensaver-4.18.2.ebuild 1859 BLAKE2B 350a5906387f63bbaf5583e7550c7543b7add14b22e673ddca41e85407a0bfbdb10d22f0a2f68d64ae9b4a28feed2c85dc789f6adec304ffc8873037cdce739d SHA512 337de271719cbbb6edaa8ee688133ee5c290f854d64909ab13e867af8fcffa6cc6d399437e0895a3747d53580b718740869026266cdb8cff03b71a1bb7ac2170
+EBUILD xfce4-screensaver-4.18.2.ebuild 1858 BLAKE2B 6327564739b44ff3307c4167c5f83665ad5004b0f131a62f34a35b16afdee0a20fbbfb66ca44da4790b87d6abdf7450e126503f3335350ec442710f6238a977e SHA512 91a7246bbfc8c462170281a2ba3978477253bde21f48aad46185989d228c1db359dd2cc9ca304399744ec38cda397dd1dd57b50eccf81e7d6055300f81c40849
 MISC metadata.xml 292 BLAKE2B cc7b9f7a72918097fc69b330b539d32dbae696c757c3a069bbc4514a8ff1f1931d2643ecaba63a28b7b58299fe1064c3425be00ae4c8f23d5413cef25ab738b3 SHA512 801d1715cbf897ea4ff01e49b7675b8522f07917b1e5908025c590fe18ae0d50463144f5d21ef7b33e9b3bac325f4cf96644c54eb62b8aacf7b512c612b10234
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild
index ae1e71ee89aa..c6f53c10038a 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic