gentoo auto-resync : 15:06:2023 - 13:38:09

29 files changed, 505 insertions, 430 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 69fa5ce0aeb6..45db86a66651 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index 67f87ce419df..533a9f1f6146 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,7 +1,9 @@
 DIST android-udev-rules-20220903.tar.gz 21009 BLAKE2B 4f0375b574f123e7cbd18658582568f85e3278e9fe2b673e6c9193a16845737afc99d82d0df2f6a8d0daf784132e7d523bdf767761a5d467a66bf89f86cc1046 SHA512 ca09a1b49b6cbc7df2b8c6bea1e6fcf4886938c8567002054222795493bea036e3c5a139939e43cb965d45a8ecf74c0715583ef1aade2b7783751a75ab34d540
 DIST android-udev-rules-20230104.tar.gz 21266 BLAKE2B bbae83511b1fa5e94a50ae3cc44920862de30873304c0a904b4f9d3796296deff419c05db5d716cc89587c3a7ae7a302b2b219564e452564c5f3bf092e7515af SHA512 dcc45755a5a20a74d2241b398dba0e65135bf9c5539396bd6a3415b15fd865f4d3134de53de1ae2019ffe9567c557b5a386fdfe0245107b29c234a2211e0a211
 DIST android-udev-rules-20230303.tar.gz 21458 BLAKE2B 6e9299d516fb6e69db526db0626f75580e2fcb5ebe798528a00f0fafb7f309f2b460b8f4ba7f1d4e17c08805e208272c1a06f773a4d2fe12fb64e7d84bfef6da SHA512 744aab41f3506281203ae8571d6c5d6b48b187df30df9fbbbf47b123a64dfe039f18b7f5b0e8632a2799d2f0f0b08a4975106dec2a24c7f8390dd60c0581c18b
+DIST android-udev-rules-20230614.tar.gz 22013 BLAKE2B eece288e673be456e6b470471e34fe744d59d13f052331efc23181c77e2dc83d31ca6a95e965a2ca35736a3c8bb478c5494bf2319b25cec215432b8fa6da78d2 SHA512 983282a6adcbc200e548985d403a317e0cca48282ec17cf8496f7009df9a75e4c6a16a2ec0a65214a019acfdf550fb6450ef1dfe4021d8e9449988427f9c25c2
 EBUILD android-udev-rules-20220903.ebuild 734 BLAKE2B c03881c500a241b722ce61d4305f4561d45076e5298ce138039071a6fe17e6036fe5795168adfe95dcd42a4db6a151ddbb4415e8f95ee6d3f36532a7928d55fa SHA512 b7963d1cfe8039f09bb6ecdeffd5e2b31aaa740ab7e9398858c7f70f67f47d25ab2fc8ec5562dc5b9ba747a3c0b3c77e07758321b2b042f4262870002a87e6be
 EBUILD android-udev-rules-20230104.ebuild 741 BLAKE2B d19e7448f94716d55a1364d244e0827b25bcc860c59ab1a07abe8179161961c24bc69c5ca6475782b9e31fbc27b9b2e2125ed2861755c92eebb2ac80424f0dda SHA512 f011a45d6f340c7da44123c8deef1b05544214633cda6a41f7963f7eade6dbde14cca34bd939d9ac0ba519d37f092c970de31d7990e477411d8c1f5b0d93aea5
 EBUILD android-udev-rules-20230303.ebuild 769 BLAKE2B 94bee61f8fc8702773f566ae0b608b2d0d80c55e811c5ce1f350ca1cf4c06f30aa902adbc1c99bb87d6b5999e2ec332e97f100986094999f34a6c6321e149f70 SHA512 55682ac8ae5e6db91454f69967daaf2340e0c7b426b6070947ac5d638e2132a5ae39bc1d6eac6a3bb4be208a2bab943a8fb420b9e20d7615038fa03adefaa58f
+EBUILD android-udev-rules-20230614.ebuild 769 BLAKE2B 94bee61f8fc8702773f566ae0b608b2d0d80c55e811c5ce1f350ca1cf4c06f30aa902adbc1c99bb87d6b5999e2ec332e97f100986094999f34a6c6321e149f70 SHA512 55682ac8ae5e6db91454f69967daaf2340e0c7b426b6070947ac5d638e2132a5ae39bc1d6eac6a3bb4be208a2bab943a8fb420b9e20d7615038fa03adefaa58f
 MISC metadata.xml 489 BLAKE2B 89af52034e7b4d3588131f94d9c5d2af47442a46550cb694383a19c5ed95de9e6be6b58dd91e32d951ec20d1b167bd550bc2aaf72db2ed866ef7b66367b3e7d9 SHA512 eb468d8fc9103f7b6f62849e130235d8697f770f3b7a4d9f45e591d4f8dc5b7cd1d6d80ab2df441f7f531e74fa0914947c5f65cabbb3e8d059d294b940b47132
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild
new file mode 100644
index 000000000000..62f49b941ae8
--- /dev/null
+++ b/dev-util/android-udev-rules/android-udev-rules-20230614.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
+HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
+SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# No tests
+RESTRICT="test"
+
+RDEPEND="
+	acct-group/android
+	virtual/udev
+"
+
+src_prepare() {
+	default
+
+	# Use the pre-existing android group
+	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
+}
+
+src_install() {
+	udev_dorules 51-android.rules
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index d66f68bdce0d..9fb3447ace30 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,6 +4,6 @@ AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df252
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
-EBUILD buildbot-3.6.1.ebuild 6527 BLAKE2B 0ca0e8aef7f7e49827b867d8412f33f91127dc5632263d3ddaa482cf5add9de1bbfe81604419e1d07ab4d43b13eb89a1cda405505ca66770a8ae7e6e271f6417 SHA512 2fb4f2eb56d56e4160abac7b08bc91b2e67d2716f1bbe25150e4c31114db35959e558223bc808d8ee046d510bdf0dc5364c773c957f29a9198c1a716b6201a51
-EBUILD buildbot-9999.ebuild 6523 BLAKE2B 714b1537bfd07f5a2c6bcc8e08d66f43795f6efc4568364f6791c4af3a25996bb5aa01b68a9336b56c1d3e3702f98f9ae542e14f758d49a31177b6927379ce67 SHA512 8c87c5eda03869f85803d1f30ef574e1950230b15a60f0df69e2cff2a7bbb41a8816d67162dcc88c8941cac3fe5b33eda0826f3e8d61076237b3907b37855cc1
+EBUILD buildbot-3.6.1.ebuild 6527 BLAKE2B 018d623d64da66c0ad38277634d697078c48cd295dafb042b26f9ef2e89a4e4640718cb87961b66c23e419643fff9ca573708400ad010e8ae6e52b588e80d08e SHA512 c558f8a1b4a4e3ecc8d5bd5339b6c0d3e1f6bacf320bca95da4aadef923cf5642e5126429b76ec41c70b8be2ebe228d1f782d9d00f59c12968b7bb1c2cc9d29c
+EBUILD buildbot-9999.ebuild 6523 BLAKE2B fcd7c657d1945cd3d521eb39191f3971bdc5a2a01b7fe682af3da87652972526c2dadf931c77f29a215a5302c98418ee3132898f75645fd73930040b318639a0 SHA512 80689e98aacb72c54451444415e2e7d5805fb20cf0061850a57c8c9dca52dec0bcd8fa2158b30b753828009c4128f6eeb028f9f5b9f14fece067c14947fefc92
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
index 866193742b47..c876a5c7e3f7 100644
--- a/dev-util/buildbot/buildbot-3.6.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
 			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 05958fa7d93f..98d27d9c50ca 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	dev-util/buildbot-worker[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
 			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index d2eb8e4b095e..fe1fe90701e7 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -511,5 +511,5 @@ DIST zeroize-1.6.0.crate 19049 BLAKE2B 8dad6af58edd7b22ece7dfefa47b478dfb74efd1e
 EBUILD cargo-c-0.9.14.ebuild 4241 BLAKE2B 4126b7c247a50d835bbb4c585f49e6e3c100a2432616a943ccd67bb0c470162d6952783030f03a913876d6b006ae200e7dba943919187e95bb9cee307e483a12 SHA512 4ba94426dd5d056b56ba8ca03f394d8cf23be57237abef0657492e8b64a84843f96a36e8d06ee21e37a430ecda070598efb10d82a736cc13dc14c116ca1c5d6b
 EBUILD cargo-c-0.9.16.ebuild 4466 BLAKE2B 9cae01be36204d5f41c5676c0d2438e611c6ee48a512eb441b4250fe39129b743b744fbd40a052168db7d5ba7d689e55f2064a4ac3e3f9a6ecb7889ddcee9825 SHA512 52a76b7b1eb79e09590400b736c54152639ac95c02d6015e5c6fcde23c298624995a2128bc394792a0460c0752b5a28ed10f619b4d52fc47696a0ac645f11936
 EBUILD cargo-c-0.9.19.ebuild 5247 BLAKE2B 7d14672a54c4f2c457e66a770b316671226709d29331ddffec15e2347405b17d34560d4be34144b8cf69fe80e7120233f612f4920e925e25158819a4a75386e9 SHA512 fa19df064bda5e968d0f0d63ab2c1caa0f295480096aa044323dfc60a77d189f42bf32b276a2144b22a8d7d1baf88900de17bf289e072b6b50690955bb6cbb89
-EBUILD cargo-c-0.9.20.ebuild 6903 BLAKE2B 4e35e3b15a08e50a13faf10f3bb9fc29e119ab9a70b1f558564a0e15792881f7f11bdede6f221962a21b608985ddbc49b4cc0b44759249c6c83a40027f10d91b SHA512 bfa3879f817ceff956b1301ae746f424c012837bcb88d7dd9c6fb54241c2f8849173cfc05e587abce78fa486c352ea3e955a4beff2a6485b7bfeab1c4ec8f3e4
+EBUILD cargo-c-0.9.20.ebuild 6902 BLAKE2B 3a853e81dbc7299329982acbf2371bd936096072ae2c4b7174081aa424bb3cc191165c4caea857b75eff605be2e7d713b77c3d543febf37840809e10977f5dd6 SHA512 166e1933b40c4443a100cd8db4db4151476731432fa963f400630eeec843e422a0d8919a510feda4870f9de0c6d3f9eaa1828812ccf153b10938344aead52752
 MISC metadata.xml 327 BLAKE2B 97957aa62ba7d72a68bcfd2c6a0ac966754c60fb63471ce6a0edd1319b06fa657b4b7c0ee88c8dbeadd1027802dd99c0005dd94def7f176d7f23fd8311cf3b10 SHA512 f981293e73aee49926e17d43b7f6737a5cc9fb968c23a5a4572f482e0cbb3e9587fce557bd272848ddb71f4ed7a769d6aa32b06e03bb2b82c79e04bd21106e7a
diff --git a/dev-util/cargo-c/cargo-c-0.9.20.ebuild b/dev-util/cargo-c/cargo-c-0.9.20.ebuild
index f8628e111dd6..f309b1f2c446 100644
--- a/dev-util/cargo-c/cargo-c-0.9.20.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.9.20.ebuild
@@ -318,7 +318,6 @@ fi
 
 SRC_URI+=" $(cargo_crate_uris)"
 
-
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5b2d9d31ecfc..7a798e8467ad 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,21 +1,12 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
-AUX ccache-4.6.2-avoid-run-user.patch 1042 BLAKE2B 192a0c0fa957b8c1e9c12984a898953f84b2ff14b38206e92cf33e6f80d5c25cf4800add72a3e1d38ff0d6a6c22d071bc7e46ca324662e478f2ec75df632f1f2 SHA512 2d2269021e5eab22d144e81318e620ef0191a34e2de15ff78e2019ac13fddc277802df1387b4aa673649662244c0c2c8c76003af7247f00287dafa6c460aa18f
 AUX ccache-4.8-avoid-run-user.patch 1270 BLAKE2B 2ecdef4b319a2d3c2fd4740667ae22b6134d977b252d9d022acfab723cc9c2cd7f11ea4f2674d5461fba5e3cf5574de39a3df840451670b68689569b819f2cb3 SHA512 898b0d7041af9765ac2a5f26099256e96c881d39452eb0cc90d859f9f64dab2d31d673d6b538958337a6f7848eb2ebf309064e96c37567e271a42e46c948b0ea
-AUX ccache-4.8.1-test-typo.patch 748 BLAKE2B 62cfb943fd957cba389183b8aa507833625d2d7c5b096b2c5475ad0179aa371ca1e0c1d71703fbd5f199e3ab162c77043700f8c7c72b4b39da14827c7606b127 SHA512 ef666ee37d70f0b9970ea78d72514e8c69e61e69d87f7945a722e93e2f036bf22ef5c25dbf4f909b8ad20e6deda6aaac90d8bc21ac9decb85c260a2ee3f6aa28
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
-DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
-DIST ccache-4.8.1.tar.xz 559628 BLAKE2B 01c676447aff5493f319df8360b5478b171a229dc47068bfda814bd30afeb28492a3b112532dbe93cf89d47796f4d682e37b22a1d1c31aaf46023e4f7682d80c SHA512 672971560a8aed7754c4280b8983fb185bc7f7f456651e952db3e32fb855ba430c7dcec1f45466e4d10aa59e80e30696f540d93b5f260a846a49dbf4901de514
-DIST ccache-4.8.1.tar.xz.asc 833 BLAKE2B 948ef7d7965717f42f27ee0858c36b2d6272629f190ddf96f7882463304cc103bd70aebda739686fd6176024356c8998d58642ef1d3b0e7943ef7898496ab689 SHA512 c89af05eec3eee8001098c77b27d67b084af06f406af32aafe71f11a2592df86bfe7ac58283749bb7ab3401046312da129c7262230a1a3f892b81946227dd0ad
-DIST ccache-4.8.tar.xz 556804 BLAKE2B 5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a SHA512 561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
-DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01 SHA512 22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836
-EBUILD ccache-4.6.3.ebuild 2575 BLAKE2B c8b4113239bf1ea5d2b394f68e0f2dc623a602bf082c72cb4e5c38640b83e9909e69324a894a9a79bd88610a36451cee2ea35ddfce7060794b52fb8923b8fa95 SHA512 37fb4a65048e332d928279eccb5bcebeb20ab61379898aa548eb5ced5a858b680cd844f2f679d4ea528af54f21ca663614112dc45b937b8da38b1718fa919f2e
+DIST ccache-4.8.2.tar.xz 560888 BLAKE2B ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395 SHA512 2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
+DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9 SHA512 6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
 EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
-EBUILD ccache-4.8-r1.ebuild 3607 BLAKE2B 591692c06da7e031ce7811e057ea8d638252bd9f6577074230dfb31d7da1977a2d9da8ae3f5eb8665bc48d9ca13cb54fd7952185817482bb4139828fc9167690 SHA512 f2d6a6745589b6a7fbc6998a6c9e296da3f01e05a61ead453315166d7cda335cf0028b1db7fee3814e5b62c0e1312ebde1eb587fba395270793b5c1a5473724c
-EBUILD ccache-4.8-r2.ebuild 3653 BLAKE2B e13133a7ddfa243ba9b36125709fb452923ad6119b9c3af2b872826f7f23fd077d850190ec3065337418d1a47e960c4231695897ef3ed3fe0aec57d87871582b SHA512 5d466f0935c26f9ed92ff9d8c2dc5c1710ccbdc753439f1c9f9b1fb0577c06a7477d6670fecae1454ee4b0fdb4ffb6eeccb34f2c21917c926d07c337151f4e81
-EBUILD ccache-4.8.1.ebuild 3783 BLAKE2B 7ce3ca24b5df4b0eff759c1965108749f2356dce5a7232347587a5a4b00312fd22769f54d8dde67333feb57f07998d64574c8d3b8585df986d900c11bb322d56 SHA512 cca6d2c8e75745411bb13cc7d02490df626668bbfe9828402036d4b36ef214b4a1c793e04a21466835df3d96bb68879d191a29f67076bb65cec35cbe3ab9ec6b
+EBUILD ccache-4.8.2.ebuild 3746 BLAKE2B 8f7df8bcd5cdd2d41f2ec6adb1ce08fdf0acab9bda9c5de33f9fda38f073c36a923c57ec0e5635a991eb5dfe882006d2a579726ed1121ec8903b753e54f1a9eb SHA512 3633d56910d39914136dadf36d6d8b39781195d84ff418824102d47ecec0b82e25ba2b5cb5cb9de8d95b2eea34236977b9a3b6b0d15feb1742a6a6f33a77eded
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.6.3.ebuild b/dev-util/ccache/ccache-4.6.3.ebuild
deleted file mode 100644
index 269b9595497c..000000000000
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.8-r1.ebuild b/dev-util/ccache/ccache-4.8-r1.ebuild
deleted file mode 100644
index 670205fedd4d..000000000000
--- a/dev-util/ccache/ccache-4.8-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
-# because Portage unsets them. Aaaah!
-#
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${MY_DOCS_PREBUILT:=1}
-
-MY_DOCS_PREBUILT_DEV=sam
-MY_DOCS_VERSION=$(ver_cut 1-2)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-MY_DOCS_USEFLAG="+doc"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
-	MY_DOCS_USEFLAG="doc"
-fi
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions
-"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND="
-	doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
-"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-)
-
-src_unpack() {
-	# Avoid aborting on the doc tarball
-	if use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DHIREDIS_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
-	fi
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.8.1.ebuild b/dev-util/ccache/ccache-4.8.1.ebuild
deleted file mode 100644
index 37009fdc79b4..000000000000
--- a/dev-util/ccache/ccache-4.8.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
-# because Portage unsets them. Aaaah!
-#
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${MY_DOCS_PREBUILT:=1}
-
-MY_DOCS_PREBUILT_DEV=sam
-MY_DOCS_VERSION=$(ver_cut 1-2)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-MY_DOCS_USEFLAG="+doc"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
-	MY_DOCS_USEFLAG="doc"
-fi
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-# Unkeyworded for now because of failing tests: https://github.com/ccache/ccache/issues/1288
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions
-"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND="
-	doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
-"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.8-avoid-run-user.patch
-	"${FILESDIR}"/${P}-test-typo.patch
-)
-
-src_unpack() {
-	# Avoid aborting on the doc tarball
-	if use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DHIREDIS_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
-	fi
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.8-r2.ebuild b/dev-util/ccache/ccache-4.8.2.ebuild
index 1702d6d4b968..3ab1a30b536e 100644
--- a/dev-util/ccache/ccache-4.8-r2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -31,6 +31,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
+# Unkeyworded for now because of failing tests: https://github.com/ccache/ccache/issues/1288
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
diff --git a/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
deleted file mode 100644
index ff579ca7fdb6..000000000000
--- a/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir() const
- {
--  static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
--    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
--    if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
--      return dir;
--    }
--#endif
--    return std::string();
--  }();
--  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
-+  return m_cache_dir + "/tmp";
- }
diff --git a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
deleted file mode 100644
index f557d24e6e93..000000000000
--- a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/ccache/ccache/pull/1287
-
-From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 20 May 2023 05:30:54 +0100
-Subject: [PATCH] test: Fix typo (missing line continuation)
-
-Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd
---- a/test/suites/base.bash
-+++ b/test/suites/base.bash
-@@ -552,7 +552,7 @@ fi
-     # -------------------------------------------------------------------------
-     TEST "Directory is not hashed if using -gz"
- 
--    if $COMPILER -c test1.c -gz 2>/dev/null
-+    if $COMPILER -c test1.c -gz 2>/dev/null \
-        && $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \
-        && [ -s preprocessed.i ] \
-        && ! grep -Fq $PWD preprocessed.i; then
-
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index ce178fec82eb..deacd14cef0d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -31,11 +31,14 @@ DIST cmake-3.26.4-SHA-256.txt.asc 833 BLAKE2B c33f4d8cc1ba271a06b427e4bb5cb39e38
 DIST cmake-3.26.4-docs.tar.xz 507352 BLAKE2B 9d7e4bb2292d22f93c5435e30317cb0701dc9c6ad6b397fc9108050217917f48ded84b2d6094782e2e8a502e693a8e45c5c659e65db3857dbcac261910890861 SHA512 95ef908381501bd8189113a7a520e70d81dbb4e1f416cfe38cbf7005e76f3571b964496d33980975835ff02634f85e1eb170a575e0ea30bfa749043cad84c605
 DIST cmake-3.26.4.tar.gz 10669686 BLAKE2B 34508c724e0d4967e010917f6fac6f426b0d835c38cd197b64e70a18febee1c3efff5f5edc5cd7c5080881bd5c1d77d03243b5dcf8b47f238fa4ac4e5996072f SHA512 fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167
 DIST cmake-3.27.0-rc1.tar.gz 10973927 BLAKE2B 30d17208a061d2bfbb4e9ef6cdeb526c0c0cf6d86c93821d380ff25e7ae430f80dfcc8992d0687882489e3453d543ba11a45fc47ac15ef8180f6dab6d85c20f8 SHA512 02ea3ed06ccc339980235371de0b3c823f92cdd46bc4de3b0bb5788cd1265c292e70dd824d2fd3740ec67fa63a5e2a903a32735f6073d8843465e300ccef5e6d
+DIST cmake-3.27.0-rc2.tar.gz 10974624 BLAKE2B 2c5e1bdc23e249daccd71d4396dad3324be8de67b36203154a1c9d6172d72f552454644c0820f5324d50681a5890c4ff9d665a8d0236354f3c2ec0345d1881e2 SHA512 c354caac080510d779c112f5301a6158d42157e518176b63d1784fbbf3a19fe0f62028f1d5e4b4f227002e9c3b4309c31826024ea9b2d6e130d5db9bcec6e9d8
 DIST cmake-3.27.0_rc1-docs.tar.xz 520664 BLAKE2B 332a6700af4a119c8859074d93d16a8a7109614abff6b8bcf90c9c3490f70a436f60ee627b8bb2b31a100916ea91c6d5fc63bc88c07acb1bed60c543e3fd3c7d SHA512 0c97f632bf69d079f2ce22fa5d283e5b6f031d238f2810c51dab311d6c41c63773ce9741744e3bcb1fbb2afede6b354b0fef12a55d1410248a48977cbfd0f15a
+DIST cmake-3.27.0_rc2-docs.tar.xz 520656 BLAKE2B 8519d64d6d3ecd75f61b03982f7671f0cb9fcf9cb9e03b0fe8aebcefb2ffbddfc5e2ed07b94f0226af3a092e34d9a5fc51c8e55f85db8bcf92db159a78677c62 SHA512 3f079c2b7507b608bd6dca93f35de343707de18b4892fce7692182d9a7f2c90bde7a2fa27236d838b6307b3956e60130b86c2f782c342dd1a6ed72d323d7792d
 EBUILD cmake-3.24.3.ebuild 8764 BLAKE2B 1e01eaa1235409c615720617502c46dad64d5f77a5cb0867f9b11acbbecf97f09488ee4cf4a06d8119b40baa37402f2c28b2578756e3ae58593928e1eb15d769 SHA512 3781a9acf3f2b146f1083fc2194eda25abc73adcde57295b8826a2993fe688f767ac0975729ac13086bc7ffeeee0f379048f1e0b0da2b7afcae2cb21fcb7ab06
 EBUILD cmake-3.25.3.ebuild 8764 BLAKE2B d29be64c9d149d845107044caad0a922ad598f05b9c85a66ff380f8ccf40215f7a2542e98ec2534a6019d59e041378babab6432bc15a798d72cb285c48de6835 SHA512 15756816696d4c04bb1efb4868399f9b0796fa64092f387bde6183cf4c4c63186c3db92b12d15bf8e016cc63c53791c18d6eacf18f6cbcd5594d9736ef38895a
 EBUILD cmake-3.26.3.ebuild 8790 BLAKE2B 704de209db19e0fa1bf7369156c804bd1da4d354a4949da60e1897fb896fdae5f31412f0deec5a714dfb5c93f3cba7be65a05678e7d3dc324c5193db3e409a57 SHA512 24bd510a618bf07f66a45d9906f8351ae7d865975b0310a52cb18c157cb2b732b0e19a2ed57da84b96f89529d343e1c388d9132c4f6a4eb51c29fab64704e7c1
 EBUILD cmake-3.26.4-r1.ebuild 8811 BLAKE2B 6ea038adab11c7bfc6bb31483a29440c0bc0896acbc9782bc63567a4cd523d95076d68c64283fd21a997219e5a5d5364c18c1f64d15322047557a016f88d2b5e SHA512 f7f8d5704089ccddea2967b0eb13b51be75df2e56c9a9fbdea3da5386d023df38c910a3efe5cc0cfe2fa83ed70222a3d5b18e4f6280f42b0b79aba5fda96763d
 EBUILD cmake-3.27.0_rc1.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
+EBUILD cmake-3.27.0_rc2.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
 EBUILD cmake-9999.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.0_rc2.ebuild b/dev-util/cmake/cmake-3.27.0_rc2.ebuild
new file mode 100644
index 000000000000..a80e655595b5
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.0_rc2.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=${PV}
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		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"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	dap? ( dev-cpp/cppdap )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
+
+	# Upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index c4313839a577..00562b44e1b0 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,11 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
+DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
+DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-62c0bdabfa32f6e32b17b45425b15309db340dfb.tar.gz 190948645 BLAKE2B f41d8ea32e189ef4641e42628fb516e307c9a6fcf65af537eb9fc0d3186591b062c5e85c9e935511ef706f28c6994a774a4e3f36ff54d79aaac7b293a6168625 SHA512 55a4cbfec3a496c1918aa614e5bdee368e4d0b6641c946d8bf8b828ab4bf4d9b29dbe96401a172079d70f924f5e513428fe990c65b556a0a860802cb13f5e3a0
 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.5.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
-EBUILD lldb-16.0.6.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
+EBUILD lldb-16.0.6.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
 EBUILD lldb-17.0.0.9999.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 EBUILD lldb-17.0.0_pre20230609.ebuild 2639 BLAKE2B 3d53e78f413523ff44b454472737dd41795753ed55d992b605ac7743bca7c6e7f766155d7cfd98f8f818be3faed9e6c0a62273a319c9e7d4f1e55b3421a2ab5f SHA512 4aa5ee95ea1379c6de0f3649d48a0e3436b8461aea892877e16e5c39ddd397a3eee9254d9d408a6cb085f42e6c1034020f7c05e594ae06352127844641804866
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.6.9999.ebuild b/dev-util/lldb/lldb-16.0.6.ebuild
index 1d8c4b56e83c..e4e43bb0ef2f 100644
--- a/dev-util/lldb/lldb-16.0.6.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 3e9145a47f7a..acbeac431834 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,8 +1,10 @@
 AUX ostree-2022.6-musl-allperms.patch 478 BLAKE2B 95191befc9281591480f3a80717817e262798b7d6fc3abf35cb5c0462267822092a102de446f5334e3807816418e7b2b5b4dd59cd66796734b85131873e2dc9a SHA512 275e4fd6c1547c852ec9d2a8649c45c5bec6fdc2351e9333adfc3ed31b0cbedefaca6db95ba97ec8a65fa16bd550827909f7172b46a6b64a184840272578b7cc
+AUX ostree-2023.3-libgpg-error-underlinked-lld.patch 1202 BLAKE2B 3952809ba83db25367136fafbd78c85702065e5ba21814e4a72cceaecab15bf61998ea513b441366b409042d215ae35a3730932c2c3424d68c776c423e2327d3 SHA512 91f3e93129b83b598743398f33cb04fc07930784e5244e8b9c5df00f4dc6f74193c1f51ffd03d6937b1d2b71219da7ba024a191b6117543b12cd545b941ba4a3
 DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
 DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98
 DIST ostree-2023.3.tar.xz 2075168 BLAKE2B 6e699420a89b36520e60a5682a421fd8f10eb20702abe6af97be9ee78a04be98e8d164157d29726de9e63b869051f7e60f199776ea3d959d4f0ad4165ff780c6 SHA512 af3b80d55e15b515e860ab0ee5f061f1a4d649b21441d5cde66e71ff4349ef480565cb795838ebce2f42784d53e349c2443159d9ee452277001d930ba814fe40
 EBUILD ostree-2023.1.ebuild 2824 BLAKE2B 144f93d943f0879e9104d78996600c50c7e6f936a578baf15b13f65191f8299ef45805008111443d00ac6dc85d270c48403d1bcf8bfbb090be8ce899e49f32aa SHA512 7b44a33dfbd808708009cb3c7e6f4b92bdf9d6a6c7f657bc86033451435ad5907f7e1dbeca45a7eaab24e394159ef0e96a3a9f691bfc7b093c92f5158d3a58e9
 EBUILD ostree-2023.2.ebuild 2651 BLAKE2B 1c2e921eabf6ba07731654af72e28c6e4d58aa7571b39edfcc253df2eab833430e19365a0e0db11c1b5a51e71438f4e8d2692f0802672b9fe9821d7c1ff22202 SHA512 f4919163f99fa1de99ee307ec5c03eff49cf684fea5a727b2a8cbac88e4b6dc2a8368b5d5fe8b1b5501148a475a3d83759a818be56495065538120fb22b34faa
+EBUILD ostree-2023.3-r1.ebuild 2666 BLAKE2B 707c9af45a0807aef329c20c78f4d0b1d055a781d35a4e6879f57696de4d03ddf58c8b788fedda49cbfc10bd4ad41df6e13fa92fe0f4768b8d00dd42e5cbf0fa SHA512 141437ba847fdabe33483ade97a898a4b1b126105cfcc5b92d60aa8ba730c59cc37664ffbbce91b6e843dc03f139050606e81b1389f4c93e8faf95269ca42b03
 EBUILD ostree-2023.3.ebuild 2651 BLAKE2B 1c2e921eabf6ba07731654af72e28c6e4d58aa7571b39edfcc253df2eab833430e19365a0e0db11c1b5a51e71438f4e8d2692f0802672b9fe9821d7c1ff22202 SHA512 f4919163f99fa1de99ee307ec5c03eff49cf684fea5a727b2a8cbac88e4b6dc2a8368b5d5fe8b1b5501148a475a3d83759a818be56495065538120fb22b34faa
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch b/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch
new file mode 100644
index 000000000000..f96cb83a1e74
--- /dev/null
+++ b/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/905623
+https://github.com/ostreedev/ostree/pull/2880
+
+From c3bd439d3e9c8cfad40a8080d35c5d6b29041039 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 12 Jun 2023 14:04:44 -0700
+Subject: [PATCH] libostree: Link with libgpg-error for gpg_strerror_r API
+
+With f461c02bb55bf2853a3b81ed5c8618040ab54e98 use of gpg_strerror_r
+was added this symbol comes from libgpg-error however, therefore its
+needed to add -lgpg-error to cmdline to resolve this symbol especially
+with gold and lld linker. Fixes
+
+aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gpg_strerror_r
+>>> referenced by ./.libs/libostree-1.so
+--- a/configure.ac
++++ b/configure.ac
+@@ -243,8 +243,7 @@ AC_ARG_WITH(gpgme,
+ 	    [], [with_gpgme=yes])
+ AS_IF([test x$with_gpgme != xno], [
+     have_gpgme=yes
+-    PKG_CHECK_MODULES([OT_DEP_GPGME], gpgme >= $LIBGPGME_DEPENDENCY, [], have_gpgme=no)
+-    PKG_CHECK_MODULES([OT_DEP_GPG_ERROR], [gpg-error], [], have_gpgme=no)
++    PKG_CHECK_MODULES([OT_DEP_GPGME], [gpgme >= $LIBGPGME_DEPENDENCY gpg-error], [have_gpgme=yes], [have_gpgme=no])
+     ]
+ )
+ AS_IF([test x$with_gpgme != xno && test x$have_gpgme != xyes], [
diff --git a/dev-util/ostree/ostree-2023.3-r1.ebuild b/dev-util/ostree/ostree-2023.3-r1.ebuild
new file mode 100644
index 000000000000..ce6f430cb40f
--- /dev/null
+++ b/dev-util/ostree/ostree-2023.3-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="
+	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
+		-> ${P}.tar.xz
+"
+S="${WORKDIR}/lib${P}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="
+	dracut? ( systemd )
+	http2? ( curl )
+	httpd? ( || ( curl soup ) )
+"
+
+RDEPEND="
+	app-arch/xz-utils
+	dev-libs/libassuan
+	dev-libs/glib:2
+	sys-fs/fuse:3
+	sys-libs/zlib
+	archive? ( app-arch/libarchive:= )
+	curl? ( net-misc/curl )
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14:= )
+	soup? ( net-libs/libsoup:2.4 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/ostree-2023.3-libgpg-error-underlinked-lld.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Needs Bison (bug #884289)
+	unset YACC
+
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		--with-grub2-mkconfig-path=grub-mkconfig
+		--with-modern-grub
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut dracut yesbutnoconf) #816867
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup)
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ostree-tmpfiles.conf
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index dd74d3270a2a..e73ca10b6c33 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,8 +6,8 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
-EBUILD perf-5.19-r1.ebuild 8078 BLAKE2B 675f034ee75f7f396ccba6767389c8c3451b1ad65d3d2a6bd60f7a51542f1aa3ee294752c860a908c1ebd691241ca43932b357251d4d9a2f5df8746f3c29081f SHA512 57f560689fd821c7138c3e00299fa97340bc591cd4e135b5a7ea4d14f4719a8716246dd9202d966e913fb2da761255d0f1af4a8fd16cbd06c4875e6557702a49
-EBUILD perf-6.0-r1.ebuild 7536 BLAKE2B 251899b477331f4dd497b719dac3e48de878c291fc99182ba9c7a33119be2ffc7b5e43887a337c2f4bbea47e0b78ee38f3d48752d76e66809528153b88248780 SHA512 4da4de060dfba27d8db0871b21b19181eea6755cd76d15c91d511d2b486b2b70a3db68382811992511545fa9ed0e78ca032b28793e24069b84f04fca16d6d04f
-EBUILD perf-6.2-r1.ebuild 7540 BLAKE2B 3ff6c2d34a8703a43e4aae7085dd3f6442f282d7d1da4ef0014085f23c11f8c72dbef87e3073b1d12401e0ae9dbebd2976656d4e34e61faf3cacc9ddaa21fcbc SHA512 19155d0113bff382d4c0c4df712734562b53e52087c0a7d3e16adaaed1ca7e1d384b7527973de31363a87e596b902ef422b4f9b9bd718a6cd9d0557d2a4dfe69
-EBUILD perf-6.3.ebuild 7540 BLAKE2B 3ff6c2d34a8703a43e4aae7085dd3f6442f282d7d1da4ef0014085f23c11f8c72dbef87e3073b1d12401e0ae9dbebd2976656d4e34e61faf3cacc9ddaa21fcbc SHA512 19155d0113bff382d4c0c4df712734562b53e52087c0a7d3e16adaaed1ca7e1d384b7527973de31363a87e596b902ef422b4f9b9bd718a6cd9d0557d2a4dfe69
+EBUILD perf-5.19-r1.ebuild 8102 BLAKE2B 105241021a13e62d86ba42b1108b1dd1ea5fa87fd95bd18b96d3c54a4b4d0582e3cbeb4307d73f912d1c88713e46afeb6f2736e4d34a9619fab44ce6c2828b93 SHA512 762b2e1c7ff5fc89194f4c08581a9594735f744cfb8e6bd165a31468544f3f59c67224e95dad675c7047162beea6b246d5ffb7f20b052cf8485da6c28780340d
+EBUILD perf-6.0-r1.ebuild 7560 BLAKE2B 0921a84f1138896c749c45097e100ed27ec5fd70901263ac0a04fd9e8b60bd3f748ab8fb815b480c36d53929b21d9511c1718955ca81b1a24307fe8daf762aa7 SHA512 4cca761f3007eb79d9cd9211dfa29bb967447d2c8c2374260674952e0d37180289cf592f50ae39c1b09de9e3f44f3fce2d032c854b50b5318a25ad9f4609f584
+EBUILD perf-6.2-r1.ebuild 7564 BLAKE2B 3faaa7be0ee20a2f26617e6724a8db6b9a6dcec163b69f9fef640ed4727462aaf7e63231046d7d0c5988577c591d3ad1c898812d230c3b949774d4a177864af5 SHA512 f8c4ac3b7c2847a94b833b4fad898afc1e738de11b6e28e1c15136ca40217b57985143dd781ae99a0d5a938708dca2d8bcf6b66d03241a0766e9f3fbe652c189
+EBUILD perf-6.3.ebuild 7564 BLAKE2B 3faaa7be0ee20a2f26617e6724a8db6b9a6dcec163b69f9fef640ed4727462aaf7e63231046d7d0c5988577c591d3ad1c898812d230c3b949774d4a177864af5 SHA512 f8c4ac3b7c2847a94b833b4fad898afc1e738de11b6e28e1c15136ca40217b57985143dd781ae99a0d5a938708dca2d8bcf6b66d03241a0766e9f3fbe652c189
 MISC metadata.xml 1381 BLAKE2B 99d6c9db46b79ad7abd993c123f826dbe3f5e7c33fea98139a7fc694fe4d81e67887873e9edb390d63e65ca351033a8bd62d799fac946e2334188c2a4b776328 SHA512 a952ee2f4173bd2957038614c6ebaa44ff20bcf57f83f8fc5eabbaced667a7254a3e326e0fca541f1ce10bcc4e1d0df0b46600268bf38baf39bb2dda2bb3e41d
diff --git a/dev-util/perf/perf-5.19-r1.ebuild b/dev-util/perf/perf-5.19-r1.ebuild
index ea6fd7e11d61..da0f5c7509fe 100644
--- a/dev-util/perf/perf-5.19-r1.ebuild
+++ b/dev-util/perf/perf-5.19-r1.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-util/perf/perf-6.0-r1.ebuild b/dev-util/perf/perf-6.0-r1.ebuild
index 04184b462006..c1abe01f17eb 100644
--- a/dev-util/perf/perf-6.0-r1.ebuild
+++ b/dev-util/perf/perf-6.0-r1.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-util/perf/perf-6.2-r1.ebuild b/dev-util/perf/perf-6.2-r1.ebuild
index 8a46cf67337d..8c07d2f59dcb 100644
--- a/dev-util/perf/perf-6.2-r1.ebuild
+++ b/dev-util/perf/perf-6.2-r1.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 8a46cf67337d..8c07d2f59dcb 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="
 	${LINUX_PATCH+dev-util/patchutils}
 	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 032ee0249cbc..c3e4af611654 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -2,5 +2,5 @@ AUX re2c-2.1.1-sh.patch 1688 BLAKE2B 1143d1d5867c07aaa48e3c1795b1c4867eba665315a
 DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae
 DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a
 EBUILD re2c-2.1.1-r1.ebuild 987 BLAKE2B 88f463f433850bf1cd45991e2e45f3886701ee923ee8301c3e808ec21af2a17cf33d556c0714ba59c859dda173aae1fbd2675c9d5d46a38db00e3c6ea49bbbde SHA512 9f126a2469d9f466ca93c3c926e6986335a97f5766d0ad7da612c3423393e4e109d7429a1b04a68e63d08a243aeb7480322aa272ec15a738cd06a9528a289c50
-EBUILD re2c-2.2.ebuild 955 BLAKE2B b992bf659a79fcccdc5ef4ab327260aaf93d025a46bc2c8cd96d470eef4ff6d2a3f607f208d34db741bc7d27d1cbe5f7508046bc799b989f87b72c38d81a9e1c SHA512 13c4feab56ce376dce245b66fabaf26fa79de7486a0cbad9313d188612e262b86050063d327aa20023676a484a77a7187e35b1dc937deebf0de7c30346f874de
+EBUILD re2c-2.2.ebuild 948 BLAKE2B a7de350065c3606639b29118a0f01e7b42cccf7fee8dbb04ea1681a64bab2466da74f0ca322498502fb1acca3ee490a8d948d10bb7cd5da1d0069919db00ac39 SHA512 57cab7d6a12c462e8a1e91d0891a4982af56da645217c399ac74e3812dca30208200c4689a8a5bda5f0fcd5bc462fdcf37a841b8e0723dcd8372426adfcabc4f
 MISC metadata.xml 399 BLAKE2B 808d2a6288aabce5ab52a390340da95cc85d463c7418db091a1129d8f1f3617e501c30a5ab35915470ed3926ae7ed532183a82278c6328eeb780319303f1b90d SHA512 b7232e0a8cb71647ac378149386d207d1f960a4bf6c1821cc87a4c4b09bc6836a6dfbc56d4a84cf97e8a0e6ac8726528c294018706c07ca7d785102c4261b974
diff --git a/dev-util/re2c/re2c-2.2.ebuild b/dev-util/re2c/re2c-2.2.ebuild
index ec3084d91c0f..da7ff913ede0 100644
--- a/dev-util/re2c/re2c-2.2.ebuild
+++ b/dev-util/re2c/re2c-2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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"
 IUSE="debug test"
 
 RESTRICT="!test? ( test )"