gentoo auto-resync : 07:08:2024 - 12:37:20

author: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
commit: b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree: f6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-util
parent: 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)
165 files changed, 4469 insertions, 1655 deletions
diff --git a/dev-util/0xtools/0xtools-2.0.3.ebuild b/dev-util/0xtools/0xtools-2.0.3.ebuild
new file mode 100644
index 000000000000..d73227e1d32b
--- /dev/null
+++ b/dev-util/0xtools/0xtools-2.0.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="Always-on profiling for production systems"
+HOMEPAGE="https://0x.tools/
+	https://github.com/tanelpoder/0xtools/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tanelpoder/${PN}.git"
+else
+	SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+
+	sed -e "/^sys.path.append/s|(.*)|('$(python_get_sitedir)/${PN}')|"	\
+		-i bin/psn -i bin/schedlat || die
+}
+
+src_install() {
+	# C executables and scripts
+	exeinto /usr/bin
+	doexe bin/{cpumhz,cpumhzturbo,vmtop,xcapture,xtop}
+	doexe bin/{run_xcapture.sh,run_xcpu.sh}
+
+	# Python executables
+	python_domodule "lib/${PN}"
+	python_doscript bin/psn
+	python_doscript bin/schedlat
+	python_doscript bin/syscallargs
+
+	# Service
+	systemd_dounit xcapture.service
+	systemd_dounit xcapture-restart.service
+	systemd_dounit xcapture-restart.timer
+
+	# Service config
+	insinto /etc/default
+	newins xcapture.default xcapture
+
+	# Service logs
+	keepdir /var/log/xcapture
+
+	einstalldocs
+}
diff --git a/dev-util/0xtools/Manifest b/dev-util/0xtools/Manifest
index 0000a48d2362..45e04de5ee8c 100644
--- a/dev-util/0xtools/Manifest
+++ b/dev-util/0xtools/Manifest
@@ -1,6 +1,8 @@
 DIST 0xtools-1.2.4.tar.gz 61830 BLAKE2B 6221ded289bc4cf4c39527f35d1ad3ee43f41a60a4a9877056a5ff74fcdd203575d96edbf13af1d32bcc49465d87a2133a8dbec813ae9a5bb233b5fe2e4a36b3 SHA512 f835de65e783d9eb4b26f38be155961a2f4da91639c7e1e39df71cf8be17d27987c8749e44b7b6affe6cdc45c5f65c90be5b2cf22b2f37dcc2eb45452a384ff3
 DIST 0xtools-2.0.2.tar.gz 5989710 BLAKE2B 5e4efd4d21e3ed1fc8b1eed5378d25af3170f2386c738a68d28df5bad44ebdb88fd20a0b554d101b678c15131adb83ae786df1267c8333075c58ea58b8c2ce88 SHA512 5cb627e9b990063867869cdbbdefd7e2b6151410ac19950f683086c9200a8ba1f92192378779dbabc4efd91283cd23243a4b46259d97426331f823941b85883b
+DIST 0xtools-2.0.3.tar.gz 5991280 BLAKE2B 26d71f43a0fbe72d38e675cc525fc91b4a738dd3a99ef6804f8855d15341a423d1b5c54ba9e015bea539d15617393d8994c1415a3ee0b74d2d49e97f6b243586 SHA512 012655d8d12fe5a853ccb9503471893ee09bf0fbbe5d3b3be52b5857cac965be63279546c240748d10d727abc2383b8cf2e91b07ffee69ae509494fb5c5d6767
 EBUILD 0xtools-1.2.4.ebuild 1359 BLAKE2B 16f5d4a8baf958a55eab1a130d18d39ac25d0e824889de9336abfc557e7980c9c8b74a438f00fb27846055ad749ca43d162124be26c376f1fd641c431a3b1be9 SHA512 ba018d77933c4e2e347a7817ace9f79ebb642b3f92080f09c386816fd3681b7a9d7a8d16526e29e2a63a6611ecf40362c37f15e0b37647c6bac0ca7a7fef4062
 EBUILD 0xtools-2.0.2.ebuild 1442 BLAKE2B 3cae7b29f4f271fd2fadf7e63edd79255ccac5d81d985c06cdc67959ef940128a59a97fa965062dcb80c94e2007e74a51a2203b77392414a9d4199e87b25d9a6 SHA512 02b648a82c35c85eaeb574739418a241c6ae4584287888f1cd24d07934cd00ec1b7547fa5c83a8f83d4d3f5c5bf354a4bfb3a901fb6fc1c048fd554d69fd39e6
+EBUILD 0xtools-2.0.3.ebuild 1442 BLAKE2B 3cae7b29f4f271fd2fadf7e63edd79255ccac5d81d985c06cdc67959ef940128a59a97fa965062dcb80c94e2007e74a51a2203b77392414a9d4199e87b25d9a6 SHA512 02b648a82c35c85eaeb574739418a241c6ae4584287888f1cd24d07934cd00ec1b7547fa5c83a8f83d4d3f5c5bf354a4bfb3a901fb6fc1c048fd554d69fd39e6
 EBUILD 0xtools-9999.ebuild 1360 BLAKE2B 1a710510aeade291b21d2b1e124244ae2ce5e5666909198a45fb3a4544fe88bfa5f964fb6a98d510f3a0544336a10538e50396663c7d0e47394f02fcf4c4b2ca SHA512 7404eda4db8655977d3db08b594c9f2861937e3663faa57781f19e2697d57310a2ccb08db8df3f617b1ce6006f1caa7d07b79baa123d97e971fb703d6a29c089
 MISC metadata.xml 1292 BLAKE2B b7e2505d33b7af4424dc4336a7d8d1536ed70f92e4dccccf725a54473b109f7718adac34960b5238753336c6b2da5fd0e49def8ae249509c4b0c9e4bc42a89cf SHA512 0ecf2c2bab2cf03656f980788cf05849c3d2e5905f70753b03f76615da377a5463b3d30decddc3a97eaf83d9bef55e31ce104ca6cd459eb0f116c9edeba0edf2
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fce34c37ea35..1cfdaa78f7ba 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/act/Manifest b/dev-util/act/Manifest
index 879edaa29cee..9111997ec8f7 100644
--- a/dev-util/act/Manifest
+++ b/dev-util/act/Manifest
@@ -1,4 +1,7 @@
 DIST act-0.2.59-deps.tar.xz 141042948 BLAKE2B d433f89748585a642e06d31f1699bdd070c5d484f2115d3290238442adc96ea4abfa1b67c1b0dd05d790512545c25f8fa2ce0529f94d89f8475e7cc70d8025f2 SHA512 6550c886c117bdf148ebbe25f88bb2696fb52d5d9770439a6494e9cc1113a69e491206751e695edc85cf9c180c041eac61a7a1e48ddf316dfad2dccca15920e6
 DIST act-0.2.59.tar.gz 9271012 BLAKE2B 69d692cc2df6c00cbacf5015fb56eff19f741f9081d70d0e88b5f27a3743cddd9f4baecc2d1d88edd4416282c7195e691b49fd0bef269c8b100b695bdb61b375 SHA512 30b61ea07e31ca9ba7ee8a5111a743ab486c4e2b628796e92c879ed2c055594144506e370002f54f8c3544eb55023f11cb336c9323830edbdd5e5898b5a6b661
+DIST act-0.2.64-deps.tar.xz 61609320 BLAKE2B 6321544b27b699cf4b4ef781fa1c82f59c055df7ca4307c4fa4ddfadd3ad819670679355859e0126c120617fe44605ed9c658d23a6c024723cbc36e177bbcf18 SHA512 3badad3426264fb2c88803b1681880b7f96caeb54be0b595f1954a8767b78ab510174896f5fded0a6bb6377f0e74882a1211193113f9e41eda6d48a62d959bfd
+DIST act-0.2.64.tar.gz 9281616 BLAKE2B 86d1fafe1a4c5908d985798c45c9767687974ce1fc6c079649e75d3c1edba0b3ee244c5cd56fe7d6ec8f6c57293cd577f55b080d6489544841ed97f2c901d209 SHA512 ecf04d217d39a04552acb3790fc235da097d2d97d7c12ab628458d604ac88431d872b7e137c6232d304ff6589bcf0bf0f8683672de30a891f58dc52fe68b6085
 EBUILD act-0.2.59.ebuild 476 BLAKE2B f719a375305a69609c1f405bd5714ae5973541307990eb5cbf4685615c4990998cef580e3c82fe3974ab37ee775cdf217173aacfeb851c1765ca005ef84da2af SHA512 5cb46ac4c763ad9a6db71fc46890f6aee1446ceb8f3aa056f89b515588a036cd08cf88815149267d4980c11a4061319fb0707da5558d1f665bbbdabb827038be
+EBUILD act-0.2.64.ebuild 476 BLAKE2B f719a375305a69609c1f405bd5714ae5973541307990eb5cbf4685615c4990998cef580e3c82fe3974ab37ee775cdf217173aacfeb851c1765ca005ef84da2af SHA512 5cb46ac4c763ad9a6db71fc46890f6aee1446ceb8f3aa056f89b515588a036cd08cf88815149267d4980c11a4061319fb0707da5558d1f665bbbdabb827038be
 MISC metadata.xml 324 BLAKE2B cbd4e3732c72060ed01aa84cf0ba575d2e271114433c8192705d1bfc4476b55bf178ce085bb3c8bace84325a3dd894ca9d2321e781a24180971e660de2a804bc SHA512 96a20ffc07ef5ef32b0f535848bf8963e3b77408dd00e4201cb9eb5a660e7eb431711950422e54419014ddb99a1891bab4c3a3dcb188634c56c8bbcde0e4c115
diff --git a/dev-util/act/act-0.2.64.ebuild b/dev-util/act/act-0.2.64.ebuild
new file mode 100644
index 000000000000..677e4e224350
--- /dev/null
+++ b/dev-util/act/act-0.2.64.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="run github workflows locally"
+HOMEPAGE="https://nektosact.com"
+SRC_URI="https://github.com/nektos/act/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake VERSION="${PV}" build
+}
+
+src_install() {
+dobin dist/local/act
+}
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 862b979dcd73..b6c7f3488101 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,9 +1,7 @@
-DIST astyle-3.4.8.tar.bz2 229679 BLAKE2B 413204c5f53276ff533300bcb86c8c8ef8cf91371b2ac70431957dee1e713acd64eee6da18e2919ab51ca6757b30363997eeb2baae621a8cb302011adfc80c97 SHA512 8c0c79eea04ecdbc24f6e673a1a848d8682dc4e4f83949887eca5be98d5c485298fb44b0e9c70444c41ed09eb62662335138058bcfc9d3de21978149bc1b6ddc
-DIST astyle-3.4.8.tar.bz2.asc 488 BLAKE2B cb3aada25bb5f6f9c433bdc0a5ee6464ff2266f38a0b0a847349b4d56e7fed5ff055e296a0502c77d7f120aeaf3c7cfbd898850b455f927218cf8a66406e1ce7 SHA512 29085bf168435072c98ea4238798e7123e8ca9595b1a036a1d91dee128718d9c500d010be4cd0f6f7039abffce8341728ba1cdb01b7a06d77500c1e6b0cab873
 DIST astyle-3.4.9.tar.bz2 229873 BLAKE2B f698ec0f3447caf64f324760f9d9feabeb9588f603fb1bfd60b5272cc12525e8c942c084b325f7be1bfe93663de360727ddf8bdc65d38c84512852106cb2f70b SHA512 6538e1e9464564819bd1d8eef041de063a74e8974d2cc5942046a03fa70bd5472c20438bfd270dcf1f00d250d961129ce53b5ad18646505837e176c4e0e3f00a
 DIST astyle-3.4.9.tar.bz2.asc 488 BLAKE2B a5ed720e7c87f3603ba514e0fd15fb3a6687d913ec6cb41323aa5b1b38e76ac4ece310307ad23f8ba4c5d3e7b0cc00b78684d0c219fc50cd9e5db9c327c4f04b SHA512 b9f18e2c20b431b98859b996c52b31edbd9368d3a7ada1324f3139984f5480af860981f3b72802f548f2a73e53232f35fc2256a8a3eb7cc6a31685921682d9e4
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.1-r2.ebuild 1904 BLAKE2B e8237566009bdb2e639a51e597c05ccbfc0fef48e02a960c263ce60222511831bb55ca8040807246cab4730dfab7353ee6f2ab8257ff7475c16839a2a4c50bf1 SHA512 f9640fe5a51ea4f78bf63b1923c6313a604894552597d4c8dce93c537035205f741d5b7acb16650cff80cba20144d984832a7ff49e68e1ad3d6e09f5352c05c2
-EBUILD astyle-3.4.8.ebuild 2151 BLAKE2B fe48d56a15cb09f587befea4ee45c26e9e3062abf78185a43a8cac4d3d6eb6adcc75cf8bac7e17690db2a8dc8971b64bc60b91c994349c77291e565d1ee603c3 SHA512 bb83523f9a00306a6252efbf80150d01f598cb883613c3e5f66a569ac44dd032065d370b87293f71388d65029ec52a17fdc2f9b6eff00fab908aaedb218f9ff1
-EBUILD astyle-3.4.9.ebuild 2151 BLAKE2B fe48d56a15cb09f587befea4ee45c26e9e3062abf78185a43a8cac4d3d6eb6adcc75cf8bac7e17690db2a8dc8971b64bc60b91c994349c77291e565d1ee603c3 SHA512 bb83523f9a00306a6252efbf80150d01f598cb883613c3e5f66a569ac44dd032065d370b87293f71388d65029ec52a17fdc2f9b6eff00fab908aaedb218f9ff1
-MISC metadata.xml 807 BLAKE2B dfd2069298224cf105959f5ee459cde21c66816860ae56591c91d2bea7630c96223361831bbd5f3d36bf2af24d014ac342705f89c21e29e9fa1fa8eea7d8bc53 SHA512 202bd7a541e3d61dbbcae8c23fc7197def7eef8b1cd91b48af8894787d1876651796aea7d191c85ee7ddd9c297912b5b035c5b777ee797dae66ac0cf1d307b6a
+EBUILD astyle-3.4.9-r1.ebuild 2225 BLAKE2B 78f81a8bad0b4c7e648bc7a626008c9af147673ea977e82ca4780a774f557331719e045358d171624c5fca2bcbd6a5e4a59c6d2768244e41d0734c9325d0e908 SHA512 5f1f2085f4775c19bae79a0de8370b07d2745ad554bf2f2a592946d9176ed261e32694700f0fc0e1b42e29a8067fc073b112084174e1c195e0960916a3c15e98
+EBUILD astyle-3.4.9.ebuild 2146 BLAKE2B 4944318e4b5a5bae5b74e2859cdec40ea898189a3f484c1a56db0cef7ec8770ace93367eddd9e06872259b7245571c67ad172ea37290580c96196b4e84238eeb SHA512 b14e366d0c1d457d5c07887b5540d66845c516620b0970d7fcfe7b576948400f437d4aa436bd03cf8531c6907448912b0bcd53e0313e8501d4ffcf388358c2c6
+MISC metadata.xml 728 BLAKE2B 8928b84671119c82cba6cf161e7255d0fd3c0006ee9d81b3bdfba6683e6267c9ab99c606149b9f15c672da485f751feb6165a400d7c123b2bb8540c9d6919674 SHA512 186d0cff75a1deb2d3d72dd17a0775db105a17eb48a0a97c4ae8f5b9156f326bce3b3ac3a301e470457650f97f5e9a647b1325c129f3319cadcaf92ce2209f21
diff --git a/dev-util/astyle/astyle-3.4.8.ebuild b/dev-util/astyle/astyle-3.4.9-r1.ebuild
index 7115ae5fccd3..401c4b1a41b8 100644
--- a/dev-util/astyle/astyle-3.4.8.ebuild
+++ b/dev-util/astyle/astyle-3.4.9-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+
 inherit toolchain-funcs java-pkg-opt-2 verify-sig
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
@@ -19,11 +20,15 @@ SLOT="0/3.2"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples java static-libs"
 
-DEPEND="
+COMMON_DEPEND="
 	app-arch/xz-utils
-	java? ( >=virtual/jdk-1.6:= )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )"
 
 src_prepare() {
diff --git a/dev-util/astyle/astyle-3.4.9.ebuild b/dev-util/astyle/astyle-3.4.9.ebuild
index 7115ae5fccd3..79bd014672ef 100644
--- a/dev-util/astyle/astyle-3.4.9.ebuild
+++ b/dev-util/astyle/astyle-3.4.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/3.2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples java static-libs"
 
 DEPEND="
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index a7dfd57fd7d7..71150eb53b50 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		astyle is a code formatter for C, C++, and Java source code, with many
 		granular formatting options to assist in enforcing code formatting
@@ -18,6 +15,6 @@
 		<remote-id type="gitlab">saalen/astyle</remote-id>
 		<remote-id type="sourceforge">astyle</remote-id>
 		<bugs-to>https://sourceforge.net/p/astyle/bugs/</bugs-to>
-		<doc>http://astyle.sourceforge.net/astyle.html</doc>
+		<doc>https://astyle.sourceforge.net/astyle.html</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/azuredatastudio/Manifest b/dev-util/azuredatastudio/Manifest
index 152de31fd35d..d7b243f4d164 100644
--- a/dev-util/azuredatastudio/Manifest
+++ b/dev-util/azuredatastudio/Manifest
@@ -1,3 +1,5 @@
 DIST azuredatastudio-1.48.1-amd64.deb 135147824 BLAKE2B 91beda52e72ec24c40d7502756396145117d17f7d4c7fa440c1ea03b84e782a6d966189b4db946b710400624d3bd91a9a30158b3fb59f3043c82062bd326c492 SHA512 dd76c9d670a09c440805f3bf5a66b424fb7e1f1e32643ed65852dd47771c0c310881df98a37801012e85deed82a34c42c69105a055306c6f33eb764ec1da88d4
+DIST azuredatastudio-1.49.0-amd64.deb 135147824 BLAKE2B 91beda52e72ec24c40d7502756396145117d17f7d4c7fa440c1ea03b84e782a6d966189b4db946b710400624d3bd91a9a30158b3fb59f3043c82062bd326c492 SHA512 dd76c9d670a09c440805f3bf5a66b424fb7e1f1e32643ed65852dd47771c0c310881df98a37801012e85deed82a34c42c69105a055306c6f33eb764ec1da88d4
 EBUILD azuredatastudio-1.48.1.ebuild 2398 BLAKE2B db21b0bde24d816e8147e6fd79c663fd75d555b3014df30c8f8f5eae6f5619f3616e8cc16e6c71963b5896b9a94538a02707b7ebe5e3f939854827e082834d06 SHA512 ef2d5c3ddb765eb23d6ab5671c38d5d323d9d56d251b426900973b0caba84b3c581cd30839ff175ec7fc7a3b4f92aa32f6e0f850014c9b717385703d88aea6e7
+EBUILD azuredatastudio-1.49.0.ebuild 2398 BLAKE2B db21b0bde24d816e8147e6fd79c663fd75d555b3014df30c8f8f5eae6f5619f3616e8cc16e6c71963b5896b9a94538a02707b7ebe5e3f939854827e082834d06 SHA512 ef2d5c3ddb765eb23d6ab5671c38d5d323d9d56d251b426900973b0caba84b3c581cd30839ff175ec7fc7a3b4f92aa32f6e0f850014c9b717385703d88aea6e7
 MISC metadata.xml 822 BLAKE2B 72cadf27f137f7276f8cd3b3fc81afd0ac1eefa9f12e39aea8d81705454a17aa8d2b49de9d61c0523fda304dcf0363ef463d0b2fdbd04a524aa63a2ced6a6a6a SHA512 27dbc8a269df130994b8d59cefb193440b276638ef460f68d72e887dc02d40473218febc1ecf242a51f55593d90a3ea42255e4a8d8ce4237421c9e56e52c7030
diff --git a/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild b/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild
new file mode 100644
index 000000000000..d8d032ceea34
--- /dev/null
+++ b/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker xdg
+
+DESCRIPTION="Data management and development tool from Microsoft"
+HOMEPAGE="https://learn.microsoft.com/sql/azure-data-studio/
+	https://github.com/microsoft/azuredatastudio/"
+SRC_URI="
+	amd64? (
+		https://azuredatastudio-update.azurewebsites.net/${PV}/linux-deb-x64/stable
+			-> ${P}-amd64.deb
+	)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="kerberos"
+RESTRICT="bindist"
+
+# This is based on VSCode/VSCodium, so just copy their "RDEPEND".
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-util/lttng-ust:0/2.12
+	media-libs/alsa-lib
+	media-libs/libcanberra[gtk3]
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libnotify
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+DEPEND="
+	dev-libs/openssl-compat:1.0.0
+"
+BDEPEND="
+	dev-util/patchelf
+"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack_deb "${A}"
+}
+
+src_prepare() {
+	default
+
+	cd "${S}/usr/share" || die
+
+	mv appdata metainfo || die
+	mv zsh/vendor-completions zsh/site-functions || die
+
+	cd "${PN}" || die
+
+	# Kerberos libs, same issue as VSCode/VSCodium.
+	if ! use kerberos ; then
+		rm -r resources/app/node_modules.asar.unpacked/kerberos || die
+	fi
+
+	# Patch "System.Security.Cryptography.Native.OpenSsl.so": *.so.10 -> *.so.1.0.0
+	local mssql_ext_version=4.11.1.1
+	local mssql_ext_lib=System.Security.Cryptography.Native.OpenSsl.so
+	cd "resources/app/extensions/mssql/sqltoolsservice/Linux/${mssql_ext_version}" || die
+	patchelf --add-needed libcrypto.so.1.0.0 "${mssql_ext_lib}" || die
+	patchelf --add-needed libssl.so.1.0.0 "${mssql_ext_lib}" || die
+	patchelf --remove-needed libcrypto.so.10 "${mssql_ext_lib}" || die
+	patchelf --remove-needed libssl.so.10 "${mssql_ext_lib}" || die
+	rm System.Native.a || die
+}
+
+src_install() {
+	cp -r . "${ED}" || die
+
+	dosym -r "/usr/share/${PN}/${PN}" "/usr/bin/${PN}"
+}
diff --git a/dev-util/bindgen/Manifest b/dev-util/bindgen/Manifest
index 60b1d4d64824..b89aa554c0ce 100644
--- a/dev-util/bindgen/Manifest
+++ b/dev-util/bindgen/Manifest
@@ -1,6 +1,7 @@
 DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
 DIST annotate-snippets-0.9.1.crate 31829 BLAKE2B 6919f78127653f9f022667b0ee7cb80bd2ef95220698e033031c6f4d3ff3341ed260e8baf776d032291538503e26577fc8fa82e99bcdc032985fb297351586a3 SHA512 e1e8b262a6681730ad068c29d7e0f3879acf0c7138721f606851228bd5d90292f24ac2c225fe49f26264e7d35de5ed3904850e522da8cd2c44a67f7db36f2d8e
 DIST bindgen-0.68.1.tar.gz 2315521 BLAKE2B c6101387c664db0d8f5197968e3d20addb5bbd0e82099406bab60a752daee1a0edbaecf5e32a08c83302739a7874e4d2274b1ab7fbd7131e60dc6982d5fa954f SHA512 da7af58cef17c68563205fbaa00a54c40842a0d3d76cc723eccca72689c4ab8664b374ea45dcb9f518d54b2fb6c61af08243e44628b351af9e9558c8acf49db4
+DIST bindgen-0.69.4.tar.gz 2314307 BLAKE2B 7329cf00154a4a1f892dda151f5d8dec986f15b342d76c1e658ff66e927bfc0da06f4ee50b3db3147b5ea8b51b34a11c95fd99f0bf4d850c8733542484de7214 SHA512 a493474c89255c801c6fd4eb44e6a94f4d23830dc13c0bbae08c46e5c364e0df176fc00174d6462b70239578d0821e9ff1aaf127d8c60688f38a50a62cf292f4
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.2.1.crate 35798 BLAKE2B 9ed2e0764edb3f164385e4420e8c9a133757194ee2763743692520d2389ee81c987a081db68510963d66a02555d20bc6decd83f707309040a7295522ddfa35f3 SHA512 413b602edb82f8a4553735e46feefe323137b742d003368e037406157f916e5a5ea002d015a27cf8d41accca75f103c6712e2268fe2853d4d5e93e7264682182
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
@@ -27,6 +28,7 @@ DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-1.0.4.crate 35815 BLAKE2B 82485bfd13189e0762f7ee501626df0dc741e152ceed875b91a3eed6608686b6d454939d557a0bc29d6bf210dfbe56d35131beb141fc95250544ab8ea992482b SHA512 1b2b151561dc79d1467b699590b2cb5d4acb39f75f38c05a94edb6d1543acca541b5a083fe7b606bc37cb2812692b7acb46996d0b096b96b0b085d31b1336775
 DIST is-terminal-0.4.7.crate 8356 BLAKE2B f0f42d6f6204c68bc8a9e1290b9b059ec55f5aa2f83f6966711a5f986852befe21ac9281fd611e65cb4fcbf35dfb212748785c7258c44602e7e390c51f09dec5 SHA512 56c00b2942963f8a0b5c40c96a885f85565fb09e247bfd5a3e77ca5c9e0e0e40a17a8d809c0541177e8b496fef87baac4b86c751765491ffffdb631515d8acf5
+DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
@@ -55,9 +57,11 @@ DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379
 DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustix-0.36.16.crate 290950 BLAKE2B 7f453c242a03747ac25af6272f0d2eec4fda98b15537da30849160ac394664c5570142683e442207b0c51ac025e2c572570854f4f6efaa73ab83d7fc9e7c3421 SHA512 539fed8219e0784115a693d0b6152f1ad183a1ba8edd28407264b6de2fbb491a3b07d705abb33abdd48d76c7fd107f427b250a9d707df1ffb279babe5a0d0117
 DIST rustix-0.36.7.crate 290628 BLAKE2B 7cdd5610fb4c5c079de7dcead4d68115c67f56c77404dfc946c80062c44b5e821bdfc1c1ac0139c1dc9f0a7bca73076136dc38a08c1b690f00ea25353b9259ba SHA512 ed5fd16a983d2549ed8322c261fca651fcf0dfbd4eb1f7bfd896830434768fac317cb410ccf7fcf03a8b29f3de7dd06b5b4b6be4278f4fa13aa46f462a9e66ad
 DIST rustix-0.37.3.crate 302028 BLAKE2B 93da61e8e6a8520aead3394bbd2716600b46921ba22a24731a7d1c3194b87c85add87316b704ee2dfd5e00c60c3d48ebac13e75c62a7acaa1a38e6074b541f8e SHA512 8c3250f49232e20f8f37ac2b3742eafc12119536c8b618329c6e3c9b002f7f8904a98922b40f83956f575d872ec72690c3610ed61cdbd34aabe34a380cdf5e91
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST similar-2.2.1.crate 51147 BLAKE2B c86005ff69a14980db2cb90b13ed908448a711f09d1ee20a109d1dab2cc5bd839274f3803082721f1d81003c9011efdadcd190f4cb46eb09b26e338107546f45 SHA512 9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
@@ -93,5 +97,6 @@ DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d15799780
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
-EBUILD bindgen-0.68.1.ebuild 2741 BLAKE2B 4b96861a1f99907ac4f6878e0cb875ba748124a85c96f01c95f1559c9b593c2261199e119a0f651cc68dd735d3b5715bde2d2037bdbfcb05093e54f3efaf56b5 SHA512 d127e3e0c73b463191f31424d30cd3aa25c8c0e6d6d1f88da13a69320619ee6189c63faa238c0a6b5975eb874d4645885efac22541b8979929aa6a0067706daf
+EBUILD bindgen-0.68.1.ebuild 2741 BLAKE2B 37374068a1ca84c6f096468a2fa359843ed9d5919e64df4f5683c11a8f2701904b698c822039e84bfbf09742075b170f6c6b2408a4b9ec760aada3d8e9949d3f SHA512 3a4f7aa288216b880fd0a0324d94295970812b062aaa229e9cabd92c7568a010d23598309259138f471d41a5d678fce74b09155eebe23dd815945520242d76b5
+EBUILD bindgen-0.69.4.ebuild 2679 BLAKE2B 3de9479f29196ad83ffe09334cb722f6c2cc767a9cddae81c1ab222df86aad550cfd183f4b4d32e359dde3ca2d273a6d1148d6baea280f60a5cc484c9b1819d8 SHA512 fb4775b2ac6f5110c2cf8fb574d9d951cabb92ef931cae2bf2df80523ee6e4c43aa9e21cb0692e39002f4e77657c02ab5985aa260d42bfa4d9c3e7e0c1edd491
 MISC metadata.xml 593 BLAKE2B e84dad03374ab90f8d3ea1248e3a4e44799aa63408505ab117b2f6e7064bfe1ca388c32f0cf2c52fb13d91ebde7d0677a22d1ac5bfc166fa6b86d9a781e26355 SHA512 820e8d517c9adc773061903ea62daaf2af28c9861498d6bdb8117866bf34d00276d87f0d17c17d5c75b9e3746c6dca871800341f75ab52ed34fef28bf2a7f207
diff --git a/dev-util/bindgen/bindgen-0.68.1.ebuild b/dev-util/bindgen/bindgen-0.68.1.ebuild
index 3038e2d54da7..23360f73eeba 100644
--- a/dev-util/bindgen/bindgen-0.68.1.ebuild
+++ b/dev-util/bindgen/bindgen-0.68.1.ebuild
@@ -118,7 +118,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 DEPEND="virtual/rust"
 RDEPEND="${DEPEND}
-	sys-devel/clang:="
+	sys-devel/clang:*"
 
 QA_FLAGS_IGNORED="usr/bin/bindgen"
 
diff --git a/dev-util/bindgen/bindgen-0.69.4.ebuild b/dev-util/bindgen/bindgen-0.69.4.ebuild
new file mode 100644
index 000000000000..c4530208f4ae
--- /dev/null
+++ b/dev-util/bindgen/bindgen-0.69.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@0.7.20
+	annotate-snippets@0.9.1
+	bitflags@1.3.2
+	bitflags@2.2.1
+	block@0.1.6
+	cc@1.0.78
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.4.0
+	clap@4.1.4
+	clap_complete@4.2.0
+	clap_derive@4.1.0
+	clap_lex@0.3.1
+	either@1.8.1
+	env_logger@0.10.0
+	env_logger@0.8.4
+	errno-dragonfly@0.1.2
+	errno@0.3.1
+	fastrand@1.8.0
+	getrandom@0.2.8
+	glob@0.3.1
+	heck@0.4.0
+	hermit-abi@0.3.2
+	humantime@2.1.0
+	instant@0.1.12
+	io-lifetimes@1.0.4
+	is-terminal@0.4.7
+	itertools@0.12.1
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.139
+	libloading@0.7.4
+	linux-raw-sys@0.1.4
+	linux-raw-sys@0.3.8
+	log@0.4.17
+	malloc_buf@0.0.6
+	memchr@2.5.0
+	minimal-lexical@0.2.1
+	nom@7.1.3
+	objc@0.2.7
+	once_cell@1.17.0
+	os_str_bytes@6.4.1
+	owo-colors@3.5.0
+	prettyplease@0.2.7
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.60
+	quickcheck@1.0.3
+	quote@1.0.28
+	rand@0.8.5
+	rand_core@0.6.4
+	redox_syscall@0.2.16
+	regex-syntax@0.6.28
+	regex@1.7.1
+	rustc-hash@1.1.0
+	rustix@0.36.16
+	rustix@0.37.3
+	shlex@1.3.0
+	similar@2.2.1
+	strsim@0.10.0
+	syn@1.0.107
+	syn@2.0.18
+	tempfile@3.4.0
+	termcolor@1.2.0
+	unicode-ident@1.0.6
+	unicode-width@0.1.10
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	which@4.4.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-targets@0.42.2
+	windows-targets@0.48.1
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	yansi-term@0.1.2
+"
+
+inherit rust-toolchain cargo
+
+DESCRIPTION="Automatically generates Rust FFI bindings to C and C++ libraries."
+HOMEPAGE="https://rust-lang.github.io/rust-bindgen/"
+SRC_URI="https://github.com/rust-lang/rust-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S=${WORKDIR}/rust-${P}
+
+LICENSE="BSD"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+DEPEND="virtual/rust"
+RDEPEND="${DEPEND}
+	sys-devel/clang:*"
+
+QA_FLAGS_IGNORED="usr/bin/bindgen"
+
+src_test () {
+	# required by clang during tests
+	local -x TARGET=$(rust_abi)
+
+	cargo_src_test --bins --lib
+}
+
+src_install () {
+	cargo_src_install --path "${S}/bindgen-cli"
+
+	einstalldocs
+}
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 978b9c662445..a1636ad0fcbc 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,10 +1,10 @@
 DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
 DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
-DIST patch-6.10.xz 6489436 BLAKE2B 96ab8c23a804ae0d3dc5834efa19f9f9d8b4cd1e84d7519670e3e5213af0ef016079d4c0624f45d4163af7b250cb5ab30aec28bb62433d7480ab3d3a11e681b6 SHA512 adbc39835028aa67aa949310c9d44d83c6fddf6a12fbc305960d935bd7e2009e1ff813f2388cd59e59bf64efb2e1df51a6d266594fa12e75074d7346c78bb2eb
+DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
 DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac SHA512 a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
 DIST patch-6.9.2.xz 16184 BLAKE2B 8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9 SHA512 a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec
 EBUILD bpftool-6.8.2.ebuild 3101 BLAKE2B b032c5133f13d0a2f789a08fa054bd5d88cc729026974189d20b9d91f6295fdbad39056acc1223e78923b6201d91799c8cb833948135bccf25b84b4c25f00d5d SHA512 1efcf7572c1aa378394f38d2b939752aaf3215f92ffa227c493d0e3e9c8f945bcca82f759487386cd62e9c5996400395a944962f61af20fc62f8a206b57740d5
 EBUILD bpftool-6.9.2.ebuild 3125 BLAKE2B a8395a94a01d8fe758246cc158713ca30f928aa4051380f6fbb4a285f7a16a223db02b199b422242adca3df4032d79daa20b9420f3a4543aeefca128e41ddfad SHA512 3931abd489a3cbb7aaaf4ea8fd004a45c4a27c8a645fb7eb5088fab3186ebc59b61d58e4b0704dd1c264eee50a95288ad1824af0aff482da306c282465d3013b
-EBUILD bpftool-7.5.0.ebuild 3132 BLAKE2B 95deb5713bd69d0c18096a9a71f96f17e330b8c170f56d9bb3357713e7f995a3cc08101dcab10c3ba13e6eade7ae9da8d749197c4d37bbb93ff744233ba5ac83 SHA512 24145eb9b842c7f766ea798b122038e6fd93dc3a99607129e44f81e232f1f4dae14bf4009b4d1422e894ed5d4e62853666c4aea86b9011f6932998d871132010
+EBUILD bpftool-7.5.0-r1.ebuild 3370 BLAKE2B 88fbee8c78af9becd4211536dc9bfa1144093da98473783c5d48460a971354865ab5f5c80e236e387a2d95f522e515664699dfa6ff278149c7ad0434da385ebe SHA512 2bf6216522aebab3d769a62a84d9bde32ee4587b0470205afa9c35fcdbb663bf0b5e28e05686fd9866f21f0a178f95c4cd3b3525de727c66fc5b34f159fd46d6
 MISC metadata.xml 576 BLAKE2B 43e31ea0f23589a48d8169dfff0ae2a18fd665c7fe323d454ad9a6f13b46f39886ce92bf7ce1fc1f047fd25b1a6085e873234a1c9d30462251ad7c56ea7ef731 SHA512 bd878bf328a7bd08614e5a152d6f8f653d2faf30cecbdb94af9fb11662e19252ef96df921588260dd90b55c981babd0c92766aa6ae2b04638364c761887e1cea
diff --git a/dev-util/bpftool/bpftool-7.5.0.ebuild b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
index 9a93a41059b6..95dece1442f5 100644
--- a/dev-util/bpftool/bpftool-7.5.0.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
 HOMEPAGE="https://kernel.org/"
 
-# Use PV to indicate the full kernel version
-MY_PV=6.10
-LINUX_V="${MY_PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2 ${MY_PV})
+# Use LINUX_VERSION to specify the full kernel version triple (x.y.z)
+LINUX_VERSION=6.10.3
+LINUX_VER=$(ver_cut 1-2 ${LINUX_VERSION})
+LINUX_V="${LINUX_VERSION:0:1}.x"
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
-LINUX_PATCH=patch-${MY_PV}.xz
+LINUX_PATCH="patch-${LINUX_VERSION}.xz"
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
@@ -53,8 +53,10 @@ CONFIG_CHECK="~DEBUG_INFO_BTF"
 # it's building from the same tarball, please keep it in sync with perf
 src_unpack() {
 	local paths=(
-		kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
-		scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
+		'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
+		'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
+		'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
+		'tools/scripts/*'
 	)
 
 	# We expect the tar implementation to support the -j and --wildcards option
@@ -65,8 +67,9 @@ src_unpack() {
 	if [[ -n ${LINUX_PATCH} ]] ; then
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
+		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+		test -s ${P}.patch
+		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
 		eshopts_pop
 	fi
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index e8797a4b295f..1ae8fbbc2f99 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,4 +1,5 @@
+AUX ccls-0.20240202-gcc15-cstdint.patch 612 BLAKE2B a1c979b30a6477e5b0785313ad67dfab3921ea7d70aba733be519ee7917fd77cc1a8f402db4d7b3b478d25357e1eec7bc9f7db454fef09c3b86e3bf3cbb9acd2 SHA512 46dd83941d7e8deae089f73deba03927b953fc07a4d8be7f699c51c88ff6a6ac7eaba80ac4bc450d56d0fe5131a2b10a8016187a870ed5b29fcc08b72d011240
 DIST ccls-0.20240202.tar.gz 162283 BLAKE2B e96ae688690cfac13505e710c4b31afc5a3281bcb735d5f215b364870e0958b0b11799ab4340b74ef1530eb8d378d2b8dd7fddb1b16cbe5707073d63bce4a985 SHA512 bf30c869b985d7d6c0ecabfcc563b4983616c4f47ba743586a23441575695d87557113cdfd2603185adc454940d9244c331d9dc16444564358c910e2d61e9281
-EBUILD ccls-0.20240202.ebuild 902 BLAKE2B 574359f462818e85d36ac247fbe0440d6793d691e6b6a8488183ff3a52a87faf8d8bfc9d7c3719b70bea7bb4307f8e11ec7be0fdcbc22f146d5dd76e53d0ed90 SHA512 ec023757b92193166e13097be1fa51d80e39f5cc3f37cb8d4d00d1f1c460ae1ef9ab2bf6b10871d24ffc29f76ff582886eaa296ad8f4fe0d31a0b5f7149bec1d
+EBUILD ccls-0.20240202.ebuild 966 BLAKE2B edb93d9343609e640315de7798d3ee144003938de8dd2c7780e3a57d434f87febc9429ebe92c37be8d68eefbe3f3b5e74e34a43aabe450229e32d48f1f535d2d SHA512 4e2efc6beaad0817b8769346104ed694b82c5ca99e6863a35bb718845af69065d004106b27da261fa8d2ed797cf740f22e0416f6573bb042e2b335ea84d3b266
 EBUILD ccls-9999.ebuild 903 BLAKE2B 04ee9d24877110aa22968785dadfb7d99267773dd7acbf9e2df3cb27f75ca7323ae2ad42863124b32e519696fddf1bff26515fde7cb02679cb8a96d7222b78a6 SHA512 f0c8f0a245d1b60a3d4458b3ab766192419a638d47c53a4893760c2e19861089176fbb564bb24a2c62d2e9fd24ebc1fbf5b88018238dde5890482c69ef994977
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20240202.ebuild b/dev-util/ccls/ccls-0.20240202.ebuild
index 1cb54ca0aa66..d0c1c4208ec0 100644
--- a/dev-util/ccls/ccls-0.20240202.ebuild
+++ b/dev-util/ccls/ccls-0.20240202.ebuild
@@ -33,6 +33,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/ccls-0.20240202-gcc15-cstdint.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCCLS_VERSION=${PV}
diff --git a/dev-util/ccls/files/ccls-0.20240202-gcc15-cstdint.patch b/dev-util/ccls/files/ccls-0.20240202-gcc15-cstdint.patch
new file mode 100644
index 000000000000..ffc988d38010
--- /dev/null
+++ b/dev-util/ccls/files/ccls-0.20240202-gcc15-cstdint.patch
@@ -0,0 +1,22 @@
+https://github.com/MaskRay/ccls/pull/968
+
+From dcb10d17de5aa9d2fb2278ea87e76d042d9fda77 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Aug 2024 11:41:47 +0100
+Subject: [PATCH] utils: Add `<cstdint>`
+
+utils uses `uint64_t` without including `<cstdint>`
+which fails to build w/ GCC 15 after a change in libstdc++ [0]
+
+[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2
+--- a/src/utils.hh
++++ b/src/utils.hh
+@@ -6,6 +6,7 @@
+ #include <optional>
+ #include <string_view>
+ 
++#include <cstdint>
+ #include <iterator>
+ #include <memory>
+ #include <string>
+
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 8bca82977486..71dc307335b9 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -2,6 +2,6 @@ DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d98758714
 DIST frr-9.0.2.tar.gz 10341186 BLAKE2B e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f SHA512 2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
 EBUILD clippy-9.0.1.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
-EBUILD clippy-9.0.2.ebuild 1163 BLAKE2B 6d6775a6f7c67d3438d41ce9f9bbfb8a7e99b1d78597b506828bbf4bcc2bcc59c337893fda46491006d48b194deb5d98343b54ba678b5046ab9ca12225ee1060 SHA512 c42c29c808e4676b2c2e3add7349597f2788deaff606d812ee83433e48795ef97f19c1c1859f26f572d07221b9810a94864c1980afd2abcd5ad313eb2e22f7f3
+EBUILD clippy-9.0.2.ebuild 1164 BLAKE2B 3fc69562994383212707701565bf210561bc0b25144cd45f85b65baa00242f51aacc91e391d9c0bb1e8fbb42855f4cef11a2cc16a05fa64531a3620616640f76 SHA512 deb719aab12c5a98093dc5cad97d14d925b005265f79f0c44b510fa948bd690310e7851f11e1af56f324c124081cce5fcb40c417840ab2940d0869a1cba8905e
 EBUILD clippy-9.0.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
 MISC metadata.xml 590 BLAKE2B 03cc6d8c7b3ebcc2be5e4522d4ee42a01c8f631d71f00c693fc3ea59390bbd77bd2da32058f97b967e1e5f15df860eb2117d617b84fd75959bab368727d18848 SHA512 c2e8dc96da08d30cdfa8285c9bf4bd0f516bd759fb9944cafced9af67442b77fce0051ade7253f017c4380f2a61c82446f2c35d52c7af561a98bbd2f469d3906
diff --git a/dev-util/clippy/clippy-9.0.2.ebuild b/dev-util/clippy/clippy-9.0.2.ebuild
index 5c9ed4fb9169..936a8241b167 100644
--- a/dev-util/clippy/clippy-9.0.2.ebuild
+++ b/dev-util/clippy/clippy-9.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standalone clippy tool built from FRR sources"
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 9b84ef5084f9..7ed0f1a9af46 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,7 +1,9 @@
 DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994a8008b0074899bfb999262d529432ab1e8a1c7cc80dc1fefc9514596f099a4238c4768618057ba3b180e8 SHA512 0acd152b387d3088d8bd35d121677d00accb03f882d83bfb34924915d40700b0c23bca1bde924d1999b5fa910503d33af230567fcc8f452f7d00a69caaaf8c4f
 DIST cloc-1.90.tar.gz 596758 BLAKE2B 273a0ade1cb5d95fda3404b46869fa970276aae0f4f733efafad7949170e63713059e1a09dffae23a3469517bcce1ab6029b4a91b1900ddc7aa4dd5ec0ab2127 SHA512 d2950d56ac4d8a6fe53059759375d8245aa8a8474462daec385a8b4e2f36961270c08390c361d4a0566e529357b0d302cef31c8fc69dc680655f4c3ea3a1d813
 DIST cloc-1.96.tar.gz 646774 BLAKE2B b632d07e1f3b89b210feee80d861e840f16b66899182c1787212b0aebadb9fa6a7ab33935e3df9f9727ac3a696b776f877f5ab858d506c6917babaa3203ff9fc SHA512 459633ec1b0cf9b17ee7a502d0573b6c35ba76518a9d94f9c4e4f99d85873c8934782ac0cffa8616848378e500bc6dfa74b278cf771a7542cedb505f69471708
+DIST cloc-2.00.tar.gz 687731 BLAKE2B 3cf5a2b954631a2ef56469485cc2b9f3c4ecfeedc7ba37a14d5d6f46c9841f94b48ff79ef740e63559cf7e7d9a8309b93c98c0281e82c8f724c81a1ebfdaca95 SHA512 2796528acadee62b5649896efc0f1029c7e213820f5b87f92a2d77bf452adb4dec36d5cc1c0853b459399dd5ade20eaf356a06f9734a9e02cddaff6a9460f85e
 EBUILD cloc-1.88.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
 EBUILD cloc-1.90.ebuild 706 BLAKE2B 0b1ee3f9dcf498ea639451953bf6ac5aecb8dbe069e9f3956f41e9006084bfbb098d00f0036a5d08294caa78fbe07ce19be5ba2e05305f36d6a28e3aa5efa421 SHA512 063f6649bf507ba5d9b47ec08af5ffb91bdd6d6e44814ed54e6091ad63e3696e11d5efd32faefbe1d234e1ef7e78e111d45e2f6e0aaa486c0c08f9954a64c953
 EBUILD cloc-1.96.ebuild 708 BLAKE2B ab1ee92e8ceb7563a62e45e2ecfdb43593f43f55340d8b20d88612d089cdb944466031a22ebcdfd9aa1b74deb78d33a5e9a9b4cd38110cc154fa5f5f148ac5b6 SHA512 e33fb560d3ff5ea4b86a326d63b57aa5ed72faccff23759960c81f090e257325ef24965d0fcd90591daf50d2093fd67c29713955ff505b0e1b86460f63788a5e
+EBUILD cloc-2.00.ebuild 708 BLAKE2B aeeec340658b8f3d1167bdb94858e7c75b824bab8cc12fe666eedcbf55d7fd7148761c1f7dbae9181030ddba6080107e7de3f77e28cbfc95c693fcaf83951479 SHA512 666e98ad6bc2f7314a30542ad59f375c79e67dd907ca192febda5056c5097823c9e8cdf4d4c452875d2ab29b666710c328d09afa639193835cd1384d7efa7f88
 MISC metadata.xml 730 BLAKE2B 55d88ba6367e16aed1fbe5877a777bf1fb09793c040d8b317e8b09d73419fd61ee66d800835e518c09ed3470b6ea034cfb572335a8d312583e8172f36a74b11d SHA512 f7b98f9dc54bcb268fc51151fce719e2c89d1d251c4a9cbe3632faccfd68e5fd5705d7a8ae985e3599241bd72784103b382b53e7ef6a615d7c5637bbdebe14d4
diff --git a/dev-util/cloc/cloc-2.00.ebuild b/dev-util/cloc/cloc-2.00.ebuild
new file mode 100644
index 000000000000..1d5399d36cff
--- /dev/null
+++ b/dev-util/cloc/cloc-2.00.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
+	dev-perl/Regexp-Common
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+	doman "${PN}.1"
+	dobin "Unix/${PN}"
+}
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index ef9fd670ede1..e3c40dbe6438 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,4 +5,4 @@ DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a
 EBUILD cppcheck-2.13.0.ebuild 3174 BLAKE2B 8809bee9b0fcebb6e56de883dcd1db2102ddd50789d1992445416eaf76d22a0dbb5c8583e32b5e88cef51425c9769b11b7a69399e8b8bfbb1a3c33a2a2caa342 SHA512 d0ec553281ddcdca9d2750fe2d786f87336847ab4dcbd31f259a98d4014163e85a2ed145a85b2795362f8ce8d1dea9510aaf5eae51c5d201f778fcd77bd71757
 EBUILD cppcheck-2.14.2.ebuild 3078 BLAKE2B 53e0031e13fb36b22cc1d4052157207fa3694745009c4c67baeb6859ed9ff012c641224a813f406a339745c90fef0167fc07234754f8495a7df89c888037ab94 SHA512 f80ae436fa324556ada875032705e5ac53cc4a6fe8ae27eb0d547f0980f2022e0af4b65358be0bfd76b38ad5a2fbb466d89f64b6a0539beaf136c7437dc64fd8
 EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0
-MISC metadata.xml 519 BLAKE2B 8f520238cfead1bbf8f534fcfb733805de6c657379d6eb02e5e823d5cdb4716fa5fd2b3aae63009601d06e79f82519c159c86d234e59f0966568ceb3ad58f5fb SHA512 d4472b2285c72f3fb891678374c73f0204556d247ac56489484739b4cfaece956974189653feb81d58d8418cb9563378ce3f040d093238f1a2dd27216c8a361c
+MISC metadata.xml 439 BLAKE2B 2fae88ef8445fcf382e68d615e7f9c4b41ce119785b9d3a8a3685297270043da641c8e454e40de2507f6e17a91846488e4dcb1a72e09e241287fb06cc531ae82 SHA512 64084c96f491b6f966d9b20409ec43a530280c01e29c2c531a43bb40d62263c7fb9e1c55079cddfe2eb437ffa6ca431a9dce758a5932c549bd8cb5850a8769c8
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 4e56958744c0..4f3e5ddc6036 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="charts">Enable QtCharts usage in the GUI</flag>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
diff --git a/dev-util/cucumber-ci-environment/Manifest b/dev-util/cucumber-ci-environment/Manifest
index 0d67210957bb..1cfd9472131d 100644
--- a/dev-util/cucumber-ci-environment/Manifest
+++ b/dev-util/cucumber-ci-environment/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-ci-environment-10.0.1.gem 8192 BLAKE2B 7c4e28abf16719603bf2ad328d5ef7649c21abb7ef689f1765182452ebb43261185790b428a15c7c376d6bba8d85824b3938056a447f5c88343a95a90868add4 SHA512 a8b85443320dfc70ea7930f0c3c1596d916be37690b87e75b2891ab7b9561f5fa064c777b05aaab0a54d8bb3b23ac7d3ce8c892090ac5e3530e933e3daaa3bf0
 DIST cucumber-ci-environment-9.1.0.gem 9216 BLAKE2B 79287ac684faf3584ad18ddea54a6eb6bff6bf9ed76fb0c9126c4a0516aaebfebb09f9d5f5ecec44e84e7f1604bde6c53ae06e4ab339a0a2c79448dd9358f08a SHA512 3386783e70ed80f0465453708f14e5415d64feb4a995d05dbf04d8af9d38a25b089cd1a51b6d830d4aabf2b5499956d53d90f8e1e77d445ba00f8bb5e83685b0
 DIST cucumber-ci-environment-9.2.0.gem 9216 BLAKE2B 6b7dfd4665a576af3a86997c06c319c4af622ccd368184dc5c70dae9a5aa7b49cc29362292308a1f8a66a68b505617fb7ab2f7121879e5203969af830715a8d9 SHA512 686134bb445ee6ba572ff8228e1d550b598f8d85c991a24a8a766ad47d2f90638369aa2dd6ba88d6bfda3f3c676bb06d1584b9f79d7f50e078ff21c38284e5d0
-EBUILD cucumber-ci-environment-10.0.1.ebuild 421 BLAKE2B 15daa067e4be8fe580a3fc00c68db41b3242d348ee9ac29898f6f11cc6c47719d0ba7baeb28fc3519df51e55e02e6f461462ec648d3b6697bda23245c2108ad7 SHA512 0d103713b3b75bdf25a4d95ba5b96f72e6e889ad01feaada3dd81bcf95f2c62a922daf53449a9361550b664a0100c820bb5548240bb3036ef0fc7974069e72a0
+EBUILD cucumber-ci-environment-10.0.1.ebuild 418 BLAKE2B 2e33f71572cb08261f660baba4a7f50eee9b14dcd41865aab95cfa047322930a5033f3470ef328288354b12a8ed4e570b254375984fd0b91b5f1d059075e68c0 SHA512 0bdfaba0dc90e0dacac24e16776e3a4acd6d1fc64c27869f29d8380e281494621e634069716e5884d28aa09bba2557db9ee4d61edbf3492c929fb064719d9b71
 EBUILD cucumber-ci-environment-9.1.0.ebuild 424 BLAKE2B 620c7305124cfd35222afd5b9f34d6cf966d6b876fcd22bd28cb9e842e1de7cd8cf07321a6adfeb6cca5f27955dd1f7fcf5231ff8a615f759a173f9c356fc372 SHA512 41edd498b0e5b7020de2d7e702bc9b53366ba8fa92dedbbfd21fdfc2fb8bf205f7e772e1536bb7bd5c496c7f07785742514b3c7dc7a5c04f2b5b2c82861a83f7
 EBUILD cucumber-ci-environment-9.2.0.ebuild 424 BLAKE2B e26d442934e803beff1bc5833d8cdeb8c47fa615af1484c4d7a13a2b66682a40d2dfe68f61b7847a3188192ceecfdcfcec52f4fe7bee3c48c7b03cc78b7cab19 SHA512 9d3aa316bcd0d151b3b441a4f8a2f93b63239e68acb5dbf59eabc5c3a7e8c9b8a23356bdc9e11efcab024b83e8ef5d9bb4054a9de5169d607855eb42ae657e05
 MISC metadata.xml 306 BLAKE2B a847fa2007f872499ef5f7157aad1b15883dee8e754f4915b0137402417eb1bdf08b1cfc89d02ff4ade6872a74f062fb87fc7a53e44b17ecc89ddb6cc7e4c462 SHA512 bb8e356d216d5ad67c439ad00016e7c0e219016ad7123c67591a97d92db00ba3aab8a4bcc4423942df7764cce836ca98efe72db16a7e370ac874433d23176f21
diff --git a/dev-util/cucumber-ci-environment/cucumber-ci-environment-10.0.1.ebuild b/dev-util/cucumber-ci-environment/cucumber-ci-environment-10.0.1.ebuild
index a08cbd5f7f56..32de3f8a3e41 100644
--- a/dev-util/cucumber-ci-environment/cucumber-ci-environment-10.0.1.ebuild
+++ b/dev-util/cucumber-ci-environment/cucumber-ci-environment-10.0.1.ebuild
@@ -12,6 +12,6 @@ DESCRIPTION="Detect CI Environment from environment variables"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
diff --git a/dev-util/cucumber-compatibility-kit/Manifest b/dev-util/cucumber-compatibility-kit/Manifest
index 9515c4a932e9..b264f3a3a8cc 100644
--- a/dev-util/cucumber-compatibility-kit/Manifest
+++ b/dev-util/cucumber-compatibility-kit/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-compatibility-kit-10.0.0.gem 34304 BLAKE2B 87e7a9971c08743cee3e0e3
 DIST cucumber-compatibility-kit-14.1.0.gem 58368 BLAKE2B 695fdc3a596e9a56b35ac5ec950272a90126f54c0976a853b0a9b15ace64a6e67fe6f78ead9c3feb178bf99f292a2a18ad99c548bdcce8db55429027958c03e5 SHA512 3be06c2677418f0f945a35582d6b6d83d9a46ffd9b01776c46fbcb86b9c9df0080b09664f0cec189a9c4fc8e7a3d4fe9fa79c1a3f4760249f207d917e71105d4
 DIST cucumber-compatibility-kit-9.2.1.gem 34304 BLAKE2B 95d9d3df1a70dc54595ac3acb28ad0835257e317f8f4e64de556e650dc504d0fd8bee013a3172b6fcf93734f01dcbca37570edea3add2797a2635c747b68afb9 SHA512 40ab5d28828e1ce0467229c95f5f66ca07f99dd477cabe91468e67a9c34b40eb0def9ba5326c20885be8f8d815a2f3bdf3aceecd345eb8b310fd5f83f5a1e910
 EBUILD cucumber-compatibility-kit-10.0.0.ebuild 593 BLAKE2B b3ca3709536e2a82630fdae68badae596b2ff70b4b97de1b026705cd4bc1d5bb5bfe42d630b5e195c55de39966ed5eda147eb744933da2edaaef480746d1c289 SHA512 0080b23357d8ad83cb70b81d7d440f0930a7ad7ed624eb85c7e4e0c2b18661a3a12a375129048ab318321b634f7f5b0c15c00e0be6738ac9a59324afcc8211b6
-EBUILD cucumber-compatibility-kit-14.1.0.ebuild 597 BLAKE2B c3daa309b6d69287828ed6130b65c5bbb5cb0614fe7025e82292f575886cf28cd46fab7fef2a692d0fab367cbef2c7f7e7d68abaed0c9c2fb46ee979681ea5a2 SHA512 ffe14cc6c701f7b29acf25555c8f5b586640e8a5b39b9513d130cb3919bfd573d9bed0536d922f47bb3f0aa7248871b3fac67582b88afb1c0cede7d4f088f3f0
+EBUILD cucumber-compatibility-kit-14.1.0.ebuild 594 BLAKE2B b6d1a6d50e3cd335e8c68b19c3ebb5c1f6b4e354a7d5d3d9725d344b6e576ee74c2d661e5fcd942061b81a4b8b7ca9f6c368ab7827491ae222ddb83c3c970196 SHA512 4b79967d4d29cf4aac7702887bf7bc4416df313be9094f535544e1be97b0389567e759e77a43ab2e911b26dde3574e801910058e1e55c7b3bfcf724fa01a249e
 EBUILD cucumber-compatibility-kit-9.2.1-r1.ebuild 536 BLAKE2B 76bacb31f266c571fd03d3045eaf0418ad5f9ed939785869612005cd43f8f879b376e8218c81a58b52261fc15bd829fc485b3bc9711813715ba85d2cd0710567 SHA512 c0cebbe6130aa35f269a6a67c46e750476090e3355864bd19500a1e1c746a83de6fa788bd8880328bf6bbeb3a94127e01c189cbe5bc2f7fe155eb4341a5fb3b8
 MISC metadata.xml 377 BLAKE2B ac3c856bc465a388a738a14cf504a215bc19db550265d2010de184ded48bc7a45a2a34a37bb543805c6bf9617acca8bf4a8df3caa613f759106fe9e9cc41e2f5 SHA512 cfec354890561df14941007e8ca02240328f55742a626785ac232d3af423b2bf464dca997c41fb4f6ed7dc55f2de7ff5ed2b71d7f53c48b76de5c63addc0f9b4
diff --git a/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-14.1.0.ebuild b/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-14.1.0.ebuild
index 6411173a10d2..7ec045f46820 100644
--- a/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-14.1.0.ebuild
+++ b/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-14.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Kit to check compatibility with official cucumber implementation"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 50502dfb66e6..6748cef803c5 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -2,12 +2,12 @@ DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8
 DIST cucumber-core-11.0.0.tar.gz 202792 BLAKE2B a85074a9bad6b91dcb2b409eee6162efed6890868b762ebd221ea2ab383a029eb7d7f605813e6e73f6bcbf4c526ffb94f26e7338e6cfdd94abf28d631bbd989e SHA512 fd2cb97d72f24e5a5c00336e4243594270546225a027ee23907256d81fdc9be01c017a4d25dea85727ca834a6d3e3fb1ae003357cf530eab9d44fc211d52f331
 DIST cucumber-core-11.1.0.tar.gz 200962 BLAKE2B 5ac40ca2114a925c93f98b363443b560f24f5103c23e6ec3ae429cfdd1c1039367a64212a87c6079aacc94a2da757f2e8f889d57f6a46ceff5ff58810101e86e SHA512 02918828b9f626ac9a6d451b5d8ce4f19df01cd628c008c4a1b2b926f27d6af1353ce4bde5cd05bd1ce560449e37cc2db971049a4b8230f0c85cf0b05d0a462d
 DIST cucumber-core-12.0.0.tar.gz 200773 BLAKE2B f0cc2fbfdd6e79492d95a0ab66c74d1be8c173debeceedaa2b7b563cf0d6c70c86a00e3f2957b238b6d804fc78e2a27ad0003622ba7868be2960fded04f1d456 SHA512 58c0f1f7437aa5f55b3b07b36c66c616fd0c838659f346ed8cfc216fe98bce6d0de2ed52645c7fffa80f2f31c67298b6f4d881ec8d077e2eb33430ef88f0387a
-DIST cucumber-core-13.0.1.tar.gz 200291 BLAKE2B d1387b31e5e8c685c72769643bd1e0b5eff7363d281afe97db400382cc9905ae233e8ed70ae66364017607de9b7f2ddf1a0b5ad06b091991fdf86bf18228803a SHA512 7ef5295aadad90e281444588ffb1c94035f58fea127da1bd2d32bdec9d438bfebc3d5b4bea5a0882c6031f29867741ecde8e5bc5f1502fb2fb054c1102577c27
 DIST cucumber-core-13.0.2.tar.gz 200249 BLAKE2B 87ca35db3b97f1c168eb685b6462a49624d76528a175fe7cf8fc1dcbd46cdaf319ad9787fd7d41248d1623e52f4d3c883194a801c2c74795af147ecc9c71a486 SHA512 35b8818526a4420983f244f25b867f90461496ec85be2419f054bf04091ad2304f4d25ee71a0a1150035cb0686630b8c1846a8118ec14006ca97b51f3f64640e
+DIST cucumber-core-13.0.3.tar.gz 200088 BLAKE2B c2f11440a083225b409814de7248dd908b8763ae7b632a75699297627c97b6e4f8300eb4a49ac78084b30db764936e7b096517dfe1009a883a59e2947067c56b SHA512 32c09e0a60c05babc0c463a7cc86ca2ee5f6992aaf0c8add5e4cb2c7a88b9b5163d9ca1c635a241203c02aaeaeba7cc87a91f931633221eaf34ab9d36018ffa8
 EBUILD cucumber-core-10.1.1.ebuild 972 BLAKE2B 67ac1a9e510dda0e2b7c527ec5a9adf24e961b6c51d4691356b4a3dfd10c52ec6c5d20684208d4f6b690bddbfc0be3eaca191fb9f9ca7dddb14b010efd64a646 SHA512 672c4ed95e9b305d0cd2cdb1e0dcec60f8b3e126c56f5a862609adab28ade655b809c6a009103548b92140b5de1ff8815df40d787ca003fc2ffcd74a547b7819
 EBUILD cucumber-core-11.0.0.ebuild 972 BLAKE2B 7778b2d9b9b46c9b205f638bb23429baffc09cbd7a94f3935f53eb5dbe43fc13aefb45a5bb87cc7e6cdb561d67ec2f3bf775a24f1a634281115c1ef2dc5ea83c SHA512 e24526f5d517e83b52d76ebb03265e8497ac71d23521f1fe21ff095afa6dd094143451e9792179050e8a5a86cbe188610bdcd03535a578fefbc54eb4b032c56e
 EBUILD cucumber-core-11.1.0.ebuild 947 BLAKE2B 6a6c1e151c8242e43593e2b648f043c94030ee12bd5f775c86b0d43421a19b1950e3caa48e3126e2fc1a9dc816b4eacaef2ba7d737de447d4019b019fc77f7d9 SHA512 49145a8d09ba6b9e13badb2c04d0b614e6069fda368844c2eb1532b8230727b05f2d52bd459c65f139cb6421fcaf476ff03b9df18f3327c8f8960f40716c2d07
 EBUILD cucumber-core-12.0.0.ebuild 953 BLAKE2B ff5d4010536b350210a6af2979f10604b384e091b1e279d1fa250b7718e98a3b43f04eb8390759d0e54a508c584804d75cfcc4793f2e959581a299f2692abfe7 SHA512 46652c0df9b34ff951c920c53beb9381bbd43bd69eb6b71088db4fd8db87712a3bce9d2f34ed25edb31d2b31f4abea4b7c7d9877d43a61d05fa28325a4428baf
-EBUILD cucumber-core-13.0.1.ebuild 953 BLAKE2B fa83f501a78affd20f4d3baa64fa6d8bf80aafbfb9c41cb00969880886a935b9d8850fe6daf0a8ba8b47a50fdb9764108170e782537c698b768928cb54f86dea SHA512 4ed219d961c7a1fa769e36c579ff38944b1b5875477363c6b5d8b1c47f9f784ee82cc6b4f7c543b1bfbc6e4124f4c4e2b901b236da349d762b5a0ac5a4d6715e
-EBUILD cucumber-core-13.0.2.ebuild 950 BLAKE2B 57561de51724d29b33f5c6a8f1d0b210500fbe00b56efbf9aa7f97de4f2981df3f86f58fa0310dabe3d174611379716fbcca9a6ecb90c3ae458f2ca1af6f408e SHA512 749464f8b9bfe42124f0d7760a06fb7da1aa9c575900694206da714d37452372d0f15e10cc0c356427c662a3243a1cc224d9e9d990b740099d53293f4e37e604
+EBUILD cucumber-core-13.0.2.ebuild 947 BLAKE2B 8410021e7a3ddb4d03bb18fd725faec6e5a1d70251d1892154db19e7aa420236c052209ec0baa3381b0ac6ae1f08ef2e37029d0fdbdb9747bc1eef3cd3baa017 SHA512 cf4f12f06cc8fc712a868a5744f012084257e245b8644bcb61b78ed120bc0289395aa8ee427acbd2b47a749f38bfdbe57b331b1541e70e66d0093f3c2e2fb9e4
+EBUILD cucumber-core-13.0.3.ebuild 953 BLAKE2B d0f92a2a1a638c4512456c85e714e9f3b964e9b938e94228a1a8b97c744df9fa7b80f3317d57c290bef0def2171ec85b510f9549d28004e2aa03e07f73a4c009 SHA512 eebe061b0a2b440ee0fe53deff29c6ff4f68f188d379d0f55ad02171f3dff727101cc5a1ae32167ef792944eb5d9ecd0446d237d9fba42ac3d7a20ca7d02afb6
 MISC metadata.xml 375 BLAKE2B c7832a4f34f0d774b6d629ca76140e597b20dce63b2cbcb8abed5e71689b08f99d2a78da9d4bb6493fb1b8de5baf930b8b749df01f90b12a663286ca77440286 SHA512 e50fe917e05d882f55e69e8605f5bbac962e296965d50b53b8904d5f6917add58790ee31813cea02de19839ed3c7fcfb794fd5deb042dd82a2104f7a24700bf3
diff --git a/dev-util/cucumber-core/cucumber-core-13.0.2.ebuild b/dev-util/cucumber-core/cucumber-core-13.0.2.ebuild
index a265cd84dc35..93464de3b532 100644
--- a/dev-util/cucumber-core/cucumber-core-13.0.2.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-13.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-core/cucumber-core-13.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-13.0.3.ebuild
index 162f360a4776..8d310167431a 100644
--- a/dev-util/cucumber-core/cucumber-core-13.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-13.0.3.ebuild
@@ -17,8 +17,8 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 52645bcc8ce1..15ab3530d213 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -10,5 +10,5 @@ EBUILD cucumber-cucumber-expressions-15.2.0.ebuild 449 BLAKE2B 82588c7d961ebd325
 EBUILD cucumber-cucumber-expressions-16.1.2.ebuild 408 BLAKE2B ee349741e1d050a5fd239a46352f100e540c68abcaa4141d7651bc63f3fac629d681050aecd06aa8b0522d70ef3657e4896101ba8af698d737ed0e81bca57ec6 SHA512 8af5883f9e431e63f15bd9646dd1f1c7cb3dace5ac623925deaa11af0ce56f23ea3d457ee6657751b877ac34b5d4a493dd28f4bd4a1f6ba697835643930cf770
 EBUILD cucumber-cucumber-expressions-17.0.1.ebuild 462 BLAKE2B b95cedce003b79260f7755e3f96f7f88eab19dfd8270d0b9bc6b30b20e6b05bf1f895fc48c1a4dd2d4ce959622eccdd97ca0379d85e60b9b190bbf295af9de63 SHA512 53249ee0f325af1bd61bc6c76229453feb7eab046b7e3f66c573505b51935a854ddf89627873f4d3c3279a2db07938024ccb0546cafe6880ca82372ee93c3681
 EBUILD cucumber-cucumber-expressions-17.0.2.ebuild 415 BLAKE2B 99d06d933bdcf5fc148dc6ad403c004f67c1a6e1e53d7bc183f86a379713704cc0b2a1adba1c2fd5c7e7572c71fa08f1143ced88a06a36172e3bb89b39371268 SHA512 44d8222f4292c1cbe1fd6e7b68d6a49ef4249fe93890847a322a689a129e4a97a66dd124fc17a953a7c29d7c2a71b8720fba756922f4c9e32db49871b3e360bf
-EBUILD cucumber-cucumber-expressions-17.1.0.ebuild 412 BLAKE2B 618efab0d36aaaca34501769016a85366bfb5545f6da9f10256ed35e5125d13db7cd5dc94b7ffb4ad04f8bbabbea18749a2cdaef201d64415c7b42a10a905554 SHA512 ae7587dab3910e3484cdc840cd667fcf694b8ee8f8605ccb0bc9fb3a41f5a716cde541650cab5029d9d9bdbac9087eb7a5d75129e71f9c24207f4b484f4b34a6
+EBUILD cucumber-cucumber-expressions-17.1.0.ebuild 409 BLAKE2B 8960efd3e7bd2e1db29e5396cb76ce44982912437e4796a22ad6e0ccb1d4e445f919ed8d59be572c5d13bb25fc12d2187c17d44166b367f855e11a84a46b0246 SHA512 9668ccbb981e7ad7d91243d359b568d97a73e7b8bbee1c4178285e5a87216e7f3272b6a4191645856f02d683ccd52225332244c39d4ce993ec1f3375ffc28bb4
 MISC metadata.xml 312 BLAKE2B 0c97882b9ca8e75051a6c2df3ee5919972794a0529b6f7c8520b2ae5bfdda0e9bd60de63adfa65a20fb28fd55846d7d27d2655358b4328732b793f3fa2013adf SHA512 524df8ca3db7c5e60647b29b893437f414bd028341518898125e62ea4c13827f93e4f4d6c35b48b279ed3442e003037be63ce5ac2e6be12e865f25cff66d43d4
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-17.1.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-17.1.0.ebuild
index 4d2e1a9eafa5..d6782c3814c5 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-17.1.0.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-17.1.0.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index aa5cc653799e..33888ecaabdb 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -8,5 +8,5 @@ EBUILD cucumber-gherkin-23.0.1.ebuild 788 BLAKE2B 272efaf678b0dae2d2d1d4ae67ff2f
 EBUILD cucumber-gherkin-25.0.2.ebuild 768 BLAKE2B a47bd3d3ac99d14ee1327c3af4b75363fb71c20eb3d4a5bc3838f05c0243d8f3dc5e852360b517f1c5cf19f973bc91b73eb7294d257a7c3d7858e7830861c24d SHA512 660cf3a24078a78da2dfa39be00696b110c24d7ba595e22940ba45df7de3a39e5236302c3d79565b2d5f5abf2ed9e7d0cfc83a0b0e3b8358279c2fe57243b4d8
 EBUILD cucumber-gherkin-26.2.0-r1.ebuild 772 BLAKE2B 6d948265b158e9f084f0faa53953dc606e17babc6c3810cd97a5f29d0387dcca5742dfdb2ae7e3ce974ef0f2862d4df94c357818e371b7e52844f263657561d3 SHA512 4290d227e82fd637ce9f743d683a7e3ef1545a390202c9d89c5584fa72f32930213d4d93352d8d7e2caf885edcf0047969363c3fa8186433494af7c6c61a833b
 EBUILD cucumber-gherkin-26.2.0.ebuild 759 BLAKE2B 086224d724ad012ebdf4820371bc45fc7caa4c5cfc0ddd2075e3ed0c348967b4cfc39f63c622b98d588a0497a9ecf188fdbf47459492398d1c4d0a8743cc5983 SHA512 4cbe34ab9e60523c0f54c61a6ee799070c90a7ac03e6e8a0d1d7c9455ec952745e0e69aed625a6a2e753a9818d7e588eb25d9249c54695390c92fa85dea28298
-EBUILD cucumber-gherkin-27.0.0.ebuild 763 BLAKE2B 2c8d06a60d5636b4c8680ed456f09bc099a4af9c16eadad603fd1c548e37214d6e68dbdfa541b91fc005ee3852ffcdcba432f99ef2d428ae581c2234c908f5ba SHA512 d3994346aeb85a3fc90b8b342b0f88c2e600deca8170780d22eff42190edfa8be208de0b95fbf2eaf6b483a487915ff4deb529745c2ea44d6db41b017f9ca35e
+EBUILD cucumber-gherkin-27.0.0.ebuild 760 BLAKE2B a21ceb84612c333ee2f2a8305de9a9fa06af127a657fcc35e9dbc57b955d88e1fc35c08f4ff7f84cb925fd064650189bb2967c983d92c942868cc129ec08f1bb SHA512 623589f2c834d42e041229ab14c7c44c0d43b153a0765cb0c9fd31458e6cc1e2fc49000835560d2bed654316542bbd6e91a8d49422bab97bf0082f08f14a74f0
 MISC metadata.xml 357 BLAKE2B 8620212ef6cf8fadae0b1e7c3cb576cb5d68941ad8c6c547a292ba5d18bc0a90753329b2681a6cfdaec76b19be21d2c8ce4d38e468b7982cfd8364203003895c SHA512 58ef9440d8a1020fb40fcfb21f7ecd7ce594f151aa30a0ed8e723a1dcbf16b56f881e93bddd0da26957687cc5ec328ec6e843373e421a1137953bd22cec1bbcd
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-27.0.0.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-27.0.0.ebuild
index 2bb18d45ce7a..5dc2b23b6aad 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-27.0.0.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-27.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/gherkin/archive/refs/tags/v${PV}.tar.gz ->
 RUBY_S="gherkin-${PV}/ruby"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 4c25ca0a343c..80df134fc17e 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -2,9 +2,9 @@ DIST cucumber-html-formatter-19.2.0.gem 478720 BLAKE2B 1f2f6b2f93d63207cb2bb6e23
 DIST cucumber-html-formatter-20.4.0.gem 592896 BLAKE2B 48fcdc7dacf354973b25c745c0f86334f882766e6d3776cdcbdbf574b69bd01550d43417fbb55d99c01f8485d174dd3e64a3b4aaeb33a577c3ab3b87318029c0 SHA512 c60b8a084bd0c05c9659e9cfb327194975d9eabf6dd39e282d3ff343df740f0fd13a2d854d3b095064ea3df04e73ba0324102f5fbd05b3cf98498420a036005e
 DIST cucumber-html-formatter-21.3.1.gem 272384 BLAKE2B cc6dd87f1a3ecf312b0310a032fe26d7177edfd0242e9f98f817e3b11882cf4e5244b6fe43408aee9cec715374c5051087f3eaa9b5b38e5bed4ebec108ffc5f9 SHA512 04fe71ef8dca04491737f61fe0b6858f85ba09cc78a2796f20055612b4125b877faf8b6fc3b0dda2c6e3809ee6360f6bc97c8a7422b8e7beccb67d024b18c894
 DIST cucumber-html-formatter-21.4.1.gem 273920 BLAKE2B c0fb1402118d5aa670346953a5f9322fe848e1006ef8b3cf5e8169d46269d8d15c1d452301c167220fefce1775e311282bbd3d9ede9088440f8148b67ea0e691 SHA512 968b74210c34b227e66b614c613333b683097e425747d54f0cf0f76360cc0f97095022bfb94737bd882b766ba5db1264057c753d341585eedb94f891993e09fb
-EBUILD cucumber-html-formatter-19.2.0-r1.ebuild 752 BLAKE2B ece79750cc0d8ab615f1e56932022d24c92647113bc5fe02e3820fd5b5ed0fac5955d36a9731fd474ceea9c25bd9f30460fc328037edeec3e6dbb17acca90f16 SHA512 dee9d4ae279463d8fa3664add041a5dd660767065425a6a186eef4aae41aca8b564f5e3e2f111407f0b35e50f955fe2add2344ad3b5c62234542880360f7c0d3
+EBUILD cucumber-html-formatter-19.2.0-r1.ebuild 745 BLAKE2B 0429001152412d09a2a4b024d859b7556cbff7fc9f879545405b3d4bd315287a4b685cec739f7b348d882ab91a7ea4776e28136ecd469e9d7760b05ae73c0d27 SHA512 ecc0b61246b21c9d844170f85002a28fd28f1a06a230f481a4061884071dcfd6ff49478eecb81df8a2e385184036e726761eff8e041e9bd2cfa43c094d60b41e
 EBUILD cucumber-html-formatter-19.2.0.ebuild 827 BLAKE2B d68245d50802cfa4c2cd02eedabb1802f641383664ddd2fe773aa4120a5a43bfed12ccded0a2a0ab5ca867af378d5bf61d443c8ad2a98fc8d79b6e674a38ca8e SHA512 e54da455489c703328741ea3044b0f5cba67a23a9bcf0869e2821ec103ecb27db1ba08b4a7bb8802844933e1e9cc1960a52e1069401c07256f4f6e4d784c6ac4
 EBUILD cucumber-html-formatter-20.4.0-r1.ebuild 732 BLAKE2B 33d09cce40794e8385213789a3ad8eca20accd4d2397b1a793086edc0ab142f2eabe45ee7c33933a69e9b2985e954c7d2df318d7c04a4b7d1afad19d61faef3c SHA512 ff1c4d803591f0f92ef7a878f1a90a2ca56ca05860519496070a9ed8801a598319da8450f9c8b7ca29be25c8901bffd0c8adedcfd8e76b09b260fccef1fbdc02
-EBUILD cucumber-html-formatter-21.3.1.ebuild 815 BLAKE2B fd0cb043b6fb76910f5878bea6b353e5f2bcbbae69acce41ec067d2b463703146bd119e0eb868052de3f861b7c52e45fd56ec2e7e61c78fcba68b61999adbb90 SHA512 a154b233409bfe27a2970e0facf46da9f57cfc7091eb31d10d8f87d920229cce326147fb29cbb18f629e2dc1eb010a504a76b15742f014421034e65ddb365221
-EBUILD cucumber-html-formatter-21.4.1.ebuild 818 BLAKE2B f3da608dc2efb52915a1bc43d122f329534f7902fd21741d6478d0b77aa5043dd62cdf567c5dab50311bd23c1a8c20ef58e91c50ff678ddaaf141dd013722a26 SHA512 22c99990c5974c2a96dae8adaf49ea9a000edd1900bb050b9d278697fe1011eaf6ef2dba20073c9c2cf115bf6cc24f6d6c4330f915c285521716467546cb4e19
+EBUILD cucumber-html-formatter-21.3.1.ebuild 861 BLAKE2B f4569ddf705aa3ff8135289fafd7500db41e9a7c1dba9ef93e5af0706f9212aafc8d37bb4c62b460808c712796919684e3cfb1529aaa3ed29a42c6707f75ffca SHA512 6ef29a943a12fcdf183ee7e6e71b7123c0906d8f94b1bdfdd8fb700c423aa338c8a0f0cec1728d6539c4de5634674da8304fef0c1853d5adbe0fc75700267e6f
+EBUILD cucumber-html-formatter-21.4.1.ebuild 867 BLAKE2B 1669cf10906e318d6be9e0d88d4a802bb8267d8cc2be65ed0ecd015f73cc88897fac5afcc531db411ca0243893fbed603600edd64efddc4c522c4cedb16057a1 SHA512 4193e49e1efda7f819b4fd2240ee3b7e61d326670d4ab24f5512caf495cb11e00efe45b164ef02f4bc057f3012bde53263767de09b052d0aa18c52283e53144d
 MISC metadata.xml 371 BLAKE2B c7647643f6a224e97cfdc14a5533fc33d30342c19b894573c357691058f54fcfe00139de5ffb9bca48ec25950e03976260d1e92c9e81c051696288be306f353e SHA512 19bfa2565e0171203dad40fcd5093b1f73f8e9ce663e4f916bf0c8037003256b648439496171ff22fb6da9d1ca4c93b5ffec9f65555b7c62712bfee0bb9ce15c
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0-r1.ebuild
index 1971ba937f1e..d2c33c576749 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0-r1.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.1.ebuild
index 971f404480a6..825cf123fcbc 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.1.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://cucumber.io/"
 
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
@@ -27,5 +27,6 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-util/cucumber-messages:22
+	!<dev-util/cucumber-html-formatter-19.2.0-r1:19
 	!<dev-util/cucumber-html-formatter-20.4.0-r1:20
 "
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild
index c6870e49ecfa..6a2e1177674c 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild
@@ -27,5 +27,6 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-util/cucumber-messages:22
+	!<dev-util/cucumber-html-formatter-19.2.0-r1:19
 	!<dev-util/cucumber-html-formatter-20.4.0-r1:20
 "
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index b399a34c5d92..90df4a3f3df0 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -9,7 +9,7 @@ EBUILD cucumber-messages-17.1.1.ebuild 502 BLAKE2B 896fdac3fa1a9065da6983f3d15af
 EBUILD cucumber-messages-18.0.0.ebuild 502 BLAKE2B 896fdac3fa1a9065da6983f3d15afa35b8e5a5e2cee7ac65027a77acfc8f89c86aa874d4b5abe03e6f0aad07bd54ce3e16b12e235b7717599315a227de89e94b SHA512 9fab5958fe1e1f2d8d4e0e23255cf3f5efc5e9d521d5f70582a0d5ca12ba0c6715c9f5b037be46757e2298aec3d729638e40cd2e5913ae45594a980144f8f3a7
 EBUILD cucumber-messages-19.1.4.ebuild 495 BLAKE2B 9a3dd11bad2fbf86954c61c444219378efc514ea603daf2cfb239f25610a6c291c1382b1335a2c19abe9cd6c253990a08bd99ede6e889d9532727362ecd1d48e SHA512 aebf280decb6887cd4741e9979b14981c8ac7aa68f4425f67a895eb03bbab061604602a1124d764efc1ff7783648108496107f7941e044ce749fcbc6aeef1e7b
 EBUILD cucumber-messages-20.0.0.ebuild 495 BLAKE2B 9a3dd11bad2fbf86954c61c444219378efc514ea603daf2cfb239f25610a6c291c1382b1335a2c19abe9cd6c253990a08bd99ede6e889d9532727362ecd1d48e SHA512 aebf280decb6887cd4741e9979b14981c8ac7aa68f4425f67a895eb03bbab061604602a1124d764efc1ff7783648108496107f7941e044ce749fcbc6aeef1e7b
-EBUILD cucumber-messages-22.0.0.ebuild 565 BLAKE2B 49155d7521920b1a902e50c33a92f0cad42dbc4ace6922a178d1d67c415df16aea2986bf53eec75c70f1b9f2cdd5b77b21e1a546ff5dca67292e63c80b3dd06a SHA512 88031882ef692bf67f92eb0e7208e4b9608a2972b53a19475bcdb2b137f8b21e9b50bcefddbc1d3b4386344ef158aa75293789e6319bb29fb1e751e998566928
+EBUILD cucumber-messages-22.0.0.ebuild 562 BLAKE2B fc8cc685e68c359da229512eb924f8725160000d66fa0fe5872b7a324caee4f6c479c851f04c38a10c034f583718e60d962af52b1f328dd6d3e0f4cb6900258d SHA512 1b86ce1d4b3fbee47b656a6e46bce4f2fa5213279fdb55a9ca740893112fabafc7978c7b78b27fc980c5888b9fe9d0376326ff11b2ad6fc48e3dacdf9422e248
 EBUILD cucumber-messages-24.0.1.ebuild 747 BLAKE2B f1d966f233aac286bd0277c31676397d992164bb17b797e9048aa9bb0eb59231a0e116b44466033da3f1cbd59a7b1a086757f46aaee70e678646de67ad377946 SHA512 01195bf80585b9a09e06cc5dafc9b76e584cfcbf24e6d6db60cda191a4253c96822d56deed3d651b9a5bd8c223ad91c2a8e778aba190aa25fa81314e4b594127
 EBUILD cucumber-messages-24.1.0.ebuild 747 BLAKE2B f1d966f233aac286bd0277c31676397d992164bb17b797e9048aa9bb0eb59231a0e116b44466033da3f1cbd59a7b1a086757f46aaee70e678646de67ad377946 SHA512 01195bf80585b9a09e06cc5dafc9b76e584cfcbf24e6d6db60cda191a4253c96822d56deed3d651b9a5bd8c223ad91c2a8e778aba190aa25fa81314e4b594127
 MISC metadata.xml 305 BLAKE2B 029ddf3bdf2dae064fbe59631e8d9cfb598a78ba3d271a89b89f8f2352627776e050c585d91fc0c71da83972c654b0821214eb9a87a6e48652e9b38177e3629d SHA512 96fe98541b7b9f780878fbeed0a9d5040c2400e8b71acfbbd9ad7969695f290366f3f1257841ec5323cf8828bca31874b83126a507f334ff67fdb70a1e81446a
diff --git a/dev-util/cucumber-messages/cucumber-messages-22.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-22.0.0.ebuild
index e11570e955cf..7eb2dacfa45e 100644
--- a/dev-util/cucumber-messages/cucumber-messages-22.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-22.0.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
 
 ruby_add_bdepend "test? ( dev-util/cucumber-compatibility-kit )"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 30ff658a793c..b6e699b8b5b6 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-rails-2.6.1.tar.gz 43079 BLAKE2B c45211c8a2375fc2b488d22fb74041e5dcf56027d6644721b5023b8ad9e68f07593c448acb88b7c0e51dcad7da0213d48726e20175ecd5fd04f16174e44b848a SHA512 dd2ed4afecf74e8aac0fa360d81a27407df999b041b21c597e9ac141422cb0ece89eaa74d8da9a4fc2858efaf242837d8237a9ceee44875cff2c50d288fad480
 DIST cucumber-rails-3.0.0.tar.gz 37102 BLAKE2B 095b867916ccaf4ac30b6140045700002c0a83e16c86162c4891cfa21a74b2d4f2f05646f533e2b618d5c99ee74344d68042d2e47edfa6e0adfc35aa1ed31721 SHA512 66c045026b13dc94198e4095d41b8ca4bbde345f221443b834f020173b7b0bb82e5db3880691ad8adea7e39fd0ab6e987a97347712b7a0a9697825a151206beb
 EBUILD cucumber-rails-2.6.1.ebuild 1307 BLAKE2B 0a43b5763de3a8df3a43c16dd4052d425e76042f84f19535b9f036a3406e722740928fb764bb1dd7d8cfc010ccd3e2019b54effd751d78e2855b30afc07e4545 SHA512 3e21d91c70b3d4133356056a60c1aafd3b51842c3c7635c3f182a18cbc4ce2410279316fbd5ff8ac905cf284fde0542727173853bb6796ca368daa1a2e560462
-EBUILD cucumber-rails-3.0.0.ebuild 1213 BLAKE2B dc6713a4fd0aeed58478871501307c6f3f9b56f20693054784734000a75e5d236d00d9e97cd2e5d22304066566e595976c5b902eb6d727f6c1adde19dba09b2b SHA512 e99b81829ba81911051f3ae1813d3c346c5ea5ab5d96b8fc114ba9528714ea27f5846848b0e16e511d69204dce7d3cc37c2199387c6dde52ef988cfe3f0343ea
+EBUILD cucumber-rails-3.0.0.ebuild 1224 BLAKE2B 757d403eed3d8cf55e1425d7ea5629ba318f3b28e6b1afb5cf48bda30c23d49813af3adbab8f2c22fe451daf7daeb1a134386adfc1154153cb2ab20fd7126f2f SHA512 74f8bb641193f3c1ddd6a9f61390e4ea50b7ca93b8eae57af7ffdb081bdaa3060339225d3e3aaf9efb87de2fe24c13be43860a437ebde866f1f0e7d98d5937ec
 MISC metadata.xml 362 BLAKE2B d78c5e27c303f740d23ba5028bc6487a7ccf131f162e5f5bacc8fa4156924ced486c9b1685eba44855d8b01ec80628a09450c7b59812d6d11c87ef4f43017f0a SHA512 d24a91945f69be7fe717fd78b11adf59de3ef2c8bbb562b35618a2afb09bf43f524467e6a0ec665a1d94c038e3d8fa564638c6c585846347d790fcd37e07f2a0
diff --git a/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild
index 575719557219..ca9238022143 100644
--- a/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
@@ -21,9 +21,9 @@ HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
 SLOT="$(ver_cut 1)"
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="test"
 
 # Restrict tests since Appraisal is now mandatory to manage different
 # rails versions, even for the specs.
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index 0f356c480f60..5c7993aa0315 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-tag-expressions-4.1.0.gem 8192 BLAKE2B f4ce3377f3d67be1d58fee6f082ac8b25a301ae2aea2f862cc8faa0b7b36daba9754512cfb046c932c93ef6d10b50ff8a4cd2187b4a3516f740b9d9db865b95b SHA512 15704a604496a26fa87775cf05b6998236e7903e0770782804ce8bb9e3093178d686e1bba146d1453b853f529f30220054ac33ef18ba1d45894fb1aac7fc3dab
 DIST cucumber-tag-expressions-5.0.6.tar.gz 228510 BLAKE2B aed93b9fa99364ec446755fd4378c57a8006c17e0b002fa45ab885e87e80d29664c9db54500d4e5222e94306c7f558c42d27219218b47ca42e60bb74130ea16c SHA512 436c64920d572718ca75c3c730cad66688879dfd129977ea5e4cf45023c9e4f8fbbb64b65427ab4188cf1b9a9cdd6cdaf2f64c23a12b85be7048b680b8e08f08
 EBUILD cucumber-tag-expressions-4.1.0.ebuild 438 BLAKE2B 5bbfe98eae7162aa6f29e54174f4e280126dbab198a0a440e41e1f046f68f980ed23a46d78491434f685cfe92c49c7fb2145cf654c532e1b428682eb5fbff5ac SHA512 2e4320450143e9b3d23bca781d8240ab1e2133bf47bc116d43eb499b5192209636745151137cd2bb92bb3c05253a40c75746183e00bc72d670d4c91047c23ba8
-EBUILD cucumber-tag-expressions-5.0.6.ebuild 628 BLAKE2B 64c6bdeeb5812cc93749978545730c6e44c68e7dd820b6e7e2fa39dc7f774559629b5cd60e9194ad2ec0b755619748355e468c9b0c5e3ebd0f510b08992201a8 SHA512 093749c8d4ddba9f4ad57be3146f73807379876ad769954d55ac41ec3288e6a0d77d3dc277450e1d7dfb89894c786c9c44d42a23ebecc71db3066b793f6b4447
+EBUILD cucumber-tag-expressions-5.0.6.ebuild 625 BLAKE2B 78995f0689e2da0ae97ed7e646d0854c851c2890690ab5a614c65b1d05eff62c8c057eed689ca542d7f2b7bdc819aeffef29fc36193c2d1c0abcb179934df942 SHA512 f7eb7e78ede1a229531394da25b5b2376ee112364db9fa6c73ac15a5e05eabd5d25698aa2a4f56054d96eba3c013a625a214a2b74b9678d1cfe4ae438e1adbf9
 MISC metadata.xml 307 BLAKE2B 0b1b288ad4971b97e27ce903ad46405000c3b5623c0edff2ea3d5a5a9b3794e5895b3496da0c60da76b376b1edc32a2f18704e7b167021c32384bc50a4a20df9 SHA512 9836e6e74a983ef7bde51f2a7d7ce8b59697d0442a2409a97ff155fad192713e64873b70339e1f1fa4789f2afbc6b3b9d421663503d6033df99ea214e947cbc6
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-5.0.6.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-5.0.6.ebuild
index ad2138b50946..9ccdd6acbba6 100644
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-5.0.6.ebuild
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-5.0.6.ebuild
@@ -16,5 +16,5 @@ RUBY_S="tag-expressions-${PV}/ruby"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index e17eb27b075d..3dcab3f3e8b5 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,5 @@
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
-DIST cucumber-9.1.2.tar.gz 424404 BLAKE2B 4e4dd3cef2dc933aa2a1da3e2840ce7ba451607262f8b1cd963658d5e7d81689e5e2f30740e135f9fcdc9a15227f7b94ba40b2bc07dd3849c1e8bb4eda4bc659 SHA512 cacfd23e761dd5f6af030525e06c59c6f410c15ad3d2826745d4a38db95ecb32e556e05dadd3e2d822b4bf8fa1529124d112f35bb649230a4c20a7c822318b04
 DIST cucumber-9.2.0.tar.gz 425211 BLAKE2B 4bbd9b0ecf2d3e3a06d9ca36f512b67b7f776185c1888987cd247fdf457150f96a30b1d33d2b76605efe71a51e1866ae595b77458dcf63eabac2974db0932027 SHA512 4685647167268621488fc0144f24f44cc4dd684206298cd20b9a2efbbbcc43f5b05223e4d1e9c8b6b29c552eac31d8471c12c59d5fec7463a28c8f8ebd20159a
 EBUILD cucumber-8.0.0.ebuild 2563 BLAKE2B 52f3985affbef319901f855a0bab09caafb5a4dddbc4d6c1dc3099696e827ef4242cabc4ff48513a80be3d95c812cfde26cb56f8010b50fecf5c83beb0905c83 SHA512 988bbab9d390c01e2d2953aca18e89552b40f4c3c053800bc4351269e9125d96d9c5355e878fa3210b57d6c7c9e1ceefff7b39fbc36ad67a10d6924bba20d462
-EBUILD cucumber-9.1.2.ebuild 2614 BLAKE2B cbed5b269c18c0b94928c17a1b08dfdffaa8c4f9f7acb7f04c2e5d3600353daf32e4571e026340711dba801372f6dd5033502499a288439ed88663d818c01dd6 SHA512 cbca5dd59aa785ab1bb4fe18d911f3fae76f7c9f2e0c9c0ede019317d44e445ff12602b86398dac53066b6e6ff1e3090b566b8591673f5bcb74d0320b8c25446
-EBUILD cucumber-9.2.0.ebuild 2604 BLAKE2B 530372d2c6bb068dbfebd54022e125430a06ec1cfd0e5b1a2146773fd279e73c7645f329cdcb203922ef2de8790758a40e4afcb009ff4ee2bce55ff4f515ec63 SHA512 6c6e33179e50ebb1ce855197c1b42bf8be81418c8c408995ff80e4a27c1d0e3bb19ced748f72d5314d7fd8145fa269ac396a1e487776163b7ff0e7de800be948
+EBUILD cucumber-9.2.0.ebuild 2601 BLAKE2B 9dd437488d7a8a0341c7ae60eb231dc22fad8b228765c726f044825f3e26ab34440947d6550e416430db237f1f637527c64ef29be2b0f1f0a88538ecbf313d34 SHA512 d9750eb263f86eee4b05a87620a73a3dba1500e8437c35eb79222cb285e5ecd8a30f11ed8f62509d6d41fd976864f97177fb934dfd99440452de459a5a80691d
 MISC metadata.xml 360 BLAKE2B b66a3bae14c4ddd0801c27b52bf5e6445329ac2e3a06d9aecdbdc86624700be85a67cac775f195d8c67de900660f8f612906c85394a0761b4a31e1863c8fb396 SHA512 03b7395abe6033b07ca481220061b5c52c5cb97af5a97e9b1631d37144c815bf9f192f3c973e7954ee1c32dee1db0134b9e9799b73d65be17094b9abd1fab9f0
diff --git a/dev-util/cucumber/cucumber-9.1.2.ebuild b/dev-util/cucumber/cucumber-9.1.2.ebuild
deleted file mode 100644
index 1534999e2e60..000000000000
--- a/dev-util/cucumber/cucumber-9.1.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_BINWRAP="cucumber"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.12.5
-		>=dev-ruby/syntax-1.0.0
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		dev-util/cucumber-compatibility-kit:14
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-3.2.4:3.2
-	>=dev-util/cucumber-ci-environment-9.2.0:9
-	dev-util/cucumber-core:12
-	dev-util/cucumber-cucumber-expressions:17
-	dev-util/cucumber-gherkin:26
-	dev-util/cucumber-html-formatter:21
-	dev-util/cucumber-messages:22
-	>=dev-ruby/diff-lcs-1.5.0:0
-	>=dev-ruby/mini_mime-1.1.5:0
-	>=dev-ruby/multi_test-1.1.0:1
-	>=dev-ruby/sys-uname-1.2.3:1
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid specs that call out to an installed cucumber version
-	rm -f spec/cck/cck_spec.rb || die
-
-	# Avoid specs failing due to differing deprecation message
-	# rm -f spec/cucumber/deprecate_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib \
-		${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-9.2.0.ebuild b/dev-util/cucumber/cucumber-9.2.0.ebuild
index 3a4dc6496db0..16396065f4d4 100644
--- a/dev-util/cucumber/cucumber-9.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-9.2.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index f1504b9dafc9..5268b1db5dab 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,7 +1,3 @@
-DIST cutter-2.3.2.tar.gz 11280258 BLAKE2B 20dba40d96fed296b9af0b0e0b66dd46901bfc6621ba59cce1940ed2980acfc1e8b6447c20995bbeace71c7eeb1c9b180bf3b2076bbae9035706c6d4aff6dc5f SHA512 65ca98f6618b1e60efa25d33bb4f3ef6b36dfd8496cf1f40c6a6b9744df3c2f77673d1d3cc1142c1b3b064abd0698ca07a20c5e4009ba5f6b05fc7f7501a4435
-DIST cutter-2.3.3.tar.gz 11609727 BLAKE2B bea428892d242c8112d5004b9960d9f74b3aa48b5988436bba54983abf3d26f4bca89b4dc75061e857c2cc51f724ea392fc4f380f227c36f38618078ec0a5761 SHA512 7731b6a2efa03a745cd0760d905df474383dc77906d5aefada7bd94098d771b75ae030cb71ed33256cc2f3e23c1c4930d45355cf6371361cb9780b26996dd2cb
 DIST cutter-2.3.4.tar.gz 11608176 BLAKE2B f83cd117bdd1a9ea985b52d4029bd3874f92b08709ac50dd1c6a526aadd022e05f9b75586cf826cc6b46c2004cb6b3185c5770b8622bc3c6a7140307a9c1a98a SHA512 c35a7091aaf2c99a4595b48029017353092b178ed6a57cbe2f0d9758f1330d2521e3fc339558ffc0dfa500ace0510daded8591f7a04b0efa0209ba4f8a5e7d33
-EBUILD cutter-2.3.2.ebuild 1530 BLAKE2B aced04ddaa1d532f319020fded521542b8a7ee64e3689f0cdbc3134ade3dd0b75722c85adf28fdf2c6a0d8ee14bf9bf805b9350b1c5748be7e2a185a18815a51 SHA512 60b2702e0205615a1e740aff6ab02b124ccafc85a5c55073d79635510708a1c5f8bc89d53593611c922a49c15baa0759f8c09196027ba5f402a0cdf0f5835524
-EBUILD cutter-2.3.3.ebuild 1530 BLAKE2B 394abfec4a4d23fc8860909d1005870508c8c3dd59a4e3b4f0260dcceb0ac5759b2e95d38f9a4291a679dfd4e98309110cb3666e9446133de2aad4b7ec053da4 SHA512 9a55ffe7987406b151949db9f30a7dd56343af7867e5344d8343aa5403bf285476b80fb9471fbd93dcf670cb4a30d35b2ef297997799a9e5b080ac7d6bac492d
-EBUILD cutter-2.3.4.ebuild 1531 BLAKE2B 4b760ee01ca8a24d90ea52d76c48bb2cf20f426d05c78473b33130ef3b4387896db3d459e9f5716cf2b288c79f26a400a860772acef46a5fb5e7352245201e60 SHA512 aaad3ed2e6c250a9baa829c1441e915405c0e96c21dbb0cc89974d6c40f8a039eea19e78faa4e9b0ee52a2f0313bbcda2300d2380ebb283e206b0eb4a89f2699
+EBUILD cutter-2.3.4.ebuild 1530 BLAKE2B 02c4ae089e0e677f01a1ff5c7a0ddc815f15ff320414937dd7940be43266e3055f52a155cdb2ca79a1a7500017b2cc40c015b8a4ed55d28018df2164f92a554d SHA512 2cfe3a57b1d249a437ab428f8a5140cdbb67804fd2425cac1944a1bcd1fcd9e2624f07c1894adee0c3d0f46ac8bd77e97d7adf2dd999cc3249227c77022f3aa6
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.3.2.ebuild b/dev-util/cutter/cutter-2.3.2.ebuild
deleted file mode 100644
index f4c14d0296a7..000000000000
--- a/dev-util/cutter/cutter-2.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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 toolchain-funcs xdg-utils python-single-r1
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=dev-util/rizin-0.6.1:=
-	graphviz? ( media-gfx/graphviz )"
-RDEPEND="${DEPEND}
-	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/925901
-	# https://github.com/rizinorg/cutter/pull/3317
-	#
-	# Fixed in git dev. Remove as part of next version bump.
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.3.3.ebuild b/dev-util/cutter/cutter-2.3.3.ebuild
deleted file mode 100644
index ec1ba3714491..000000000000
--- a/dev-util/cutter/cutter-2.3.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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 toolchain-funcs xdg-utils python-single-r1
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=dev-util/rizin-0.7.0:=
-	graphviz? ( media-gfx/graphviz )"
-RDEPEND="${DEPEND}
-	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/925901
-	# https://github.com/rizinorg/cutter/pull/3317
-	#
-	# Fixed in git dev. Remove as part of next version bump.
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.3.4.ebuild b/dev-util/cutter/cutter-2.3.4.ebuild
index 6e3ac9dccc29..72bf6c99ccfc 100644
--- a/dev-util/cutter/cutter-2.3.4.ebuild
+++ b/dev-util/cutter/cutter-2.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake flag-o-matic toolchain-funcs xdg-utils python-single-r1
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="CC-BY-SA-3.0 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="graphviz"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 4341ccf22f48..ade25d97215e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,4 +1,4 @@
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
 DIST devhelp-43.0.tar.xz 327508 BLAKE2B 455015ec115610f27c2a1d9c3a8a21f50d8b061de7524371d892aba35173278f3aabe623b0b6770437b1501e6af795a9a12c9cc3ae238d8691d00e27388ae1a4 SHA512 92f147659754480ac4aa02f21558572d4bb8a034251225d344a8cae16824d9c14071751dfca6439f98dc7f7884fb35ef2d9c708e42f11bb6b3dfd8648b784654
-EBUILD devhelp-43.0.ebuild 1910 BLAKE2B 5172f88b7a44b34a54987a80d0f0b28c2310f6aea4230625d1a204970a3327403bbbf170e4e8d6a0b3b18ba85fabff454d82e9aa0ffffa9c5d874b823d9d0c77 SHA512 ffb78267b542cf8e4b80dfa122427ec3d0d48a014d18b5ae4b55504867a1789b336388b2e3cf8a4893b4ec0e65b4264efe8103cd27ec2655c725b3cdb35ab80f
+EBUILD devhelp-43.0.ebuild 1911 BLAKE2B f674e6c7e85e3cc13d617aeb8470ece35745a352596179cde092a3df4fe5cb5e40b31a6a1efcaf5459aa52fd4e37e776625140e38b6d65e6ba1c2cb78d2668cd SHA512 3ad723de4a33f5c91c39fd8332eac953a6c836816e64927e22a5c763c2ce87caac98da11f2fd5835b9e18b4f601046415f0bd63db41e8d01ff1e11b802221363
 MISC metadata.xml 443 BLAKE2B 87f4012dd8dac2a075656c3da08e1c95b7d14d2182d0309c8d55136ed8acb86309f5eb76b3fb0330964bd3484d99a1b7545da30e8210b53a52ac07bd00ef6327 SHA512 5cb45a90194fd472afb7abef7907d4e77b7bbafb35d9bcf901ef6e26b36203200777b1a7f96fe504801ac52920e1fc0ca7a1411b15ddc92fa51997cdf640d368
diff --git a/dev-util/devhelp/devhelp-43.0.ebuild b/dev-util/devhelp/devhelp-43.0.ebuild
index 7de6d24bacc4..4623869ab55c 100644
--- a/dev-util/devhelp/devhelp-43.0.ebuild
+++ b/dev-util/devhelp/devhelp-43.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index d2530c6099fe..1b504b6e8bd7 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -19,6 +19,7 @@ DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e804674
 DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
+DIST cc-1.1.5.crate 81493 BLAKE2B 3edd99cd9d05b090a57cf62f1236c02d0731baa8b2bdcd6c14f21e68323cdf4a65439f81701c1b1960b70919f1a342f1ad8e0bc830bfd187eedbbf443a5df77b SHA512 2ee646d3808bd06b3bba5788d0f93762009875e1f5c25dad67b0f8dafcb512be3ff105bf9d2e92a2507a2fd942b8d774004971c1f203ad40894336ffb89ceebd
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
 DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
@@ -45,6 +46,7 @@ DIST difftastic-0.54.0.gh.tar.gz 58647254 BLAKE2B 93900c7a89399893e44bffcd010b52
 DIST difftastic-0.55.0.gh.tar.gz 61809092 BLAKE2B 28a5b0da275f886f0960b870d3d171969df58ff99c2a67a143c4fe167ae1056daebda0e8df0d71bbb604fd66d6c91c8021501bf9b54540bf499ddc43ff8972d5 SHA512 1a597a9bce65e996bbae1a3403f3f2f9f3db9a7e805908334f134a84bc42749b9b13bd2e50d97c032d5e274e3416d99b8563a6e6f9729f4bbda7b4b04dd2bac5
 DIST difftastic-0.57.0.gh.tar.gz 42654201 BLAKE2B f5772e29537eef6775ce2d731f4ea15ed04c3534e724fd4eaada02aeeb376b773a66b31ff4db9c8eb9d0b5c8311bb76fbf3a48756c4785692b9b487f76329a47 SHA512 30303a50b6d7daca7dd2d8ed40aa157e16eef52df01c5605ebcdb53789d252ca526d34156c2f6e842ca90e4cabe89ab7f2b0ce05058ca7b59dffa1d9d60fe9a5
 DIST difftastic-0.58.0.gh.tar.gz 42962336 BLAKE2B 88f3ebea8ed3f00406da4679a8b26226b54d27c29215b41b7622d2f30f185de0b673972da678dff78e6ee7a932ccce290996bd61038c7a040c48ee228393b7a5 SHA512 b6bd3f8919df84aa084e645552a2ce468b2112a245f1757889b353243007ad08ff5cd5d144bf290624db643a9ef5f8607398a7686974e2c450010baf95b883c0
+DIST difftastic-0.60.0.gh.tar.gz 44037544 BLAKE2B 0a8923548ba4f26ebdb12dcce8f450aae573216d94e09f5ac1bb822bea37978cca8f386f446c7fffc0034b2e2806adf662ad0e66c91a2ace0b243d0b3d7babf8 SHA512 ad72ba1cbaa803683e682864f6289d4456cd15fd377e2c59c75d799a5e416ac2885f5fbd2dc5201143a214ce2dcf65dd357f8d844c5dbf43463eebd0ece9560e
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
@@ -86,6 +88,7 @@ DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.149.crate 715592 BLAKE2B 21dd5d4f9351f3c75790077c7b025046db665f2d48d7a72cda7667bc60febf79d82708cf7d39a323a594397cd590bd3d2a2f85349b4473b90ea4da918382ed0a SHA512 0def64d400d473d6eed30e985522d36801ee6472b15f90e74dc4592e0a8ffbaf30b731be280de52b30255cf60aeca8efe817b67049227dc7000c807e007d7289
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libmimalloc-sys-0.1.24.crate 1119801 BLAKE2B a7ac3bfb48805c85566916b4ad7aa14434d21d7758d1c2f96a8b4889cdc1950ef27661223166fb2671040788e8f6a6fdfed3a0a42e5dc38b525e6100d1d9b6de SHA512 b35b72948581ec3505f569af21a1e55cab9024d3f2fe543972863e74e2c1620fc295a3632122e5548b01dbafc6230a1e2a39456070cbc9d3aadafa10fe166900
@@ -139,6 +142,7 @@ DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e3828
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
+DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.9.4.crate 253112 BLAKE2B 434a56ab97d988d0121407f4b49825807c639cbd9c498249da9fdd186a40340157adfeadfb8b0f442fbd63968f4c9fb36c487d9472cacacd1fdba9c357bb9218 SHA512 4c7c478c74dd6a470ff89320a6944ea301967543a5ab281341cb4c8abf1dbbf909f329e73082ff5157db8108eb61b7a1a8b1e88555f848a876bcc5072d23e894
 DIST regex-1.9.6.crate 254981 BLAKE2B e0341184d93703a32734f1081d8962723873ef558f4db764b1996dfa9eeb359ac530f7dd93f4d32947e91c056b8bdc51dde99b890c14f959b02763dc22bd996c SHA512 e0da225eeeb9d02b83992959889fa9360b9c549905e4ae4982e61743fccce6d721eb0283a5d2f3e9323193bd5c839a2d0da603849bf6ec5f8ad2b7ffc81c59ab
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
@@ -148,6 +152,7 @@ DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
 DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
 DIST rustversion-1.0.12.crate 17278 BLAKE2B ceefd32afcabec344a1bb87d818fa22b84c986367ebe58bfa54389080194141489e1c87397a34eab4d60d660c9e0d75eca3958225640d4e6a061c96d27778c6c SHA512 eb55f3c0324359e897ad07a5182426d68a067ea41461b62a44f98c2864d5a5d0f47733f88d977a6f537e39a801beaa3b5a6041230828c3213085b562edab133d
 DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b
@@ -240,4 +245,5 @@ EBUILD difftastic-0.54.0.ebuild 4436 BLAKE2B 51735f991b8297b15e2c97d886e99ba93c7
 EBUILD difftastic-0.55.0.ebuild 4437 BLAKE2B 4cf506199ba6c296a9d8fea5b0ec33cb523a05465242877b12fa0dc3de8253a868bc1916a7aa48dbc14a91777797c38d3e2ddb8cd396081a7f87d1615451fbdf SHA512 d08b46b2a98caef91fbf1713f18406c845d783663044a5b80610721dad6ce454d4f0175bbd847348e1b5dc59a4c6baa8eca23dff7e071ba02539c093176bb8f4
 EBUILD difftastic-0.57.0.ebuild 3687 BLAKE2B b7c80ed0cc85d6c4cddc48a4e4d5ee9c4aa6758dbac68a15647d10ac0bb449429aeeb81482e74036a10648f5af2907a2500f56a39d7abd3e983fc9a71c160c3e SHA512 b5408399c01328264666b5bdd60ac00599c568ba0904a29691e5565408d4a5f3ade7c2b3623ef33b2a905dcd30256c59eb3210a3a0b21f75cd648651879001e5
 EBUILD difftastic-0.58.0.ebuild 3652 BLAKE2B 363ba81037c6eeab7751c1af8e6f6c2f9df29a0d5290d2910db6855364d7eb0a5c3bf7d65e3e2d5080f77fb69d819e4786adb8e265f0a8aa820d3b657e4e3bda SHA512 973c3e691daf96053a617e458f6f1d717771f5b596d6b304ce7237f68994fe8a9440d4abfd6ce5d62ae586b51641806e99e0b487758e7e804bc99c8924defcf5
+EBUILD difftastic-0.60.0.ebuild 3610 BLAKE2B 79ddb7589098de4e0feeb30e54ff3dd64676379b347eacb9ef2a2047a7e19029ccea1eea3ec2b1f1a3a9fea2969d5c47a846855750aceb058a389d32961d8779 SHA512 1339f4e39020defac2bd6a255cc4f57d637fea29f7365359cc91ee7973a65d7a5724818e7eb149b1c91c679c9da71d9c1ab05f206f4f0c3c7522dfed227e1815
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.60.0.ebuild b/dev-util/difftastic/difftastic-0.60.0.ebuild
new file mode 100644
index 000000000000..40daceaccbec
--- /dev/null
+++ b/dev-util/difftastic/difftastic-0.60.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.16
+	assert_cmd@2.0.8
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	bstr@1.9.1
+	bumpalo@3.14.0
+	cc@1.1.5
+	cfg-if@1.0.0
+	clap@3.2.25
+	clap_lex@0.2.4
+	const_format@0.2.32
+	const_format_proc_macros@0.2.32
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crossterm@0.27.0
+	crossterm_winapi@0.9.1
+	diff@0.1.13
+	difflib@0.4.0
+	doc-comment@0.3.3
+	either@1.10.0
+	env_logger@0.10.2
+	equivalent@1.0.1
+	errno@0.3.8
+	fixedbitset@0.4.2
+	float-cmp@0.9.0
+	fnv@1.0.7
+	glob@0.3.1
+	globset@0.4.14
+	hashbrown@0.12.3
+	hashbrown@0.14.3
+	heck@0.4.1
+	hermit-abi@0.1.19
+	hermit-abi@0.3.9
+	home@0.5.5
+	humansize@2.1.3
+	humantime@2.1.0
+	ignore@0.4.18
+	indexmap@1.9.3
+	indexmap@2.2.6
+	io-lifetimes@1.0.11
+	is-terminal@0.4.12
+	itertools@0.10.5
+	itertools@0.11.0
+	itoa@1.0.10
+	lazy_static@1.4.0
+	libc@0.2.155
+	libm@0.2.8
+	libmimalloc-sys@0.1.24
+	line-numbers@0.3.0
+	linux-raw-sys@0.3.8
+	lock_api@0.4.11
+	log@0.4.21
+	memchr@2.7.1
+	mimalloc@0.1.28
+	minimal-lexical@0.2.1
+	mio@0.8.11
+	nom@7.1.3
+	normalize-line-endings@0.3.0
+	num-traits@0.2.19
+	once_cell@1.19.0
+	os_str_bytes@6.6.1
+	owo-colors@3.5.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	petgraph@0.6.4
+	predicates-core@1.0.6
+	predicates-tree@1.0.9
+	predicates@2.1.1
+	pretty_assertions@1.4.0
+	pretty_env_logger@0.5.0
+	proc-macro2@1.0.79
+	quote@1.0.35
+	radix-heap@0.4.2
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	regex-automata@0.4.6
+	regex-syntax@0.8.2
+	regex@1.10.4
+	rustc-hash@2.0.0
+	rustix@0.37.27
+	rustversion@1.0.14
+	ryu@1.0.17
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.197
+	serde_derive@1.0.197
+	serde_json@1.0.114
+	signal-hook-mio@0.2.3
+	signal-hook-registry@1.4.1
+	signal-hook@0.3.17
+	smallvec@1.13.2
+	strsim@0.10.0
+	strum@0.25.0
+	strum_macros@0.25.3
+	syn@2.0.55
+	termcolor@1.4.1
+	terminal_size@0.2.6
+	termtree@0.4.1
+	textwrap@0.16.1
+	thread_local@1.1.8
+	tree-sitter@0.20.10
+	tree_magic_mini@3.1.4
+	typed-arena@2.0.2
+	unicode-ident@1.0.12
+	unicode-width@0.1.11
+	unicode-xid@0.2.4
+	version_check@0.9.4
+	wait-timeout@0.2.0
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.6
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.4
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+	wu-diff@0.1.2
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo
+
+DESCRIPTION="A structural diff that understands syntax."
+HOMEPAGE="http://difftastic.wilfred.me.uk/"
+SRC_URI="
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016 ZLIB"
+# owo-colors
+LICENSE+=" MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+QA_FLAGS_IGNORED="usr/bin/difft"
+
+PATCHES=(
+	# some tests don't work with sandbox
+	#"${FILESDIR}/difftastic-0.54.0-tests.patch"
+)
+
+DOCS=(
+	CHANGELOG.md
+	README.md
+	manual/
+)
+
+src_prepare() {
+	rm manual/.gitignore || die
+
+	default
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index a631fddcb149..e426b8a61500 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
-EBUILD dogtail-0.9.11.ebuild 1336 BLAKE2B a8e6fb21605245575937c0fab25edee491380960053c9ace143ce892197e00cf50980ee79d1539c753f96cbae1bc55473c6ae926b1a4298bddb4f25d08909f19 SHA512 2bf99d5c59e04d841545ec4e6ef66ce65f5bc6c7afbc8735cf37ff9ea386e29faca004455b0aa8c223a8b8e02f83bd3561b82613ddebb67ea2e367dddbc804ac
+EBUILD dogtail-0.9.11.ebuild 1320 BLAKE2B 257a1954d9b1dc5fef7844f4e07e7116b9418cfd72f3ef2081a47181ec64a0fd029ce1357a5514a5faf266e3e660813d717475fc1b03e6c30dc1fe887dec3a4f SHA512 73d75517a0bea24aa337355e27b1fd0dcd0268c398f7584a2c9016d0c05bc80bee8e05d9ec58e8c30ba63f6a2713aff437a83aaecd01813cb62d25c17424860e
 MISC metadata.xml 344 BLAKE2B e860f1ea75a06100691d1df5df6dd7328fa6a585f8552d36736ceae2991e2e54af9e1255bc9842d234a5d01e6ee9ed812e9ba96cf3b794e681c2c3235de25831 SHA512 fead63102a3133d01d586cbcfda4109072a74987481f63c84c08ba92ebbcf2db57f3d7a1d552252baf6e1e5c9e775e41071ec3bf1cdeb795643a359f5fc75a66
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 270b9d73ed9e..dd83202fabeb 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg
 
@@ -43,6 +43,5 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-0.9.10-gentoo-paths.patch
 	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
 
-	xdg_src_prepare
 	distutils-r1_src_prepare
 }
diff --git a/dev-util/gitchangelog/Manifest b/dev-util/gitchangelog/Manifest
index 397df7d0711b..3544a5ec6ed9 100644
--- a/dev-util/gitchangelog/Manifest
+++ b/dev-util/gitchangelog/Manifest
@@ -1,3 +1,3 @@
-DIST gitchangelog-3.1.2.tar.gz 93679 BLAKE2B ffd5a9bd25c8bc647c7414e0864a008bafa09b6d5452fa0241408fa324821d4d4faa3e05ac1157521dec5508240383064fb9baca112218d5555e12cc05807400 SHA512 390d90fe62799350044b0009cc05a9889b1d4cd2a1e10dcdc42c71202afcb2c6bb1cc49125b3f69b03c0bd6a5bc8a7c29da0d9feeb54ac6ce2e396c489e69384
-EBUILD gitchangelog-3.1.2.ebuild 1204 BLAKE2B 4f491ef99999123297aa32962d81e81a20789aabef8b735c788a528dae38e126783077b070973dce2dc6de69f7597e66c2a9afa2fc1d33010def910686d3107b SHA512 f5f6d44b11fd9cdda98c6b8b3a1866faa94f2d3fe0a625d2035e3042b937b6d2cc748204f91e4d5289f97499e2b8eb2d0bf948a14235238224789cc99507da4c
+DIST gitchangelog-3.2.0.gh.tar.gz 98777 BLAKE2B 227b87b4c1da86eb509fcc15211dfd1f22731b20db60a1aea7108c0743a54a151e52f5f44cb5c4c279da53aa2db01f8ae8a466fe1e756322087f6e0ef6c67283 SHA512 1d5cfaec1725ec62b76639856253d1a3e1be3ca377a5ba3a1459bd48ace4c04b477aa88b2deb108b002d4dd13e284028834bfe539bfb59a30f7531d5fa773479
+EBUILD gitchangelog-3.2.0.ebuild 1192 BLAKE2B 13aa8a19abe54f895819f0c3e2ac32b2605408f2573e9db796dcfdebe2a11f27f4a9524987fa51f2b51021ecc3d3bbdd361efcce22daca6ab05fb95cd8abfac0 SHA512 e5d9753aefa976844356476bba33a471b5e4f0733133bdb2a7d3c526fe4ed7341a234b1c41c60ebe637af48e19ddfb1d2b261d14ec1bca615a15b9dd36928510
 MISC metadata.xml 477 BLAKE2B 6c1efb40f4c83484d3aa4b1caa9b888a0f6aaca53741e0592f983347344e625610070c25032d51ec637a028e3383955afef02a599ffaca23f0eca69ef301969c SHA512 2a6f7e9ef7df1b9084f20dd3bb7938867edb9d5104736f74eb25b2a42f04ef2221d2779f0c4aa038a6be207aacc7aab242fba02e26f05fb16e7f43346e2dc801
diff --git a/dev-util/gitchangelog/gitchangelog-3.1.2.ebuild b/dev-util/gitchangelog/gitchangelog-3.2.0.ebuild
index a2ceecfd5456..7761f32baf36 100644
--- a/dev-util/gitchangelog/gitchangelog-3.1.2.ebuild
+++ b/dev-util/gitchangelog/gitchangelog-3.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -16,23 +16,23 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/sarnold/${PN}/releases/download/${PV}/${P}.tar.gz"
+	SRC_URI="
+		https://github.com/sarnold/${PN}/releases/download/${PV}/${P}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/minimock[${PYTHON_USEDEP}] )
-"
 
 RDEPEND="
 	dev-python/pystache[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? ( dev-python/minimock[${PYTHON_USEDEP}] )
+"
 
 # needs versioningit if building from git repo source
 if [[ ${PV} = 9999* ]]; then
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index f05a49d4988c..8a43b4016e49 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -2,13 +2,13 @@ AUX gitlab-runner.confd 688 BLAKE2B 1e99cdca8949a1a085e126c9aa2f23cf15d081087d02
 AUX gitlab-runner.initd 1174 BLAKE2B 53b897abb3bc358839843faf56b52d99412c2a08e2e69e1b8258bab907a0da10dedeafd95e6c4e505fd7e8e4d2344dc07b1e693a130fe0d6a3730bf619ee2e75 SHA512 eae2668c5a98a9e111573a2ea193266252e46e073fafd2c101d3a93e65cb9705f78ceab173ca4d3e1c806443345e7f66b7b97c8b644188cf9f86dc4c087d401f
 AUX gitlab-runner.service 419 BLAKE2B f1a9217eb97d03036eac67569ec6ce6ed91dc2182b20357cf8d17ee0eee01b8d094854b1c76942e0515c2a5923f4d3a1ed044c60b89d8a29c354955f9f666160 SHA512 10cbe1cc0a0b7bb9decde5780bc20caf73892759532df5fc42a7c3b55e141b26957a2986656ac1eb79ce15fd95ee01a184893c22d0dd1ce9117932d0e55ae1b4
 AUX gitlab-runner.tmpfile 54 BLAKE2B 4b2849b9c72998409efce207a336dce42d6e9104e72e0071266e03509841bbb5f39ad8e560beb696eee780bfe82efdec5b877120b5606c524d5cd002095e52c4 SHA512 2b5cccd83c8113a8c58011ced9ff5720a5aeaedb8f819c2a71c8fff3b1683ad87b54fa3da67b7e5f91ab35659d2adf5cf792d93ff293eee39924fbb5b9db2d4b
-DIST gitlab-runner-16.11.2-deps.tar.xz 85890592 BLAKE2B f7316c038e5036799e02d1cd42bf39fbc25a02223b022d6cbb988d1072b4cdac3d652aad068531ebdbf46e16349b35b152d56801920aea05cc1bde0af820952d SHA512 bf01403946883ef3d204064bbf776c3372442e56b1404ee26c092f8e031770786d13ea796a11c41782257f6492ae2c78a8792dc8be6bae9f5be211b904e783b4
-DIST gitlab-runner-16.11.2.tar.bz2 1378922 BLAKE2B 43e896f0680e834d63ce92a1103796fe651067fec62662a186da307e5279f3d9449a6b04867c09a8bf72a3e4c431727c3145dfba5d405c24b881598cdeaebe3f SHA512 c05e5f398fdd5f80fa13dffc21e820d9ce4d34e3e1186c71c818c9e9da7ffec8c79559d5e875b691e824ca0ee0d7598b0166cf7a68e27136b10bf86195fb701e
 DIST gitlab-runner-17.0.1-deps.tar.xz 85885404 BLAKE2B 5145aa9e3bd95c5de993ab846a7d2db3e8e24188c088ffd2788d7e4e055eabe86915cb330590ace6ad5238c90590ac4567faf176947a21c506ef2fa1a8adce35 SHA512 45beaeacd4b734cbabd1991d68827b8f3bb7aaa5e002fb7bb35689b231cc0a2348beca3472ebabb00593fcafc8ae42b7b370e268b7d4c1c2e7d757e7bffa3504
 DIST gitlab-runner-17.0.1.tar.bz2 1371456 BLAKE2B 99516e587ac4801e84308062e04d587f48d735c4645dbc8f7d7a9f55e995758dad7972f708a5d14b2e8e3114f4f1794d7ed544ecb8d7477995c16235857e0366 SHA512 f3af26c252263f101a1e97f61c4df3a99c3d83361bea4be86c06fcff487a8f8829af2b3fd03c8c25341298300f575a35bd82b64580640f8cd8418528a9a67066
 DIST gitlab-runner-17.1.0-deps.tar.xz 86656984 BLAKE2B 7766a3764d8ba17e3943f16a63e2af9705a23080bed23f30c813f07c4ce71057665682d6221790ff767848fefe258ffb796866d1a4e2a693faea1edd55945a30 SHA512 d2b8df673f8ab6a0380bbf3604d71fd963894f5bf55ba91c8755f827654b8b1fd394401c2654a78684dab022ac6f356befbfd862282a1a503422553ce8bd76fc
 DIST gitlab-runner-17.1.0.tar.bz2 1372603 BLAKE2B 1600fbc4ec5eb2b7190424f9f2877e1938bad33b683fefd750e541f72e6d9ee4bf05c1c65de030c9022211333bbfce768bbd96ab750c46153c491d301ec63c6f SHA512 1904bac24b5f9b7bdbd18c7a7c32e875bbfb1017c34441e83a9970624a48c8bbeb3a59f926303ae3a2a28586107f29a5849bee0f17acb8dfdb6e2f7ae904c3b9
-EBUILD gitlab-runner-16.11.2.ebuild 1679 BLAKE2B 7e980a0a8b70cb8cabad97288de252c7acf685bd14ac937b2d92302046b33f2d73446ede6ac3c95c44522169b4ab54dc94aa45007d479492b41ce7667da65b53 SHA512 a34705bdc4b8729675f54914075bb7f912c0d6d4098b8cb312b06283696b3f6d128b3d6cce090d83d558d207cbfd4666efec04dba98600a3cb01292347291e7e
+DIST gitlab-runner-17.2.1-deps.tar.xz 86661500 BLAKE2B 96700ef116677e2fa0d2233475906563b54d7d422ff25612439f0b6530592e24f472b9645d4faff4dd2f98ea37d0f8ad1242ee7ef532a6d7204d582925a50ae3 SHA512 f40317a3d3e9c873c8ba486d6b4c82d233166fc175ed7f8e6563d8a217d80b806f730b4f22e5879568528035961a6fc120b87ce8e9ea2eb9232ba8623b7e407e
+DIST gitlab-runner-17.2.1.tar.bz2 1378845 BLAKE2B 649217da0c358e8db87758c72bd69897b1d9edd0b9e9d92c9a42ce7b39b5fa8bef7a07faf107584d90aae8ce292e0625b2a021294cd9b8cff73c02d086a5cda7 SHA512 3c14643da0884bc6bdf1eebfababb1ffa7d2ecf93ec1b0e708aef143b8a9519bc7d27fb6a3fdf6f6fb5b04511a8f1cfd9622c9c5db4365c879dc30c8a4d59cb6
 EBUILD gitlab-runner-17.0.1.ebuild 1679 BLAKE2B 16526d0b176773f9c7efc3c637f682bf7bcde4e8da17fa6d3490671a636d4dfcfe0e1329203edcfb555e4f068e19284704f2c728cd5fc93519988f131987af71 SHA512 6818f8efcf6cfe3143ea704c4c182aba5f8cfb776eaa938355930d85e31527bd483cb9247211da4b0982e46c18a69bca6cbde63b2e299c528b86dfb552d8c60a
 EBUILD gitlab-runner-17.1.0.ebuild 1679 BLAKE2B 74da717c9d1578e3a4626c88072e490d48223f97b7e1305d758d1f45dd32615caed6f68b5651297ffffe2452aab2fc047e4810a6c0cb8226f36030d224133c33 SHA512 45a7a33c9e15839ea06153f87313110c77550e02caba751b81ec23f2b776eec3f50a4c0fdf76579f54f512ed649551473e72917c823a92b93565e4b959d0515b
+EBUILD gitlab-runner-17.2.1.ebuild 1679 BLAKE2B f1bf44ea5b70dbaa63ba5842650f0a73cfe37e0235f48afc411cae9bdef0e985f7f6ce2655b6f10dc83a6eadbccb8149a6d5ec06c2eb4a433356113923279b47 SHA512 656329e01389f97a8a6af6c29da086b866c2f1b20140084321f853e510fe83c45226d3f894fb14605f274db8ea2d88333d2ebff93c46952a8448a291c16c3928
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-16.11.2.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.2.1.ebuild
index 0ac7bf610b23..39708682b2bd 100644
--- a/dev-util/gitlab-runner/gitlab-runner-16.11.2.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-17.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=1d04b67a
+GIT_COMMIT=9882d9c7
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 9d6348b682ea..f87c55518c7e 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -3,7 +3,9 @@ AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf9
 AUX global-6.6.4-Fix-build-with-Clang-16.patch 765 BLAKE2B f12caf24c4c1ee74ee70b18ff89d44bb45649766514ce3f716b5466026c258be693a0b7483578a319850431cda279148870b0e5b0d763f734eeb52a7206cf4d9 SHA512 625f093f93cda118c9cce22ba8e37a591acc550454fd300718df1b27887294cd52d079b66791d1dce49759b924606a9d9c7d77a50565400f4be7a381a8ba4ba0
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.6.10.tar.gz 2999863 BLAKE2B 496bac144c935893b29e23bbb1fa4583a5d6d0ab1b8cd818ff592d7259bb6fa832d79666703f2ac179b5fd39095fd922b8861ad73879c5bac299f9b785797c0b SHA512 babbba6a8dc701b401a12d9961cb7510983e44c7f80836d6d0da165fd0d8cc695e20b7c241526839aef2a70c8bbf97727d910ff17c37751ba3438267139b45d1
+DIST global-6.6.13.tar.gz 3003671 BLAKE2B 476c918bad8f6d246ef6b50bcccdee9040ced2b529737e55cd5daa62d2b96d9f5073e1a48d98fe2ec0c2da68b1fb557b0f0f7d7d25eba8c5c5d784dda7b29cb1 SHA512 072d10a6911cef3bf66b5cf17e101f9c1ff29c993bf7db4c99164e5c1b18b4e3ddec31962c77beea2685cb116330919abb9b226d472d0003949a91286d0f1b6d
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.6.10.ebuild 1878 BLAKE2B 040ef58fc9297bc3a26b243ec4019723aed753732e7a821eec833ca7f39a27b963959f24ee055177cdfddf542d7d0710425bf541f84e07cd007a2e1ce9a30363 SHA512 614e0b31a26cb51ade41dd10948a001a3d7dae5dc6306c7e94699b202052f26e654188f5efb42b0b86a6739d3c455c10ff92ce625684103878a7b6f027ea1479
+EBUILD global-6.6.13.ebuild 1878 BLAKE2B a85c2154211e02cc827c372531ff0955e14aa0cc6c46cbde92fd476047b1176b116db2cdf29d3fabcab3d7dcd56336422e2c21277d983e673bbae9d41e0c7e8e SHA512 6108bd3e34aedd5794a4c488ce796809527f6e29d61a5f776a05b42ee40fd6fe31943a4cafc864c19d2200fe4f131bac80de6e2c17f90c2f4351fa3c2490cb2e
 EBUILD global-6.6.4.ebuild 1755 BLAKE2B 34ff7d7db35c67badca747e1195e9692bf999747c74944887e7d1aa4ea12948fc3ec8266a20009386bc0a23c6fd1ba310cd5206b0c8c02a254ca0378312171bc SHA512 ffb5882bfadf14829991dc8c2e6d668fa0d7a856727a312c8a33d98c668b9a227513ea849a51aa3746083ae8711d478c291b23fb079bfa10f18f35a3128096a0
-MISC metadata.xml 531 BLAKE2B e924bbdcadc141f5887406f1d454e4ec6c0eca649b5b4bce6bf0c014c636ae10c2a1a95c85c1e772a4172ff678405c545971c5326342dcc57e602184482e65d3 SHA512 121675702866a2c22cdf2d8677aba864bf86f9ac403ab0e95034af8c7dfda981d06316853f1fec8dc0e3600ecb8d07edddd698bd39fba9fac05d3ccdc18e06e4
+MISC metadata.xml 430 BLAKE2B 248f38a3d8bcc6ff4f519ad8bf2266e9aeec39fd51f7d8e1f47dacc1dc6ce5877fb9b7892ba0b8f51d81689d195df0b93db7a23a87b61dc17265649dca9e9f78 SHA512 00306d483618beab79929e82c7c0fea4d0036c239bc0e5e29ef8cc4956110d6b477379a590398d8244770c3ab4fe988f99936743e4b0f09fa26ba163795a338c
diff --git a/dev-util/global/global-6.6.13.ebuild b/dev-util/global/global-6.6.13.ebuild
new file mode 100644
index 000000000000..3307ec39c98c
--- /dev/null
+++ b/dev-util/global/global-6.6.13.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools elisp-common python-single-r1
+
+DESCRIPTION="Tag system to find an object location in various sources"
+HOMEPAGE="https://www.gnu.org/software/global/global.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc emacs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libltdl
+	dev-db/sqlite
+	sys-libs/ncurses
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_USEDEP}]
+	')
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-text/texi2html
+		app-text/texlive-core
+		sys-apps/texinfo
+	)
+"
+
+SITEFILE="50gtags-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.9-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-python-interpreter="${PYTHON}"
+		--with-sqlite3 # avoid using bundled copy
+		$(use_with emacs lispdir "${SITELISP}/${PN}")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	if use doc; then
+		texi2pdf -q -o doc/global.pdf doc/global.texi || die
+		texi2html -o doc/global.html doc/global.texi || die
+	fi
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+
+	emake
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib || die
+
+	insinto /etc
+	doins gtags.conf
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins gtags.vim
+
+	if use emacs; then
+		elisp-install ${PN} *.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use doc; then
+		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
+		[[ -f doc/global.pdf ]] && DOCS+=( doc/global.pdf )
+	fi
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index 578ce6e83983..5872de2d57bc 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -5,9 +5,6 @@
     <email>naota@gentoo.org</email>
     <name>Naohiro Aota</name>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>arfrever.fta@gmail.com</email>
-  </maintainer>
   <use>
     <flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
   </use>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 3b5583640140..950769757178 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,7 @@
+AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71fde277d832ccc6bce1d233348b8124ec69a1a58420a36e74979b1daa4dcf1376883ea98335f59bfd4d55c66b23749fb SHA512 ca2cb4c6579e79a0eb8847da49984d9f0cda0777d6baacbeb51977a864f285bfd8577fcf754de39f11e8ad101c76171c58b08a2359bd7624cb5ae9633137b5fe
 DIST glslang-1.3.283.0.tar.gz 3846095 BLAKE2B 9a5f7c80671ab391d72d1e924f92bfdb850611e594c170365927c4b06adc596fc788d2f365f43fa2ca5ad54dbde7206c6a137dbb4b2875afced6b0dc64331273 SHA512 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda
-EBUILD glslang-1.3.283.0.ebuild 1059 BLAKE2B 4cfae704b9481e9fdd678107e628bf1883679808c8d2c658279c6757b5e735d90e88829e2da2e3b6efb18e66765677d96e3940fae52cbcdc03a52bb871205e0f SHA512 02522568b4906ae373e7b545f81b1e0fc1b46141b7cbacdf38cf7a51654ba1b44aa03b8beb37734f802bd609f5a0f7015ae70450ae46d8a1b816f7ceb53f5094
+DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
+EBUILD glslang-1.3.283.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c
+EBUILD glslang-1.3.290.0.ebuild 1121 BLAKE2B e26fe22c6522598a5148170ab8a66737dc725efaf925e8f57eacf392c6d09c2f8235e34ff2f266f8d74a0a16bb497153e741f630f797f80ae9588349f4272994 SHA512 48d43055072f2cd53048a439322db20bdac79b1700147a8fdd48f1848a4e4355fbe40fb5b183f3c61157c800d810fa382b83ec2a344dca8833a6e351cfe9990a
 EBUILD glslang-9999.ebuild 1065 BLAKE2B e79ae4cd9f63772df7e596efad9cab3545da780a67842cc5505054543082c7c8eec3ee3375cf504adc7bff74f3883f26a61f21d935ff47a071d2a065dd93a41b SHA512 3e9aa9a790ca8f90bf3555d568c658d9071d21879fa22d0cbde28e59d9eb3aa6aacf826dab60f9cae5592c725f88d566b6464d8216ae94c8b82eea05cb305fd2
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch
new file mode 100644
index 000000000000..aea224c37b69
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.283.0-gcc15.patch
@@ -0,0 +1,24 @@
+https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd
+
+From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:44:21 +0100
+Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include
+
+Without the change `glslang` build fails on upcoming `gcc-15` as:
+
+    In file included from /build/source/SPIRV/GlslangToSpv.cpp:45:
+    SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared
+      248 |     Id makeDebugLexicalBlock(uint32_t line);
+          |                              ^~~~~~~~
+--- a/SPIRV/SpvBuilder.h
++++ b/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+
diff --git a/dev-util/glslang/glslang-1.3.283.0.ebuild b/dev-util/glslang/glslang-1.3.283.0.ebuild
index 0f9664315560..3097d8e30d64 100644
--- a/dev-util/glslang/glslang-1.3.283.0.ebuild
+++ b/dev-util/glslang/glslang-1.3.283.0.ebuild
@@ -32,6 +32,10 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.283.0-gcc15.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PCH=OFF
diff --git a/dev-util/glslang/glslang-1.3.290.0.ebuild b/dev-util/glslang/glslang-1.3.290.0.ebuild
new file mode 100644
index 000000000000..17c757b7934a
--- /dev/null
+++ b/dev-util/glslang/glslang-1.3.290.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	GIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0/14"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
+"
+
+DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.283.0-gcc15.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index b0bc47a4020a..03d51c4559f2 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-EBUILD gtk-builder-convert-2.24.33.ebuild 920 BLAKE2B 65cc89f25148af63078a96b30087a9a7d9da97877fbd0e2482c7028cfafa892438ca99b0f69ff1530f788e94eb2fe5ac6dd2d6c13ccc19b1d4a843cebec5b375 SHA512 1c4b1e944a64203684ed4c2842c161dab0db0521a8f5430977ccd7e498e5d6ab4b1e540ff5947d63e401657cbcc12675d8730082fcc4103b30b732076349bb60
+EBUILD gtk-builder-convert-2.24.33.ebuild 921 BLAKE2B 71d20e868f843989202b41852927934aac866c6afa85feebca2109d225e038063b36a1a6edc717af2b59b4f805795fccde4a5e74f908a99d96758650c2352af7 SHA512 79de856f08a6beb6859e33f0128ee72004375e53c37509dbc15fd51ab095bb1a67f2dcc42738f9c2147f5434e84778675b9ad9dbfaaf80dbd504afe3aae287c4
 MISC metadata.xml 344 BLAKE2B d93d834d9bffa367d3f27c94592d752038f5180e6f952153e3c7b9dfe1379efd5b763c4527fefc7484d77ea364295a2308b5dbce823e302c6dfdb6b97cbfc6b4 SHA512 ae4ed69862826073f310baf3443418cbc4de704d59d830e0d34747baa0edb50cfd3ac87cebb4b8935bd6f5438a579dc781687c6fde54d7dc35ff5dfb5654d7b3
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
index 472001d359fb..0f5eaa5ac9aa 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 4014aa34e3fd..25c80547ce3a 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -46,7 +46,9 @@ AUX rocclr-5.3.3-gcc13.patch 776 BLAKE2B f942628db7c91aff27ba6f0cb96ec857b28f696
 DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a
 DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905
 DIST hip-6.1.1.tar.gz 247192 BLAKE2B c40bb483fb61b3037693f456e546046598df7e0dd81a1f1c8d222ab0d9c0752092ce85c8533bd355f883dda5ce1f32f7ff2b2a58cebac50d53e0e7f4d85ca3ae SHA512 3e6162938294a74af51bc2161ada38dc4ba19614e182238f320f2052a9025be6ea413e40f00cb80f4e86696793d6c4431e2417ea798a2330886a3f3e66aedf0d
+DIST hip-6.1.2.tar.gz 247193 BLAKE2B e343bdf233752e40cdefa0c2bbd56858bbb471155045ae1adcf651ddff2ed40dc7c7069998a35e9b26324fdf1c972e13e1222406bc52ae2591c23a45611864c5 SHA512 771f6494c7ff0ddb7d22193dfdbb3fb9461f6e4be347ecb879bb84c5a01a95fb4c4d3f7a0f039265d5369f6c6a5b66949af7bc91ed220f5e81a5b15ec98a68eb
 DIST hip-test-6.1.1.tar.gz 1080605 BLAKE2B 7eddf648be31365479baa0cd4fd1c060a682a6b44d923cac1c4840c0768782db2fef4e5d97318ef0423be1e5c85b1a0cc6b9d324db789dad28be17f64ab38cae SHA512 0dd679c5b94a59e192bea5789f4448b53ac23c8a03b24a347758b1d70ff692483fd4aaea0b19345eb6ffb82a4492ed21958398b53ae6244a244a660dfa33412f
+DIST hip-test-6.1.2.tar.gz 1080493 BLAKE2B ff501ab92c1d3207e330f5e9630e3300aa52f7c2acfae2173a964a2843952db90eea2b4ecf5db1ec6ba65d7764750b9eae3f2a9641d1a3fc71d5172e3a7264a8 SHA512 09fa4243c8b73ddbe163ff4c60f0f8f4182f1a37071e9747bf95ecdc219ba3a0407bdf1e2391481f537b223565a38f16e918667194666558a469d94f88a1e236
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
@@ -54,6 +56,7 @@ DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec7
 DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
+DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b
 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87
 DIST rocm-hip-5.4.3.tar.gz 1195173 BLAKE2B 7452ee7a874bc4703b0d3aaaf9fa2a51e223d5650c65c34982a9981dbe14e8ec70c93d7e70c5ad36a8d02c3d2214fa6a393e20502a01418fb3320d8cfe363feb SHA512 1f4100e114576dcbad83aae453e21ab85cf25bd8a6ada380bb11cfc30e5f92ba903055b7257a099321a84b65adb444dd52b8258e82567f4bc882e65d89369b43
@@ -73,4 +76,5 @@ EBUILD hip-5.4.3.ebuild 5263 BLAKE2B 4fd371749bfe8d1359941be7f71962e9157efab0410
 EBUILD hip-5.5.1.ebuild 5269 BLAKE2B 29d0f7303267e6baec24ea65b24b1b4e1d62255312496f962e7ef81a4da3fd8fe67fac9f87d61bd11de14c0bd8497749183c7a702fed187b54e6b34a5a590b77 SHA512 49a5cbae272cafe9f5b696ddca3099932a50671d2d59d589252834cc7ecb01eccb8efac0a3b39f646e38017e009ffcbfaac7b2f4d59443a68845d4be97f6b361
 EBUILD hip-5.7.1-r2.ebuild 5452 BLAKE2B ff7f44547964dabff96ed68e60d0928512d208b37a446053bc93052aea809914fe4c49430958b7c26900015886b7be0b7c9e6bea4aed91377d83b19f5ba63754 SHA512 a0d0786e8f5e75b4450b90a53131c2580810afcb51d8df618d253c2968b8da3ab1641df9142d8f13db93ed773dcb7e2b746eaab9f42a4f49f820819d5cdb64fb
 EBUILD hip-6.1.1.ebuild 6598 BLAKE2B 01a40b98c8739f976e8b2f81d3fe5dd5ee970cb38ea97317ec18722db9483ced21c8116eb92e206250d8f4209187a78619b2f4f854edb5fb139c884e501e8dbe SHA512 ad283051ed13122d4e2402102cd12abfbcbca996d532398577b74eadc1f17875a26806a9254e4733d9b3c290193eed92ac712c911805cc89dfe6fe4b6c14cb59
+EBUILD hip-6.1.2.ebuild 6598 BLAKE2B 01a40b98c8739f976e8b2f81d3fe5dd5ee970cb38ea97317ec18722db9483ced21c8116eb92e206250d8f4209187a78619b2f4f854edb5fb139c884e501e8dbe SHA512 ad283051ed13122d4e2402102cd12abfbcbca996d532398577b74eadc1f17875a26806a9254e4733d9b3c290193eed92ac712c911805cc89dfe6fe4b6c14cb59
 MISC metadata.xml 1076 BLAKE2B 816a3628360882d89e2bc64f7b5be6442ad4fb0866b6a8291c4701a03e626d9482b93980b34e5ab21c37bda025359978b471d09e2d4817ceeb209d83afaecbfe SHA512 009079d56a9fb1c3212dc4e67dd88bc16bbc6350bb832912543b2a1e6747c77d13021e7a94da9a4c9371722828214b308246e7ad58406276126cdf6e44281506
diff --git a/dev-util/hip/hip-6.1.2.ebuild b/dev-util/hip/hip-6.1.2.ebuild
new file mode 100644
index 000000000000..eab3697cf4ef
--- /dev/null
+++ b/dev-util/hip/hip-6.1.2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_SKIP_GLOBALS=1
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake docs flag-o-matic llvm-r1 rocm
+
+TEST_PV=${PV}
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm/clr"
+SRC_URI="
+	https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? (
+		https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz -> hip-test-${TEST_PV}.tar.gz
+	)
+"
+S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug +hip opencl test video_cards_amdgpu video_cards_nvidia"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( hip opencl )
+	^^ ( video_cards_amdgpu video_cards_nvidia )
+"
+
+DEPEND="
+	video_cards_amdgpu? (
+		>=dev-util/rocminfo-5
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+		')
+		dev-libs/rocm-comgr:${SLOT}
+		dev-libs/rocr-runtime:${SLOT}
+	)
+	video_cards_nvidia? (
+		dev-libs/hipother:${SLOT}
+	)
+	x11-base/xorg-proto
+	virtual/opengl
+"
+BDEPEND="
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}
+	sys-devel/clang-runtime:=
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+		>=dev-libs/rocm-device-libs-${PV}
+		>=dev-libs/roct-thunk-interface-5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
+	"${FILESDIR}/${PN}-6.1.0-install.patch"
+	"${FILESDIR}/${PN}-6.1.1-fix-musl.patch"
+)
+
+hip_test_wrapper() {
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
+	"${@}"
+}
+
+src_prepare() {
+	# NOTE We do this head stand to safe the patch size.
+	# NOTE Adjust when we drop 5.7.1
+	sed \
+		-e 's:kAmdgcnTargetTriple:AMDGCN_TARGET_TRIPLE:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	sed \
+		-e 's:AMDGCN_TARGET_TRIPLE:kAmdgcnTargetTriple:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+
+	# hipamd is itself built by cmake, and should never provide a
+	# FindHIP.cmake module. But the reality is some package relies on it.
+	# Set HIP and HIP Clang paths directly, don't search using heuristics
+	sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \
+		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d)/bin\"):" \
+		-i "${WORKDIR}/HIP-rocm-${PV}/cmake/FindHIP.cmake" || die
+
+	cmake_src_prepare
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	if [ "$LLVM_SLOT" -le "17" ]; then
+		sed -e "s/-mllvm=-amdgpu-early-inline-all=true //" -i hipamd/hip-config-amd.cmake || die
+		sed -e "s/-mllvm=-amdgpu-early-inline-all=true;//" -i "${WORKDIR}/HIP-rocm-${PV}/hip-lang-config.cmake.in"
+	fi
+
+	if use test; then
+		local PATCHES=(
+			"${FILESDIR}"/hip-test-6.0.2-hipcc-system-install.patch
+			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
+			"${FILESDIR}"/hip-test-6.1.0-disable-hipKerArgOptimization.patch
+			"${FILESDIR}"/hip-test-6.1.1-fix-musl.patch
+		)
+		hip_test_wrapper cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/858383
+	# https://github.com/ROCm/clr/issues/64
+	#
+	# Do not trust it for LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	# Fix ld.lld linker error: https://github.com/ROCm/HIP/issues/3382
+	# See also: https://github.com/gentoo/gentoo/pull/29097
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
+		-DCMAKE_SKIP_RPATH=ON
+		-D__HIP_ENABLE_PCH="no"
+
+		-DCLR_BUILD_HIP="$(usex hip)"
+		-DCLR_BUILD_OCL="$(usex opencl)"
+
+		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
+		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API="no"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY="no"
+
+		-DOpenGL_GL_PREFERENCE="GLVND"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git="yes"
+	)
+
+	if use video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DHIP_PLATFORM="amd"
+		)
+	elif use video_cards_nvidia; then
+		mycmakeargs+=(
+			-DHIPNV_DIR="${EPREFIX}/usr"
+			-DHIP_PLATFORM="nvidia"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local mycmakeargs=(
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
+		)
+		if use video_cards_amdgpu; then
+			mycmakeargs+=(
+				-DROCM_PATH="${BUILD_DIR}/hipamd"
+				-DHIP_PLATFORM="amd"
+			)
+		elif use video_cards_nvidia; then
+			mycmakeargs+=(
+				-DROCM_PATH="${BUILD_DIR}/hipother"
+				-DHIP_PLATFORM="nvidia"
+			)
+		fi
+		HIP_PATH="${EPREFIX}/usr" hip_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use test; then
+		HIP_PATH="${BUILD_DIR}"/hipamd \
+			hip_test_wrapper cmake_src_compile build_tests
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
+
+	# TODO: research how to test Vulkan-related features.
+	local CMAKE_SKIP_TESTS=(
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
+		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
+		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
+	)
+
+	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# add version file that is required by some libraries
+	mkdir "${ED}"/usr/include/rocm-core || die
+	cat <<-EOF > "${ED}"/usr/include/rocm-core/rocm_version.h || die
+		#pragma once
+		#define ROCM_VERSION_MAJOR $(ver_cut 1)
+		#define ROCM_VERSION_MINOR $(ver_cut 2)
+		#define ROCM_VERSION_PATCH $(ver_cut 3)
+		#define ROCM_BUILD_INFO "$(ver_cut 1-3).0-9999-unknown"
+	EOF
+
+	dosym -r /usr/include/rocm-core/rocm_version.h /usr/include/rocm_version.h
+
+	if use video_cards_nvidia; then
+		newenvd - 99hipconfig <<-EOF
+			HIP_PLATFORM="nvidia"
+			HIP_RUNTIME="cuda"
+			CUDA_PATH="${EPREFIX}/opt/cuda"
+		EOF
+	fi
+}
diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index aadfbc006417..a4a27d713955 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -2,6 +2,8 @@ AUX hipcc-5.7.1-fno-stack-protector.patch 499 BLAKE2B d848b79ad2fd542bc6e6595ebc
 AUX hipcc-5.7.1-hipcc-hip-version.patch 2245 BLAKE2B 85e41db593706478e92966ee2ee33e1e8c8309251446f14192083a81e35f43be5dfa23337abc8371147b59c9399be79f9461cadf7ba0e025f1355d6c9836d68e SHA512 2cbfdeb9361b38a32ef52dec0c899c7cadc7220a5213fd6e9670c8a9ea6690e80e956d236e0de893bc4fe19117466659bdfdb2e16e720011b7480bc2e8bee458
 DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
+DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
 EBUILD hipcc-5.7.1-r3.ebuild 1168 BLAKE2B 480af07e6feb93e684ff7de07efada9231d43296bfc498267c8d758a25d2690779b7d3bd9f872290f86a8621fa1e519d37d0712200ac0a2cb57c915942b2b3e0 SHA512 c3c3abb00fee6fcc593df78dad13b5ec8a144ed92439942512c67d9fb369dec7f8fa055075a0121a3b08823e236560d256741b1243fb14a3e643cda929f90650
 EBUILD hipcc-6.1.1.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
+EBUILD hipcc-6.1.2.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
 MISC metadata.xml 942 BLAKE2B 56fe9d0c0615796d69d11ced9aa54834f9e3cb649786cc117bb2628086be15e1bc2dfb8e96fc93a043603ab34abec04a8bb1592b101444ea077ba0d73e55c374 SHA512 84bac9774f2d0dfec093c0269fe76662dc12a44fa3d4861152c6a076165d44af399cdcb134bea93d094b9b9d0094bec6ba72f6f81ad29b7467ce5262348ba263
diff --git a/dev-util/hipcc/hipcc-6.1.2.ebuild b/dev-util/hipcc/hipcc-6.1.2.ebuild
new file mode 100644
index 000000000000..87a19b598953
--- /dev/null
+++ b/dev-util/hipcc/hipcc-6.1.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake perl-functions llvm-r1
+
+DESCRIPTION="Radeon Open Compute hipcc"
+HOMEPAGE="https://github.com/ROCm/hipcc"
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/hipcc" )
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(llvm_gen_dep '
+		sys-libs/compiler-rt:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+		sys-devel/clang:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}
+	!<dev-util/hip-5.7"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix)/bin:" \
+		-e "s:/opt/rocm:/usr:" \
+		-i bin/hipvars.pm || die
+
+	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
+		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
+		-i bin/hipcc.pl || die
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	if [ "$LLVM_SLOT" != "17" ]; then
+		sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" -i bin/hipcc.pl || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	# rm unwanted copy
+	rm -rf "${ED}/usr/hip" || die
+	# Handle hipvars.pm
+	rm "${ED}/usr/bin/hipvars.pm" || die
+	perl_domodule "${S}"/bin/hipvars.pm
+}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 20e540f8d0d0..550da70da34c 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,6 +1,5 @@
-DIST howdoi-2.0.19.tar.gz 27109 BLAKE2B 32c7ebf177a5a51f9df924440c5767e1a47125e24b821b51b28cfec45a747f7c04265b93aa0a68a85d2f65582617f866483aa77e8c1168903ef9dfdc860535f5 SHA512 e3e074f7b122513486bda0a0f68d31d51a2da2f17efe5c6ae2b5c49f44dd0f80a735d67a33e3d47eea51d83968da19bc294fc74a30f7e30457058ad9919e105a
+DIST howdoi-2.0.20.gh.tar.gz 2516362 BLAKE2B 4b871661e4926ecfc1eadb095301a5c69fb70d80c1d7ca5aa4c2a6fad36a2bfb53469a79da89b1e28a659cdf0493a7ab47b231e391167c80010303684835bc0f SHA512 1efa479a92b85e418ee83e0f25e00fdc276f0ccb504af924106f925b80ce39af2c92a2dc27744e4816d67e764783f98771eb3ea889c08953e0bade17553f12fe
 DIST howdoi-2.0.20.tar.gz 27595 BLAKE2B 30644384dbe4c6073bd380a283f2af38943822480eebecbdfb252ca225c31579905bf023a90ba907be27e59ec4ae422f27accbe33d30340075264264e865d8b7 SHA512 0950a9f2366817646741c554a0f4b7bd1f05f614af9460ccb110dc0d0f68f58dd6437fedb237df4b340b5a4fbc569faf315273937f6520a85060791044b3dadf
-EBUILD howdoi-2.0.19.ebuild 662 BLAKE2B e6118ab2595d7ab41730ef7e1bc8e7469fee49462f61f0797fbc465df73bd0016776eafb1099cc4efa47eb04af480c6ef53b224859cecb793b88efc43e0adce2 SHA512 f14f28eee02a0fbb4e08af82c52668d3a60f203b41436bb27ba85c777e5337b50d463e9c67524a5ee379ae1f71d6f7e45c374e8187a960d80ce0ae070a70a9a5
 EBUILD howdoi-2.0.20-r1.ebuild 692 BLAKE2B d5ba2862a3c49debbfca6a077f7e8a74ea800952b811576529198a1e6ffe125baad98e3d1adb5e07165281ef9150d3adf6060ee6b5e595051bafc55d4b69c864 SHA512 db99d74914a98b3273024efe238c00e18bf55371aab16ca48e5915ae9d1ed58ef839be45d369d24ece2d1faea72d4f5a58375ec27d1233bfc87d4fe9c3769fbf
-EBUILD howdoi-2.0.20.ebuild 688 BLAKE2B ca9861beea443831e8824d08c66ddfcb6826903143bbe53068dce81d300bdb0d062f7b0f18d8e8bf2e230e335ee85812c8cc30bbd9b8bbd99075249c33a44045 SHA512 ed574bd166624cb36136c1c799c4648ee6afd45a20531a1bd80e5dff1998bbc8c695ffb1b35739fbbd5141bd92b708b16e73f286a36d592d26eaa959877406d6
+EBUILD howdoi-2.0.20-r2.ebuild 1070 BLAKE2B 3b7a025c9e0a1ffdac60f7626ffa5faec422da740f95d8e553d05d4a43352d473b8380fc0f274bf9c9305b712c1f4f8bdad71e85138bb5e7966a17f4d28c48fb SHA512 aef35cb3d04cb0b9d5c107d452417886fa600c81b9ee85e06e35d4241cebc1d594f5e8f460a7d2d050db8bfdd087669385ad56b1ef6848401a5e5b9f510022fd
 MISC metadata.xml 314 BLAKE2B e40e7e6433ff34dde02694b59b222bc4d88eca4bb8d08c80e9d01db0c253ad60b4d47ab3cf0121480aa119ee1805bbea5223e4115d8f956d26fd4572c176f30b SHA512 c0436baa5ddba9423a8cc85adc93939b813aa893f3ed74510223f36fee0d4ba8626da36565ccfdb6e5b8ed3f2d61bad3ae41cc3369241455ab51796069dc6ab9
diff --git a/dev-util/howdoi/howdoi-2.0.19.ebuild b/dev-util/howdoi/howdoi-2.0.19.ebuild
deleted file mode 100644
index 9abefcceba8c..000000000000
--- a/dev-util/howdoi/howdoi-2.0.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# bug 818580
-RESTRICT="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.20.ebuild b/dev-util/howdoi/howdoi-2.0.20-r2.ebuild
index bece62a0a155..a5b89a8bdffe 100644
--- a/dev-util/howdoi/howdoi-2.0.20.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.20-r2.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1 pypi
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
 
 DESCRIPTION="A code search tool"
 HOMEPAGE="https://pypi.org/project/howdoi/"
+# pypi sources do not contain test data
+SRC_URI="
+	https://github.com/gleitz/howdoi/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# bug 818580
-RESTRICT="test"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
@@ -26,3 +29,12 @@ RDEPEND="
 	dev-python/rich[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests unittest
+
+src_test() {
+	# following varaible disables colorization test, which does not work on non-tty output
+	# see https://github.com/gleitz/howdoi/commit/c53b6a179a09159740de2c06fb87b194e810f839
+	local -x GITHUB_ACTION=1
+	distutils-r1_src_test
+}
diff --git a/dev-util/hyprwayland-scanner/Manifest b/dev-util/hyprwayland-scanner/Manifest
index a9a79ea8ecf2..17304f9adfa1 100644
--- a/dev-util/hyprwayland-scanner/Manifest
+++ b/dev-util/hyprwayland-scanner/Manifest
@@ -2,8 +2,10 @@ DIST hyprwayland-scanner-0.3.1.gh.tar.gz 8832 BLAKE2B 2a86fa7e6898a74231836e521b
 DIST hyprwayland-scanner-0.3.10.gh.tar.gz 10039 BLAKE2B 369c2445904480ec9368101056e9712c0583307c1faaea43fed80f17075521371865841c777070a6983d9a84c394c620b0b0ecd53bbd6166f7828e136c0d52eb SHA512 d63f9490d048725a7faa3995e3786190b37db16654293cce16c410c4cfd27e61042a50e6feddc7eda42d67c04bdd7bc19b51f475ddd206ffc5464e762003392b
 DIST hyprwayland-scanner-0.3.4.gh.tar.gz 9610 BLAKE2B 931807bade6186489826fe73ca558c3e4100f0db62c3a07920ad6e173dedc5c4d157b6caf1d5bc75c9b9ef419c8351f9bc06aa84425ffcd506792c8ec7de922b SHA512 1b05a41a19f7d07fdb10e5e72cb6949e1ac811ec0435f49d86376f19c3904660bc2a94b5f2dc75ca45e4243b6009df33682464c24c1bcea65ab16fa4f3a97732
 DIST hyprwayland-scanner-0.3.7.gh.tar.gz 9891 BLAKE2B 587eedabebc775b6d4591b7d0e9517238c18594f397d91d5431368b2f83646ce3b1bfdb07d424410977a8d5afab201f622c0a8de271f9322d250ae7ee621ab4f SHA512 996ef9eaf5b0096a2b01ad8d815584b2c5d6df284e33c2d5a8d07b682df5dc3eff02c3774bc92de57ad014d8414af6bf7bd18a9f212c83d8a0e1e88872f742bc
+DIST hyprwayland-scanner-0.4.0.gh.tar.gz 10990 BLAKE2B f138f74b896d39f12b63ea3cea5a8f456821a6ed9e0e6baefd80f70dffb2f9cd1b650adf59a871f8f8055f8ed7cfb05e4631e96352fc137b8acbf1b6cdd93fae SHA512 1b7b0ddea94bd2679150a7a6d80628d1156ae11d6963fe31fd6d7292cb1d9c273830bb4515032d0645649e56b57c2d64c5312b007ea11480bb798ea43582fe9c
 EBUILD hyprwayland-scanner-0.3.1.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
-EBUILD hyprwayland-scanner-0.3.10.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
+EBUILD hyprwayland-scanner-0.3.10.ebuild 1105 BLAKE2B 746dec99afa57e1c3116412034a2244d74fd1f09079bc53148b4998e9aa80fb7f44e25c2f1d4513363412e1025ff1688b7f5076bf46a697c896bf9b6624a0d2e SHA512 ad0bc21650148ab917fbbbcf60a3d97fd966b433d24800b652219720d70a99cea19f19b1d6839e4accacbf356934f4c96e3476f5eeda74d71316b20364d07cfb
 EBUILD hyprwayland-scanner-0.3.4.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
 EBUILD hyprwayland-scanner-0.3.7.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
+EBUILD hyprwayland-scanner-0.4.0.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
 MISC metadata.xml 796 BLAKE2B ad11d5a2bc557d4eeec7f6bbd098ad28d1cb2b132aad7237029fca054cc9ac29225611b025685f6f1c3b7b8c5cd139076fc65522090243116dd9471276845a40 SHA512 51b663c96e8db90cc9cbafcea489102e7f8ca1fee59118a8b3beb29090f6620b4d539d809be3ccfb083e34a508b19c9aa70580fec774fafa691c393eb7b2a938
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.ebuild
index c48449c55b2b..527981c85db2 100644
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.ebuild
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild
new file mode 100644
index 000000000000..c48449c55b2b
--- /dev/null
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
+HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-libs/pugixml-1.14"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile Hyprland!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
+		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile Hyprland!"
+	fi
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 0c8f20c3c054..dd8f65c536f2 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,6 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.16695.4.tar.gz 9525288 BLAKE2B dcd684ab7a439febfdfddc832b4521947335a5ca9f5c9fc3a3b8478756c6dac50a7a9679a93a3d99607805d22e5f71aba0248787948a59fde5d2b87935f1ffaf SHA512 18532abc0d0675815017d03e36dd090cd35a1904ac86fbe66b169c6fa962de80ccfee29d90c8ce827b24300270c4f7bdfa4793dd11c6d79ae7b1a937217351b1
 DIST intel-graphics-compiler-1.0.17193.2.tar.gz 9647647 BLAKE2B 81e3c159aae3d9966d775bf4844293cbd15dba394906ad7aed6d047ba0f54bc97538e8fde5ff7485b9aee7b604bd7ab3eb7d8cc343f57ea4d7abf62ddc4de3a5 SHA512 48a6986521b85a888dbcebe5a52da328000db3428c2c10590c89e3165b634eb128ac5c550971bb7de86263ab45fca838389f2e3da2b09e3268c5434d337c56a7
-EBUILD intel-graphics-compiler-1.0.16695.4.ebuild 2833 BLAKE2B b82f4761343efbb81129beda9ec47d2fa5c25de57d26a7f15be1aff3523af7f8702359fd252cfcef62696a56cd22174cde28b86af19ae2a34ce32fa55e603c97 SHA512 b831628dc0e19676ea44d243f9218eed0ff367f61811de9d30ea8144d5d69c5ea970dd8ef9e92af57f74ccb02d595e1e69ac730a276a0ea872242ff58dcb53b2
-EBUILD intel-graphics-compiler-1.0.17193.2.ebuild 2834 BLAKE2B 2cd91eb6a239ec060ddef2a2339e53e23d469244ae1484e3510a20f0f481e14943fc4fa8c80778a9e00c51a5fd9088374ad7e2ec084cdf29a2fc3d864a3f5a00 SHA512 4a762c0ee8d5d9483a0e81d440750ff7d076dcd36d1af1ea35b0d5a42857d25e7d11b52f997b361c5d80caa67f600cb4f2985516d57e2f684a96742d64f81bbd
+EBUILD intel-graphics-compiler-1.0.17193.2.ebuild 2833 BLAKE2B b82f4761343efbb81129beda9ec47d2fa5c25de57d26a7f15be1aff3523af7f8702359fd252cfcef62696a56cd22174cde28b86af19ae2a34ce32fa55e603c97 SHA512 b831628dc0e19676ea44d243f9218eed0ff367f61811de9d30ea8144d5d69c5ea970dd8ef9e92af57f74ccb02d595e1e69ac730a276a0ea872242ff58dcb53b2
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.4.ebuild
deleted file mode 100644
index 11d39cb91bbc..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.16695.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_COMPAT=( 15 )
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic llvm-r1 python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug vc"
-
-DEPEND="
-	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		sys-devel/lld:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.18.0[${LLVM_USEDEP}]
-		dev-util/spirv-llvm-translator:15=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
-	$(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-)
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't hardcode FORTIFY_SOURCE
-	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_SLOT})"
-	local llvm_version="${llvm_version%%-r*}"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
-	append-flags -U_GLIBCXX_ASSERTIONS
-
-	# See https://bugs.gentoo.org/718824
-	! use debug && append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
-		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
-		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
-		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild
index a3c00201da99..11d39cb91bbc 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17193.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 5c404d6d0838..0213916ebf17 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 3c68e544898031fe76a57ea754f46ede5b105c259d13dd484eaa63fe51b7d52cf76a4084529b11a586c4d8d06f4cb32f993fd1ea4e6ccc4cbc91e78fe755743a SHA512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5
 DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d04802203e270e6b8ad2b7a62b334ac28f5e91687d7a92501f66b0043255a533d024537ff5ef3f2f03d986e46a7272eeb SHA512 db4071ac80747397023762d6e0355b001f4e942cdc706c67f8aced80e162058667c02a0dc0804a45afc2656cb65d8b16e17148bc03f0a1692067ec170f193c1a
 DIST mesa-24.1.4.tar.xz 29106920 BLAKE2B 2109fc604858a0927271d7b1edb76a24514acac6117e564c6999c99f068624964f5cf0b7d022cac5726e432353a32a5278b3aa00b64dd4118bb2f0b7123c3b41 SHA512 0293f1493685888e5d2f0e616645c937e5a9c348fcb654b050b7c42bfdade1518c508920e456cf8be0033dceab4570a916db87dbb454174e425d91e9c05d0748
+DIST mesa-24.1.5.tar.xz 29140156 BLAKE2B ea29b3b8b6f178dd21d7ee3042ea829755e398f8876dfac6c744de77c08d85abb2736add2141204e6d3343de46040f49d96e1ad455714880b4be46d7b36581f1 SHA512 5916cc38c4a17161b012310c473077177887c5fff1bc5cb1f6efdf5da44878c18c99fe0c62318d897798cd4edb0f7206a989198ba085c2d402d49cdd0ee25288
 EBUILD intel_clc-24.0.9.ebuild 1741 BLAKE2B b4fc7184409bedcfec1cd559149b7d57b9a5bd708cc4aea847c47573cd194804e3435a15120914fadc4bd5f9172e946d93a9164a875809feae2cc7589a36f74e SHA512 d9825be298668fb6bc933ff6131c5a2d18b76bbcb9b6ca2176512d7a4273cf42f5fe00097478a4cd3e9c678fa53c8a95f83115c4f569ac37eebe940749ba340e
-EBUILD intel_clc-24.1.3.ebuild 1747 BLAKE2B 4cb4efc5074e18226021fc2b9233b03544ae56b0e84c1678e0ac809ace3295eda50c952cd991eda23b0ea22eec659abf617ccb1faa5edb57058b6e6c10a5fba2 SHA512 9a21ac0d5656f43eb721c1b5f7aa90b0fa95333f18f68bdd3936a7b9452f00bbe53db37aa7626c910d7be9f953128ead58307b0e4272eb0e88705151b5dcd8aa
+EBUILD intel_clc-24.1.3.ebuild 1746 BLAKE2B 29d3a3345eb3a42a43079d169fe923e59ec7db0e5f5d3057fcb66aeac3c31fadf0522000c860c23b6b5a6aa0a9d82e09b88817c2791adb4d803dbafa6acc16e2 SHA512 8f1de0280d57dc7196d8602f19dcce0211599b47353e2580116289627ab6f8584c8c8bf66d415d177cfa9dda0514a4640057d637d26da081e38ffcddd310b9a3
 EBUILD intel_clc-24.1.4.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
+EBUILD intel_clc-24.1.5.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 EBUILD intel_clc-9999.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.1.3.ebuild b/dev-util/intel_clc/intel_clc-24.1.3.ebuild
index 40ac06697204..4ff279ed0893 100644
--- a/dev-util/intel_clc/intel_clc-24.1.3.ebuild
+++ b/dev-util/intel_clc/intel_clc-24.1.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT SGI-B-2.0"
diff --git a/dev-util/intel_clc/intel_clc-24.1.5.ebuild b/dev-util/intel_clc/intel_clc-24.1.5.ebuild
new file mode 100644
index 000000000000..df38191345d0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.1.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index ff4121550aef..5193f29c1d31 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,6 +1,8 @@
 AUX kcov-40-binutils-2.39.patch 3139 BLAKE2B 4a296c2b964913df11d4b01a1a0bb732c7d83e83f12fe91837574f4b11df0d28463329430bac2ebc47a47637d068a7711dfaeeb38222e9bdaae954da6004e8c6 SHA512 219c1ec491c3718ebd81601b0680b1adaa86929e331f5827491dee6ed9cedd2f171f59812d97860d0aff53d6b6509382ca9192009f0cba3daac0beacea3185f3
 AUX kcov-40-gcc-13.patch 1219 BLAKE2B 2f0f84e4b468a6ca639f217aa0199bba1e4c516cf02c87839c94436f960f0c14dc11f1396193f0ee3658c8984103f4c249dc99272429f8bf6a1b82f643a55a74 SHA512 ccbd84da7fcda5c373a520c1bc1e7fa68c2db688733d928c01b62c83c24c52c91b333658137783d66db6282d799a7dbd283222931fd0819653fa34e657a879b5
 DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff
-EBUILD kcov-40.ebuild 968 BLAKE2B fc49f85486a76099d130e3e652d8a0c9891c2d2c4aaa9b5a4e825a449a988e9871879f78858e9ec54ef756b4c804745df92278b4fbb6fd7db3ebb60a096abe60 SHA512 456bda718e6d4f61a7e1078816cd472fa63bdffab94414a792f5c41cc0fa65949dd504a322b1c4e233840cebce3b4518e943772e7d7ee6ebab132f61597147da
-EBUILD kcov-9999.ebuild 810 BLAKE2B 909304207d86faefa228d004256f4ad2cd377a997bb9f8fe2c5efd7a8ea4fb9d67cfee54daa1caa860fb5d612edd6feb1ed8763f6b5e38f93afc4827e6510f39 SHA512 a8a00d4cbec51b1365f19b0acc2b7827bbcca9055899072962cabb4a3711f60e322c12cbcef2245299cc918a70d52a59c5553d20124d32a5e41bc9d2904dca60
-MISC metadata.xml 356 BLAKE2B 515935715197c175b5b3a465d58b4eaf433ae23f4d884f3d6e2796662d1f9e0eb507955ff591844b18df76f3422f01ebc73163d17f67d500f8d8560ec862b8fd SHA512 7bcd02ba7e6b3da5207d72f3985fb0ac1fdfe4a8dfc93c74d970137e603dc2626398fc2e145c8c250e28eaa0678ff671cb4f3b3ee4b74807935c19d76d0b5d9d
+DIST kcov-43.tar.gz 259022 BLAKE2B 7d6da38ec93f6e7904372b0917ce86e544cd9abcaff4d21354b7c5cc40c91be37c62bbedbc7fcc449ec24fa8815503c0ed355996eef9721aab0a65ed9a1c203e SHA512 11158c63a4eb5fdb34b4787c135e3c8db60e6d3292fc109fcfb43e6dab30c6c4310b09c6d94614556eb005792bab235c6cd839c585c3a98f5700c4ee4d317aca
+EBUILD kcov-40.ebuild 970 BLAKE2B 2da5d519acac1726935da68c36603e243c7cc999240831b6bd3a443685aed1edc7fad011b9f9ac2b73ca1c1b2e59182332fc16a16c9f09811f81225b1bade9c0 SHA512 ad031e9551a992ab4d9e84eb74a4cf443a8bea9a01ab9759113f5ded00da3f90384a802f15a90415bc56dab90a9c01ea5753020d19a2380f038771a542087036
+EBUILD kcov-43.ebuild 1602 BLAKE2B 04303574469813cc4b376b4675eb1be4e1f0644b4aed389b256e21bbdd0b42bae5f5a37b3c6022ab024a15e9b98124ec92a92f3f2ba9fd5276f49646deaa4850 SHA512 79bd317bcb4c65d0c0ad5aabd73dd87745d1d095e06d69cad448e1f6535b98d201620ff6a17886e015b7a6df1efe0fa955f92d9fc1a5fe53c1972b058548d929
+EBUILD kcov-9999.ebuild 1602 BLAKE2B 04303574469813cc4b376b4675eb1be4e1f0644b4aed389b256e21bbdd0b42bae5f5a37b3c6022ab024a15e9b98124ec92a92f3f2ba9fd5276f49646deaa4850 SHA512 79bd317bcb4c65d0c0ad5aabd73dd87745d1d095e06d69cad448e1f6535b98d201620ff6a17886e015b7a6df1efe0fa955f92d9fc1a5fe53c1972b058548d929
+MISC metadata.xml 2090 BLAKE2B c25cc30ffb3d25dea54a03b831e547548d9767fd28c20a5b06c3bbf8bf68504d97c426c6fc3ad644622a73682987951e85486aabb25e09d34c4bfe3a1db04ec7 SHA512 2fc8bce2a29321a12e59ecf91f2d5c2c024016e306fabbe1cb6e75d7301832e7627ef814d1fe0dd04a9bc7a533c96bd2078f309e1276b038425016360e829f68
diff --git a/dev-util/kcov/kcov-40.ebuild b/dev-util/kcov/kcov-40.ebuild
index ea93aa899477..acf228ac0b9d 100644
--- a/dev-util/kcov/kcov-40.ebuild
+++ b/dev-util/kcov/kcov-40.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
diff --git a/dev-util/kcov/kcov-43.ebuild b/dev-util/kcov/kcov-43.ebuild
new file mode 100644
index 000000000000..2c1f929f9a7a
--- /dev/null
+++ b/dev-util/kcov/kcov-43.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake edo python-any-r1
+
+DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
+HOMEPAGE="https://github.com/SimonKagstrom/kcov/"
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/kcov.git"
+else
+	SRC_URI="https://github.com/SimonKagstrom/kcov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/elfutils
+	dev-libs/libunistring:=
+	dev-libs/openssl:=
+	net-dns/c-ares:=
+	net-dns/libidn2:=
+	net-libs/libpsl
+	net-misc/curl
+	net-libs/nghttp2:=
+	sys-libs/binutils-libs:=
+	sys-libs/zlib
+"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	doc/
+	CONTRIBUTING.md
+	INSTALL.md
+	README.md
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test; then
+		sed -Ei "/skip_python2/ s/= .+/= True/" tests/tools/test_python.py \
+			|| die
+
+		echo "add_subdirectory (tests)" >> CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=( -DKCOV_INSTALL_DOCDIR:PATH="share/doc/${PF}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	PYTHONPATH="${S}/tests/tools" edo python3 -m libkcov \
+		-v \
+		"${BUILD_DIR}/src/kcov" \
+		"${T}" \
+		"${BUILD_DIR}/tests" \
+		"${S}"
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/share/doc/${PF}/doc"/{CMakeLists.txt,kcov.1} || die
+	rm "${ED}/usr/share/doc/${PF}"/COPYING* || die
+}
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
index 201ab239e41c..2c1f929f9a7a 100644
--- a/dev-util/kcov/kcov-9999.ebuild
+++ b/dev-util/kcov/kcov-9999.ebuild
@@ -1,36 +1,84 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake edo python-any-r1
 
 DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"
+HOMEPAGE="https://github.com/SimonKagstrom/kcov/"
+
+if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/kcov.git"
 else
-	SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/SimonKagstrom/kcov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 MIT"
 SLOT="0"
-IUSE="+binutils"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/elfutils
+DEPEND="
+	dev-libs/elfutils
+	dev-libs/libunistring:=
+	dev-libs/openssl:=
+	net-dns/c-ares:=
+	net-dns/libidn2:=
+	net-libs/libpsl
 	net-misc/curl
+	net-libs/nghttp2:=
+	sys-libs/binutils-libs:=
 	sys-libs/zlib
-	binutils? ( sys-libs/binutils-libs:= )"
-DEPEND="${RDEPEND}"
+"
 
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils)
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	doc/
+	CONTRIBUTING.md
+	INSTALL.md
+	README.md
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test; then
+		sed -Ei "/skip_python2/ s/= .+/= True/" tests/tools/test_python.py \
+			|| die
 
-		-DKCOV_INSTALL_DOCDIR=share/doc/${PF}
-	)
+		echo "add_subdirectory (tests)" >> CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=( -DKCOV_INSTALL_DOCDIR:PATH="share/doc/${PF}" )
 
 	cmake_src_configure
 }
+
+src_test() {
+	PYTHONPATH="${S}/tests/tools" edo python3 -m libkcov \
+		-v \
+		"${BUILD_DIR}/src/kcov" \
+		"${T}" \
+		"${BUILD_DIR}/tests" \
+		"${S}"
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/share/doc/${PF}/doc"/{CMakeLists.txt,kcov.1} || die
+	rm "${ED}/usr/share/doc/${PF}"/COPYING* || die
+}
diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml
index 5a02da613ff9..57ed59414176 100644
--- a/dev-util/kcov/metadata.xml
+++ b/dev-util/kcov/metadata.xml
@@ -1,11 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>beatussum@protonmail.com</email>
+		<name>Mattéo Rossillol‑‑Laruelle</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		<pkg>dev-util/kcov</pkg> is a FreeBSD/Linux/Mac OS code coverage
+		tester for compiled languages, Python and Bash.
+		<pkg>dev-util/kcov</pkg> was originally a fork of Bcov, but has
+		since evolved to support a large feature set in addition to that
+		of Bcov.
+
+		<pkg>dev-util/kcov</pkg>, like Bcov, uses DWARF debugging
+		information for compiled programs to make it possible to collect
+		coverage information without special compiler switches.
+	</longdescription>
+	<longdescription lang="fr">
+		<pkg>dev-util/kcov</pkg> est un testeur de couverture de code
+		FreeBSD/Linux/Mac OS pour des langages compilés, Python et Bash.
+		<pkg>dev-util/kcov</pkg> est, à l'origine, un fork de Bcov, mais
+		a depuis évolué de manière à supporter un vaste nombre de
+		fonctionnalités en addition de celle Bcov.
+
+		<pkg>dev-util/kcov</pkg>, comme Bcov, utilise les informations
+		de débogage DWARF pour les langages compilés afin de permettre
+		la collecte d'information de couverture sans variations d'un
+		compilateur à l'autre.
+	</longdescription>
 	<use>
-		<flag name="binutils">Use <pkg>sys-libs/binutils-libs</pkg> for --verify support</flag>
+		<flag name="binutils">Use <pkg>sys-libs/binutils-libs</pkg> for `--verify` support</flag>
+	</use>
+	<use lang="fr">
+		<flag name="binutils">Utiliser <pkg>sys-libs/binutils-libs</pkg> pour le support de `--verify`</flag>
 	</use>
 	<upstream>
+		<maintainer status="active">
+			<name>Simon Kågström</name>
+			<email>simon.kagstrom@gmail.com</email>
+		</maintainer>
+		<changelog>https://raw.githubusercontent.com/SimonKagstrom/kcov/master/ChangeLog</changelog>
+		<bugs-to>https://github.com/SimonKagstrom/kcov/issues/</bugs-to>
 		<remote-id type="github">SimonKagstrom/kcov</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 36a6deada059..11dc3555f695 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,5 @@
+AUX kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch 2233 BLAKE2B 47d0a31732915d5217b88aa573a2eb7d2803f9861455a67ad5bb0e88b8b689a789a23a13e7420757ddbfd23310af522ababb37fadefbbbc8e3e4c401fabd78fd SHA512 036a08ec55d4d1c2f766e499ef2c034255f02c0bf665b5651bb31d0e3a7ffa585ff18cc05a7f7efefb0933c727a5455caca0003a66b8a90258026bc419d78292
 DIST kdevelop-pg-qt-2.2.2.tar.xz 660708 BLAKE2B 822753315969cf4176ed1a25bb27516661af865a4c337f069a892b008802359f4a933ebc9e9e1ac0c91d2314a6ec5cdcf91db4641e624e07373dfec47a71dcf1 SHA512 e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369
+EBUILD kdevelop-pg-qt-2.2.2-r1.ebuild 529 BLAKE2B 1a8de7446a647fe28bbc60e13b4866998139eca0aae03730edb0d0fe1434b81f716dfd0f266b442819b9f34693dde4bae285b2b0fcc615e1f9aaf5d9446182a3 SHA512 70421991d553425c6d86bedd1c23514bfc04d388dcc23a7773c38dfdb6973fb36b6961faf5e1e574ced4495c112db986a961a437a66f399e0d9bc8cc97adec8c
 EBUILD kdevelop-pg-qt-2.2.2.ebuild 453 BLAKE2B 5633113b1eecf783fc90c9252f6a6a38ce0758df9642ae505d69ee8db19d85fa7c8b1ce649853127596eec28e2ed6dd33e7d1349b4c8cc24d79e0eec9d0a384a SHA512 2344e46d69f787b252e6c6f0996f8c35cc92dc05ca93585f0c3999ef970deaa36ab1936cda56772665ff783a1b9cc9e52b8443c4c1004c39697beb3917ea8479
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
new file mode 100644
index 000000000000..360010c49cb3
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
@@ -0,0 +1,53 @@
+From c210967f753b33db48dbf942c7b32e67363ca204 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Sun, 30 Oct 2022 11:56:59 +0100
+Subject: [PATCH] Port away from deprecated QString::midRef
+
+GIT_SILENT
+---
+ kdev-pg/kdev-pg-debug-visitor-gen.cpp | 2 +-
+ kdev-pg/kdev-pg-regexp.cpp            | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kdev-pg/kdev-pg-debug-visitor-gen.cpp b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
+index 418d044..d4394f7 100644
+--- a/kdev-pg/kdev-pg-debug-visitor-gen.cpp
++++ b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
+@@ -72,7 +72,7 @@ void GenerateDebugVisitor::operator()()
+   out << "                tokenString += QStringLiteral(\" ...\");" << endl;
+   out << "                tokenString += QStringLiteral(\"%1 more\").arg(end-begin-20);" << endl;
+   out << "                tokenString += QStringLiteral(\"... \");" << endl;
+-  out << "                tokenString += m_content.midRef(end-10, 10);" << endl;
++  out << "                tokenString += QStringView(m_content).mid(end-10, 10);" << endl;
+   out << "            }" << endl;
+   out << "            else {" << endl;
+   out << "                tokenString = m_content.mid(begin, end-begin+1);" << endl;
+diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
+index fda19f9..808018f 100644
+--- a/kdev-pg/kdev-pg-regexp.cpp
++++ b/kdev-pg/kdev-pg-regexp.cpp
+@@ -71,10 +71,10 @@ inline QString codeForDot(QString str)
+     int npos = str.indexOf("\n\01!ASIgnore\"!!\n# ", pos);
+     if(npos == -1)
+     {
+-      out += str.midRef(pos);
++      out += QStringView(str).mid(pos);
+       break;
+     }
+-    out += str.midRef(pos, npos - pos);
++    out += QStringView(str).mid(pos, npos - pos);
+     int nlpos = str.indexOf('\n', npos + 17);
+     int codeendpos = str.indexOf("\n\01!AS/Ignore\"!!\n", nlpos);
+     if(nlpos == -1 || codeendpos == -1)
+@@ -82,7 +82,7 @@ inline QString codeForDot(QString str)
+       out += "<junk>";
+       break;
+     }
+-    out += str.midRef(nlpos + 1, codeendpos - nlpos - 1);
++    out += QStringView(str).mid(nlpos + 1, codeendpos - nlpos - 1);
+     pos = codeendpos + 17;
+   }
+   return out.replace('\"', "\\\"").replace('\n', '\t').trimmed();
+-- 
+GitLab
+
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..1d77f74d84fc
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="https://www.kdevelop.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+"
+
+PATCHES=( "${FILESDIR}/${P}-port-away-from-depr-QString_midRef.patch" )
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index cca81d595b5e..862135139074 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-24.05.1.tar.xz 1090160 BLAKE2B 1a7b65c59609cf31f3a2152296e4452a1f0ccde31e718ddd19920e979efe35f4c7ba5764525f6d44a333bc32fe09b4032d27b3091d5aec92ed09667adee5b1d0 SHA512 5fd9b489927648ea87abe60dfb231da62609335e580bde38190d21addde87a95bcf094dd205966e7855d1ab6425ca76d57f087378ead55ce1ee9e58ef9436cbd
 DIST kdev-php-24.05.2.tar.xz 1090080 BLAKE2B e28eace93c60a7714a15d739120d050aaf112b86ad3605e6d5ca62f319bd023469c8af414ae73a158437cfe7989c4643c88eed3654d96bc32095be87a3970fb6 SHA512 6da350a854786ecebf51425455f0604a886ff467080bd945725a3efb3983ed4f5643cb93688487ce6e553cdf62d5b7494e7f08bd3d6509496fbe7968a8ca43bf
-EBUILD kdevelop-php-24.05.1.ebuild 1204 BLAKE2B 509cb0478627bc393c54b6e8732b867f7a01a160238567e5daa4cbae02c49e7ed10621477873e027863520d619aef7a7a8075e67ddc48437751577af675f2d0c SHA512 daeebae5053ba338aeed3983b2ed67f53622bb313a7b7de1597a434fd90d6a34fce96a027e3cf29468476b3dcb767215190a20c9176131f633136d0419889a19
 EBUILD kdevelop-php-24.05.2.ebuild 1204 BLAKE2B 509cb0478627bc393c54b6e8732b867f7a01a160238567e5daa4cbae02c49e7ed10621477873e027863520d619aef7a7a8075e67ddc48437751577af675f2d0c SHA512 daeebae5053ba338aeed3983b2ed67f53622bb313a7b7de1597a434fd90d6a34fce96a027e3cf29468476b3dcb767215190a20c9176131f633136d0419889a19
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.05.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.05.1.ebuild
deleted file mode 100644
index d453dd5fa6b9..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-24.05.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-# remaining tests fail for some, bug 668530
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index c1f5e3c38185..da5ce23ebd36 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,6 +1,4 @@
 AUX kdevelop-python-24.05.1-python3.12.patch 6101 BLAKE2B decbd9f26f3c44bb2f6b81ff511f737a217fa7946cd3b72b2c13c6c5b06fee3e7a9ad14edc9dff858f04eed17de57d8297172c55ffee5fc826189c3e0b320051 SHA512 311966d24e3d5a73c79372abd30a261ba8a78dedec3cb4c9990264bdd6cce7bb8737f2ec687e683534317315137f5a1fe0df29fcf9f75c38a5d86971295d56ae
-DIST kdev-python-24.05.1.tar.xz 1098416 BLAKE2B c43c92f0606661d2fe2bd05a43f155a90ce40bb42d494cfd3c9ae3a0ff5a4d636440645f88fd5798b7b96454089ef9611dfa22851bd43ad1d85986ce46f077fd SHA512 e35ee5618e746fabe14e62185eb3d19fa7cb54e9cbe8fc8ec9fb1fa0fd938c984a9573408e0bc9993bd04b66ba5bd3274ddbb722835dff760d4626e42c30612e
 DIST kdev-python-24.05.2.tar.xz 1098280 BLAKE2B 71f3759d45defde73bb2526b33d48641efe2da771a088ad9bc481d24fb59b3a1d890744307340ef648a08fd4a9f1d0bfe52f099c7fcd8e1e19fb59809e9e0aa9 SHA512 d7e5935194e16203479f1cdb32118b383c7f5837306aff1a60eee729e93a6cb3be0427536aa2bcdaa5b5363844571ced056ea74cca02f329ca9ea07c7ac98fd3
-EBUILD kdevelop-python-24.05.1.ebuild 1296 BLAKE2B 1e87ee2b4e2fc48c0d0b1eecf68e6b907bc8ac6da8542b7f5d2f9ca575eb024491c6bf778999c9e254dd9325b2263851dd58395250c817555c3d2aba09e3695f SHA512 7f4552c86ffbf2457515ce2e9d1c58c53ff561a2354e3f921832f066788ff54225459dfd228a3eed0e6e3e57419355daba58a867bc2db28d1095e6f051e26133
 EBUILD kdevelop-python-24.05.2.ebuild 1305 BLAKE2B 3eb7f17f7a04e9ce8e93bfe02eb1dd15faa27981856870437ef331c58975723e803ffcbabd410734709fb3a5c52e559a4bd5329cf691ca7948e4f5145feae645 SHA512 b958772ca359f11c5600e7c2df206f1a14a7b1f12f2f51a10d951e01f5952b1240c709bdbc23cc941f33e9fbd6f0b6a21f6a4136080cb174c20a965be2e73d7c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
deleted file mode 100644
index 1fb3d4cf347d..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${P}-python3.12.patch" ) # bug 929546
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2802084bcca9..b24c418188f4 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,3 @@
-DIST kdevelop-24.05.1.tar.xz 8766460 BLAKE2B adf09209f3de4649ffec7e7320dd77fbed9e838b98a793382a693138ffb5718b6d5610d809a334b5b01bd2858a64c5940b823ce162c2a325e14558590b593f1a SHA512 d3243a427c3dc2194977dd9073faee2bb6605c7a791733dbafb52f332453f383b4e7b05bc2ee4385d457f7ee625b2562ebabc65b635c45033be123f099584e4d
 DIST kdevelop-24.05.2.tar.xz 8763748 BLAKE2B 8a6214aa03cfb507f24cf2bfe615f1a0851e46d4094df1ec1b2341ba468e10d5e955ef27ea4505dabfa9559eb53f94ecd03ef50d0d0bd7fbe1903964ba118bda SHA512 bf262c93bfb19ded1e914732b027275524ca4089f71d72a42ccbf544eb38a15d02051af493d7a545dc37c811b1637459f709c5776e879858640e16b19e0220ae
-EBUILD kdevelop-24.05.1-r1.ebuild 3901 BLAKE2B 72a355aed6f0c7f8bd77fad35d8ae10102ed3aea7ec0b2becf82f8fa3706e18f563377db2aaee83cd9e0c91ad5b0af30b045fa7657da270d04574d9e5ef9cb83 SHA512 cda19d8c75eda04e686bd61d47bb21c9110dc8a9e9723b1854ab864274a55dea01ae1d8f8f1c8186097d9f9e3cb36e6a0c88718e2c89ef077865d9a775590fa6
-EBUILD kdevelop-24.05.1.ebuild 3915 BLAKE2B 18eaa1d26f875b7b29fc36cc924f15efd7620ac6678173937f2f02a416df8579bc97c480bb8843e87669980077a3da0876934a6cf14f8ff4a1986d1f8bf6a36b SHA512 fa7912f7d4438e1082014f007c817daaaa988baec8205e9c7da00e745b4f855d1adcc7c9108d6c2ac9ccdaaa1e796203a800532c767ad7da4a4c9a331e2f9a4e
 EBUILD kdevelop-24.05.2.ebuild 3899 BLAKE2B f7e98ce4214f32fb4bfaac9835d1ca98029a9507541985729cad1ada86ca2b16a51f4c69c034dcb7cf7864135ab9f6b494785cb8d2030f59da45dfa55173b856 SHA512 cabc9e40452ab6775f3bca940be611224ceba381d258561abcd389d413110ef33efba983315a53ea36de790da0b5476c2697451c5c58b0ecaa2499fcb76db800
 MISC metadata.xml 562 BLAKE2B c6c7dbf9023a7719177a489945ee52826e1b6234d1ecb0a323ae81385383a5383a0eacdc1c92b26b8626d20b2ce2480998497864176eb8bcd8796892d7517ff9 SHA512 c1da348d10d81300b68c2eafcbab5034606e734e5df2699616523b0f4639ae9b01541fd9f2d88ef2f068fb6055c2b56913c92b467666650767540948a7982acf
diff --git a/dev-util/kdevelop/kdevelop-24.05.1-r1.ebuild b/dev-util/kdevelop/kdevelop-24.05.1-r1.ebuild
deleted file mode 100644
index 5e3a3c5a3cb5..000000000000
--- a/dev-util/kdevelop/kdevelop-24.05.1-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.115.0
-LLVM_COMPAT=( 15 16 17 18 )
-QTMIN=5.15.12
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org llvm-r1 optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gdbui hex plasma +qmake subversion"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-build/ninja
-	>=dev-debug/gdb-7.0[python]
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	kde-apps/kapptemplate:*
-	kde-apps/kio-extras:5
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-	llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON
-		-DLLVM_ROOT="$(get_llvm_prefix)"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-build/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kdevelop/kdevelop-24.05.1.ebuild b/dev-util/kdevelop/kdevelop-24.05.1.ebuild
deleted file mode 100644
index 17b92047ca99..000000000000
--- a/dev-util/kdevelop/kdevelop-24.05.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.115.0
-LLVM_MAX_SLOT=17
-QTMIN=5.15.12
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org llvm optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="gdbui hex plasma +qmake subversion"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-build/ninja
-	>=dev-debug/gdb-7.0[python]
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	kde-apps/kapptemplate:*
-	kde-apps/kio-extras:5
-"
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON
-		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-build/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index 4ae40ab8e8fa..18fa77d7fb7c 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kio-24.02.2.tar.xz 40468 BLAKE2B 3c835dcf03a2c85d0acef9f38ca463f2b0114c7297759bfac6b6ba7879adb34ec8c68cf0145da66d0089757bc7e72fb6ae9b7fd4556a4d9c661ee2cf26e26db3 SHA512 3c005bbe1868b91997beb464a7ca9ef27beb81e8599127be497957d202be2b526ab4366bf85c1e2c30dfdda995c675a233f6613d8521e82d332a94d735e1f94d
 DIST kdesdk-kio-24.05.2.tar.xz 41144 BLAKE2B d2c87c7e37e5cf795b0d931fed4644fe87fcdffd156044eeb14ed1c2063f5c4f939c2c8c3fd2fc46d49a123a2e8d50ee5e6c798e36eef55178a2d843c418ec9c SHA512 337b3c7b8f06aec472ad01335275ef90831ea2b54210058a3ce9457e4d3fbc642b9a8870cd9e3bc089cf590fa92407bc8ccc7df665a751c2fea278e5a3f83e61
 EBUILD kio-perldoc-24.02.2.ebuild 491 BLAKE2B 4a1c84e2e8430aa347597d2ed2b0b972168ae6481808e0185a8a901db7ef03e6884cf234a246e177ebaaff87fc564767523048de223b3bb9292ce31248c25be2 SHA512 9e025f2c7775986387d62e8475d051bd280a5f743bff035f763ac9b030af11a4714b121a43a03c07a84b72560122b61b830750128bbb195711b1ddaf69ed77cc
-EBUILD kio-perldoc-24.05.2.ebuild 487 BLAKE2B c806acf6feac287772d36387a6dc2c3b74e5c664c54c7e3db4bccc215d20b8a8f508cb59494f9b55f660e2a55d32eee24687129c365209799c2c2ebbc9b00a73 SHA512 43f9e5bdb1772a4e3a17f39091109c6b5ef7f7b10f3bc5da2638d35e90748e7f6a704b90bb107f88522967c8c50f639d6b5c6e7c5d8d6dd2a3ff56b0ca724557
+EBUILD kio-perldoc-24.05.2.ebuild 492 BLAKE2B 2f473cfc085741c73ef7cd76e4cb2081154be07ec07af4fea4ad95ae4bc1fc46a5d1fcf341139e00801ad98257810d488fcade6e1adbb748020dec86fc36c61c SHA512 f911c95566cae0582c7bd664e14fafa278fd26b93780f6f6955cf7f08dc1ac482b6972512db56aa0e40a3fc6dd8ed3cb15a6120eb973acc1292a70343dbda7d0
 MISC metadata.xml 376 BLAKE2B 973773b9cb2a2e9d2a7e187056409bbbe4a1f88bf97b791fe4b096beb1c638bbfef558abb19920383471641454784549ada0fe5aba4fcfb6ce762156711457c6 SHA512 e29785bf513fab36b159f7bdca1a339dc3e004e067b1e98ae5997f865494ac70ef4e27a74387cc65a486decd42f91926fe478143b6ac9906753a69f0b546617a
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
index 4de9af60d70d..3b854d36fb97 100644
--- a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
+++ b/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker interface to browse Perl documentation"
 
 LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 336e1d8dd854..bed1a57597ff 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,6 +1,3 @@
-AUX librnp-0.17.0-dont-bundle-sexp.patch 1073 BLAKE2B be3a0068f0134aea8347be9f95c82a54eaf8fed1158ee23c6909966f65508fe07a45bee1f78799f5f2c497214afad26b2170aefd9de348bd66e9bb0d978a3083 SHA512 295488e925bd764532e12cecc0b574487528c0d6e14aa78a7504c9ab55ed8a5c82a938995038d9a40eee49f8e229e2dfafe89ed4ce726ecc22672b3579ef6761
-DIST librnp-0.17.0.tar.gz 2996461 BLAKE2B 9a6ea0452f067464ef52cef395c2969ba9912c5ed32ac6f4d860a3410965dbfbb1ad5c0d4f25489011d869222a4362a90463f521efe5af4b7c412f0ed1e4570b SHA512 0aa5262aa3be163b8a8931d6b9200ced52bb640cd7b02b50009cfb8d5fe1e664d27b2c4a0a3e534cf59d6ea42fbc1c62c970a07cadc27ab6962e0f69f996f74d
 DIST librnp-0.17.1.tar.gz 3515288 BLAKE2B 279cd5c669b469112066c4754a9a5a5c9fbe3ba225be4f85bc507aad9f29cfa166f90cb3dfe83ea8e29964fdfbbf926438fb36bb345da494ed7f70586fa8d7b6 SHA512 0224f79e4dd4b72ddd9c191218327da5485ed1d81321cc3a167cfeea68c00e47cec9151a4177e65e5560039345db3a52e41a093adfdf833f57e867bc559494a5
-EBUILD librnp-0.17.0-r3.ebuild 1932 BLAKE2B 5ec8fe6ba0119f30f81201cff3dd4b669741b4bbdb3db65996bf1bb23e5267fb552a75edffa00e5d4e9b2f178ab50ad8c539c5d6532d8d041cba531484c20758 SHA512 f3b43221e5ce01ae2a64e4c418a04000b9c0d7ef5020f7ef50d2960d5ee95bde15298beed85e5015a5e383b36eece1120391b000513e68aaa8b2e3e92806f032
-EBUILD librnp-0.17.1-r1.ebuild 1877 BLAKE2B 24396a654d81d72342f9fb4b8b059043f62cfa030deee7f38ab0aa43987553fe70118c74f286a28519705bbf5ab482d53154535dcf29822d3942aecd850c1261 SHA512 1b53ab95d4534bb46eb020b9fd5e4d82cfcdc40ca3895e0b0d2a48837971a0ea9352ec28277a4458a4e6815b869d231cf8e2bc29f64418deb6b9db6260bd9190
+EBUILD librnp-0.17.1-r1.ebuild 1876 BLAKE2B 8a7db63eb8468c525452096804bae4c21e75ab2c394afc54be0e4f9c675381d1f6f643523bfe8781656bc9019964c3f342e659bb99b5b85c99bda50738aef6bd SHA512 b38c5b674437c0cab50e49cb4d8f8bef56f7b081a6d40d7e9918118ef1bfd45bed30a707fa2e2f7ffd4df032f1b150965730c2a99f49522245c930594b04c2bc
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch b/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch
deleted file mode 100644
index 4e8b67a2f5f7..000000000000
--- a/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2023-05-02 11:01:48.000000000 +0300
-+++ b/CMakeLists.txt	2023-05-03 11:57:06.095299932 +0300
-@@ -176,11 +176,6 @@
- endif()
- add_subdirectory(src/common)
- 
--set(WITH_SEXP_CLI OFF)
--set(WITH_SEXP_TESTS OFF)
--set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development)
--add_subdirectory(src/libsexp EXCLUDE_FROM_ALL)
--
- add_subdirectory(src/lib)
- add_subdirectory(src/rnp)
- add_subdirectory(src/rnpkeys)
-diff -Naur a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
---- a/src/lib/CMakeLists.txt	2023-05-02 11:01:48.000000000 +0300
-+++ b/src/lib/CMakeLists.txt	2023-05-03 10:59:25.147032470 +0300
-@@ -433,7 +433,7 @@
-       COMPONENT development
-   )
- 
--  install(TARGETS librnp-static sexp
-+  install(TARGETS librnp-static
-     EXPORT rnp-targets
-     ARCHIVE
-       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
-@@ -441,7 +441,7 @@
-   )
- else(BUILD_SHARED_LIBS)
- # static libraries only
--install(TARGETS librnp sexp
-+install(TARGETS librnp
-     EXPORT rnp-targets
-     ARCHIVE
-       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
diff --git a/dev-util/librnp/librnp-0.17.0-r3.ebuild b/dev-util/librnp/librnp-0.17.0-r3.ebuild
deleted file mode 100644
index 1ffd2d040346..000000000000
--- a/dev-util/librnp/librnp-0.17.0-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multiprocessing
-
-DESCRIPTION="High performance C++ OpenPGP library"
-HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
-SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2"
-SLOT="0/0.16.1"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86"
-IUSE="+botan man test"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/json-c:=
-	=dev-libs/sexpp-0.8.6*[-static-libs(-)]
-	sys-libs/zlib
-	botan? ( dev-libs/botan:2= )
-	!botan? ( >=dev-libs/openssl-1.1.1:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="man? ( dev-ruby/asciidoctor )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P/*lib/}"
-
-PATCHES=( "${FILESDIR}"/librnp-0.17.0-dont-bundle-sexp.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test on off)
-
-		-DCRYPTO_BACKEND=$(usex botan botan openssl)
-
-		-DDOWNLOAD_GTEST=off
-
-		-DENABLE_COVERAGE=off
-		-DENABLE_DOC=$(usex man on off)
-		-DENABLE_FUZZERS=off
-		-DENABLE_SANITIZERS=off
-	)
-
-	if use botan; then
-		local mycmakeargs+=(
-			-DENABLE_AEAD=on
-			-DENABLE_BLOWFISH=on
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_CAST5=on
-			-DENABLE_IDEA=on
-			-DENABLE_RIPEMD160=on
-			-DENABLE_SM2=on
-			-DENABLE_TWOFISH=on
-		)
-
-	# OpenSSL support is still not as complete as botan.
-	# https://github.com/rnpgp/rnp/issues/1877 SM2,
-	# https://github.com/openssl/openssl/issues/2046 TWOFISH (won't be implemented).
-	else
-		local mycmakeargs+=(
-			-DENABLE_AEAD=on
-			-DENABLE_BLOWFISH=on
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_CAST5=on
-			-DENABLE_IDEA=on
-			-DENABLE_RIPEMD160=on
-			-DENABLE_SM2=off
-			-DENABLE_TWOFISH=off
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/src/tests || die
-	ctest -j$(makeopts_jobs) -R .* --output-on-failure || die
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-}
diff --git a/dev-util/librnp/librnp-0.17.1-r1.ebuild b/dev-util/librnp/librnp-0.17.1-r1.ebuild
index d1db4721c531..aa8e956edb43 100644
--- a/dev-util/librnp/librnp-0.17.1-r1.ebuild
+++ b/dev-util/librnp/librnp-0.17.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/*lib/}"
 
 LICENSE="Apache-2.0 BSD BSD-2"
 SLOT="0/0.16.1"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86"
 
 IUSE="+botan man test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/lockrun/Manifest b/dev-util/lockrun/Manifest
index dd5c72f16f77..8e0c8c7ba92a 100644
--- a/dev-util/lockrun/Manifest
+++ b/dev-util/lockrun/Manifest
@@ -1,5 +1,5 @@
 AUX lockrun.c-20120508 7025 BLAKE2B fe577a1e360c0595a2448ed03f7af1a049327e21b6f4caba6d69659e557a527c16f07e80b2591d4dfa1633e1a77a78bb1cd9f231ca4fec3ef261cbadf284c4ca SHA512 f800e96d41d11c9b6f7e28c5bd1f2b59b824ccba5f093574d8f4df8e737f2df47c3f8e89a08eee81b9c3fb46377e62be9c5ddf83df253fd0ab3a25a85a8bee0b
 DIST lockrun-20240415.c.gz 4150 BLAKE2B c70bf08859bf7e2026702b2adc0d3a4224f5a62d25ebeb12359ba34f120300bb7bb1b93a6412696bbf0c0b2f50a958f25beb10a43d45f1dccd148c314fa452eb SHA512 3c7af9bba00018d6ca47c9b737028fb01bd9b7fdd3f29cec89a7c3451eb35fda3bf00f4fe6df8f64b8dcbb2d92f2b7647406bb805dfa3ac78e0ecaf94e95ef05
 EBUILD lockrun-20120508-r2.ebuild 596 BLAKE2B 2c613df88e73ff40785d70f4a921d78d12317cd8b01952bd82300307f7f0ad1f171ffd02b0d8c85460ebb02bb7e9b684147b5ca032b5b975ee7b2cd684e11f3e SHA512 d5d137587cd835ff92a09c1677f671a2f06d524685cc2ee4d5ee9019b6d3ed619e4d9efb64f015d60135d05a04fdd88d4ae6bc289fbe451e2a206aeb85395993
-EBUILD lockrun-20240415.ebuild 941 BLAKE2B 9f9bff49bc8f429865f67c06c11c03d213723846ae3f6428598bb6ce958808a54bce5d427612029824e3b1b5a2f757a457df10c3a3960d777328f76bed3c1117 SHA512 7e40365151d22227d65c29ae699b76b18de0539737cbe56dc20b24bbe84bdbb65655ebb6876ce96c4c42db73831bb4d26067fc4db48e8545f41c199af38eab76
+EBUILD lockrun-20240415.ebuild 939 BLAKE2B de0cb5878b484eec372ae2fc7e4d68f298f626e518c37ca511d391a0ef31d32f2e571f69dc61774c68c03eac3f00c914b1948119e99812a1a9b1a1a714f60970 SHA512 383d48cb578c3c07c9d15fd8d870702a412099095b9387f7db94bc2b2423754a50d124738a8ea19483f1e3c60597fe4544cc62cd7bf33cb425e069bedc1b403d
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-util/lockrun/lockrun-20240415.ebuild b/dev-util/lockrun/lockrun-20240415.ebuild
index 4c6a71c8ec22..4e2741b75176 100644
--- a/dev-util/lockrun/lockrun-20240415.ebuild
+++ b/dev-util/lockrun/lockrun-20240415.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 
 src_prepare() {
 	default
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index d5ad7b93f78c..71cb30ce0aa5 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -605,5 +605,5 @@ DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe1
 DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 DIST zip-1.1.4.crate 77910 BLAKE2B 1c6a0e14becbb43faa9510d303ab254486e97730bc741c1fa3c7a88327da0b1e8815026e319abdbeb9e6c9e0ec713d83dbb3a0ae83a32ed2d197923afa803866 SHA512 18c8e7c9246049c7be4ade2bee501da2ff7cfe45aaab88e20650246833ae3f7b492644c0f4a43aa93a7ef7bf95413c9b27d0f5f8d099f19131a682b92a6d3fc4
 EBUILD maturin-1.6.0.ebuild 12106 BLAKE2B 578baed83535b3f4033a2eaac017de21cb5ae6ba79ac1ba55b43860a7939cd2037b9a65a90869ad360c32e15969a6dc631bb907ab0bfb04d5c1d02ecf0ecb9a4 SHA512 de7b8d50a70ce855547bb47a4b6ec7b8189c38796facd140883fc763d11f91982706b078636236f344d34272bfb2f868c115de03ad9e72a6e1465f8eeeec99c3
-EBUILD maturin-1.7.0.ebuild 11222 BLAKE2B e8778477c3426e044d57d1c46c9631e6ac6a80de86347b2c2c27e646c6a08aae4d7ab31a16d79130afeb9e9badec01904ed1710cc042ec1c9e108296c4331367 SHA512 c123fe7d7bc54dfe2c14e3be45d5e1d5f4a7c932ba5cf0b2a00c79781237a7408b6fb5abf8cf1134160ae4d131e422f3721d91c431937e5ae21d90fda251e1ed
+EBUILD maturin-1.7.0.ebuild 11218 BLAKE2B 4a8ade2181d52bd132d7b29f638acdba65a82d76d50ae1359e881dc7f24cc150833609de44fb842a942f2c8fe57483df1eb6f7f8bf313ac0b26165d8196a83de SHA512 c4a9c8494c0f74953f3d40aacf1dc0a3d773687d38899c67d6feb0291ec3f57be9ca497a365cf105bb06586bb95d3a0eb8c63c93b82d85cdf338b9eaaec41b9e
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.7.0.ebuild b/dev-util/maturin/maturin-1.7.0.ebuild
index 6590e26ef865..6099d2180ca1 100644
--- a/dev-util/maturin/maturin-1.7.0.ebuild
+++ b/dev-util/maturin/maturin-1.7.0.ebuild
@@ -406,7 +406,7 @@ LICENSE+="
 	Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 560f2abe099c..062780b73f50 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,4 +1,5 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
+AUX pahole-1.27-r1-fix-clang-btf-generation-bug.patch 4687 BLAKE2B 2aa919c78e1cf4372bd2e3fd7f6fa2264dc8893d16eacbfeb05d85de45397030ebb404ce52ecf84bb1f32a6c5764f855d4438c11945f3b7be23b763861f09e85 SHA512 ec8205f0a2aa9ca944cee8b370fddf9608dcaabf002a1c7f64042b865c9467485801dee78fc248c000cf803e521def777514f54173d2d44e0dbe9fcdd11fd54b
 DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
 DIST dwarves-1.25.tar.xz 2244876 BLAKE2B 1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e SHA512 104bfb8712d863e04d0c827c008b23ebc49543b17bfb5b44ce276a5b3d39f12cf71f721055ae2e5f430aa77a3c70f85f6eeaf72fd8c1cdf547260488bc5b5070
 DIST dwarves-1.26.tar.sign 228 BLAKE2B 211f73da11d6ed61383fc0470c298360e7acae5fbeb2f963533fd3a984257f35b5626f04de9de92326723f06bea95a38903cee7f602146b12b1333cea2b720d0 SHA512 2f92951019847cddbfe90cd0e49a5746ca4886e25a9f8e26697688bec25d667255556bdc1ab897021eaa739d067a8d3e4fbbd0d7c9f7f56934676616fa11bce8
@@ -10,6 +11,7 @@ EBUILD pahole-1.24_p20221024.ebuild 1692 BLAKE2B 06963686b5161a63841e5184603a6f1
 EBUILD pahole-1.25.ebuild 1699 BLAKE2B cd5422b82887a43fdf49c0f402aeeda058bab76b53d575f736c8c88f27d43643d57bc35595d0a2b5857333bec75085f719be8fb34260a85eb401c4ce7debc242 SHA512 8292e2d7815dc49ad2b821b96f2d04976ef4c092b21532657e6ab5a8675096743b806ef10a989e225dcc6e0255ebac05866a00d5a3df8c83b6bce8a4b82e2379
 EBUILD pahole-1.26-r1.ebuild 2115 BLAKE2B ff141cfe6b5acf9541d0a996e40bd1c35e22b6d06ed7fb2e1eba4c02714b16d603af6a469664700b89919f31ff6f941833b4459ee91c01e7643c218a9fe4befa SHA512 82e8d8e30348a8011b7dd49722f1f915fb969db4e10dd67113e0dbc91fc22434b1691f303bcf422e7aa7aba3f96e3d1d89b1ff7e649ae34282b7a6e310e60493
 EBUILD pahole-1.26.ebuild 1698 BLAKE2B 48d80b80170687ffa9b91966deb9b1b8f7fb8d839799bcd4e2e1d96fa7cb92b842ea6fe2d5a8f9cdb6558e71fc0914857cb50ab615b399609a49ad40dd64fdb9 SHA512 9b1f28ac235b906327c452bd173087ab8102f0ebe3ec5a9f305f19e9114b89d8a99c58acc094512c4342768c576dbfeb00b69ead274411121ad25b5058baeb66
+EBUILD pahole-1.27-r1.ebuild 2179 BLAKE2B be5b357c36bfb3c352e37d603cecd115022f53277c20c17536eb4a526b0e820f4a8ea39b30f42d64a25865becd9f72113e15989148bac1d4e993b65f95857f99 SHA512 a243a7b2e1d10457bc958f9f32d6e0762ea8d6275c015562c79bbed63389121b41d21e74db1ba659c3e67ab3e7bc4d0fedfe15ac06e2f60d9ceca887d68b754c
 EBUILD pahole-1.27.ebuild 2115 BLAKE2B ff141cfe6b5acf9541d0a996e40bd1c35e22b6d06ed7fb2e1eba4c02714b16d603af6a469664700b89919f31ff6f941833b4459ee91c01e7643c218a9fe4befa SHA512 82e8d8e30348a8011b7dd49722f1f915fb969db4e10dd67113e0dbc91fc22434b1691f303bcf422e7aa7aba3f96e3d1d89b1ff7e649ae34282b7a6e310e60493
 EBUILD pahole-9999.ebuild 2115 BLAKE2B ff141cfe6b5acf9541d0a996e40bd1c35e22b6d06ed7fb2e1eba4c02714b16d603af6a469664700b89919f31ff6f941833b4459ee91c01e7643c218a9fe4befa SHA512 82e8d8e30348a8011b7dd49722f1f915fb969db4e10dd67113e0dbc91fc22434b1691f303bcf422e7aa7aba3f96e3d1d89b1ff7e649ae34282b7a6e310e60493
 MISC metadata.xml 671 BLAKE2B 02f5850fd69e3eda9a616d312232cdfbda1b557c56c9f802edd5a79e4e231ebddae57d50fbe44ca595d06b86da9c1f72a1dc516245c3525d73be46accffa0944 SHA512 7877a56f0879df1b6550bd6dc576a69ce5cc5a26e34e18d403cfa0c6cb5a9279c0ff6a11c56a7990de8255a55b67687755be0df62c6ff247b2b35f2e3df30235
diff --git a/dev-util/pahole/files/pahole-1.27-r1-fix-clang-btf-generation-bug.patch b/dev-util/pahole/files/pahole-1.27-r1-fix-clang-btf-generation-bug.patch
new file mode 100644
index 000000000000..ab740729ac6b
--- /dev/null
+++ b/dev-util/pahole/files/pahole-1.27-r1-fix-clang-btf-generation-bug.patch
@@ -0,0 +1,83 @@
+From 6a2b27c0f512619b0e7a769a18a0fb05bb3789a5 Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Tue, 18 Jun 2024 10:37:30 -0300
+Subject: [PATCH] core: Initialize cu->node with INIT_LIST_HEAD()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In cu__new() zalloc() is used defensively, and that helped catch this
+problem where we assume that a cu us in the cus list of cu instances,
+but that is not the case when we use cus__merge_and_process_cu(), for
+instance when loading files created by clang with LTO, as reported by
+Peter Jung and narrowed down by Nathan Chancellor.
+
+If we use INIT_LIST_HEAD() in cu__new() to initialize cu->node, which is
+what we do with other lists and nodes there, then the unconditional
+removal using list_del_init() will be a no-op and removing something not
+on the cus list of cu instances will not cause problems, just keep an
+unconsistent cus->nr_entries field.
+
+So lets just have this fix in first, keeping Nathan's Tested-by and then
+do the a bit more involved fix of either adding that cu to the cus list
+or checking at removal time if it is there.
+
+  Program received signal SIGSEGV, Segmentation fault.
+  0x00007ffff7f1e13e in __list_del (prev=0x0, next=0x0) at /home/acme/git/pahole/list.h:106
+  106		next->prev = prev;
+  (gdb) bt
+  #0  0x00007ffff7f1e13e in __list_del (prev=0x0, next=0x0) at /home/acme/git/pahole/list.h:106
+  #1  0x00007ffff7f1e176 in list_del_init (entry=0x417980) at /home/acme/git/pahole/list.h:165
+  #2  0x00007ffff7f1f8f9 in __cus__remove (cus=0x4142a0, cu=0x417980) at /home/acme/git/pahole/dwarves.c:527
+  #3  0x00007ffff7f1f92b in cus__remove (cus=0x4142a0, cu=0x417980) at /home/acme/git/pahole/dwarves.c:533
+  #4  0x00007ffff7f3d01c in cus__finalize (cus=0x4142a0, cu=0x417980, conf=0x4133c0 <conf_load>, thr_data=0x0)
+      at /home/acme/git/pahole/dwarf_loader.c:3040
+  #5  0x00007ffff7f3e05c in cus__merge_and_process_cu (cus=0x4142a0, conf=0x4133c0 <conf_load>, mod=0x415cf0, dw=0x416110, elf=0x414380,
+      filename=0x7fffffffe3f7 "cast_common.ko", build_id=0x416680 "\265D\371U\213\373u|\037\250\242\032\271\365⒜]y\023", build_id_len=20,
+      type_dcu=0x0) at /home/acme/git/pahole/dwarf_loader.c:3482
+  #6  0x00007ffff7f3e218 in cus__load_module (cus=0x4142a0, conf=0x4133c0 <conf_load>, mod=0x415cf0, dw=0x416110, elf=0x414380,
+      filename=0x7fffffffe3f7 "cast_common.ko") at /home/acme/git/pahole/dwarf_loader.c:3521
+  #7  0x00007ffff7f3e396 in cus__process_dwflmod (dwflmod=0x415cf0, userdata=0x415d00, name=0x415ea0 "cast_common.ko", base=65536,
+      arg=0x7fffffffde40) at /home/acme/git/pahole/dwarf_loader.c:3581
+  #8  0x00007ffff7eb4609 in dwfl_getmodules (dwfl=0x414300, callback=0x7ffff7f3e2ec <cus__process_dwflmod>, arg=0x7fffffffde40, offset=0)
+      at ../libdwfl/dwfl_getmodules.c:86
+  #9  0x00007ffff7f3e4c5 in cus__process_file (cus=0x4142a0, conf=0x4133c0 <conf_load>, fd=3, filename=0x7fffffffe3f7 "cast_common.ko")
+      at /home/acme/git/pahole/dwarf_loader.c:3647
+  #10 0x00007ffff7f3e5cd in dwarf__load_file (cus=0x4142a0, conf=0x4133c0 <conf_load>, filename=0x7fffffffe3f7 "cast_common.ko")
+      at /home/acme/git/pahole/dwarf_loader.c:3684
+  #11 0x00007ffff7f232df in cus__load_file (cus=0x4142a0, conf=0x4133c0 <conf_load>, filename=0x7fffffffe3f7 "cast_common.ko")
+      at /home/acme/git/pahole/dwarves.c:2134
+  #12 0x00007ffff7f23e8b in cus__load_files (cus=0x4142a0, conf=0x4133c0 <conf_load>, filenames=0x7fffffffe0f0)
+      at /home/acme/git/pahole/dwarves.c:2637
+  #13 0x000000000040aec0 in main (argc=2, argv=0x7fffffffe0e8) at /home/acme/git/pahole/pahole.c:3805
+  (gdb) fr 1
+  #1  0x00007ffff7f1e176 in list_del_init (entry=0x417980) at /home/acme/git/pahole/list.h:165
+  165		__list_del(entry->prev, entry->next);
+  (gdb) p entry
+  $1 = (struct list_head *) 0x417980
+  (gdb) p entry->next
+  $2 = (struct list_head *) 0x0
+  (gdb) p entry->prev
+  $3 = (struct list_head *) 0x0
+
+Closes: https://github.com/acmel/dwarves/issues/53
+Closes: https://gitlab.archlinux.org/archlinux/packaging/packages/pahole/-/issues/1
+Tested-by: Nathan Chancellor <nathan@kernel.org>
+Link: https://lore.kernel.org/all/20240617210810.GA1877676@thelio-3990X
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+ dwarves.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dwarves.c b/dwarves.c
+index 1ec259f5..823a0152 100644
+--- a/dwarves.c
++++ b/dwarves.c
+@@ -739,6 +739,7 @@ struct cu *cu__new(const char *name, uint8_t addr_size,
+ 		cu->dfops	= NULL;
+ 		INIT_LIST_HEAD(&cu->tags);
+ 		INIT_LIST_HEAD(&cu->tool_list);
++		INIT_LIST_HEAD(&cu->node);
+ 
+ 		cu->addr_size = addr_size;
+ 		cu->extra_dbg_info = 0;
diff --git a/dev-util/pahole/pahole-1.27-r1.ebuild b/dev-util/pahole/pahole-1.27-r1.ebuild
new file mode 100644
index 000000000000..97e2e021ecf9
--- /dev/null
+++ b/dev-util/pahole/pahole-1.27-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV%%_p*}
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/arnaldocarvalhodemelo.asc
+	inherit verify-sig
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz
+		verify-sig? ( http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.sign )"
+	if [[ ${PV} == *_p* ]] ; then
+		# Patch rollups from git format-patch. Sometimes there are important
+		# fixes in git which haven't been released (and no release in sight).
+		# Patch rollups are a bit better for understanding where changes have
+		# come from for users.
+		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
+	fi
+	S="${WORKDIR}"/${MY_P}
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2" # only
+SLOT="0"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10-python-import.patch"
+	"${FILESDIR}/${PN}-1.27-r1-fix-clang-btf-generation-bug.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 56dce826dceb..a95831402e1f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,16 +1,16 @@
 AUX perf-6.0-c++17.patch 1127 BLAKE2B 923390f761b588a01935e2b36ff25f916f91e752f76fc6e02999ddc51e297a13798b38a9d3523deab327c8fd6ee2ea02e93f454a4b799f61552c11c1cad574aa SHA512 add3956108a83fd58ca949f6f6a611c44a0f29a4b4eef28c4883a1ba6058b66203064837878becbd64d8afebef57beb1cefcfcedb2a95c221f6792dffcaf38cb
 AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2
+AUX perf-6.10-bpf-capstone.patch 11805 BLAKE2B 5e4f2942b6ab4e7c3e149b86dab9515b0a60ab73e003b59bb2623288896f4db3bd80f372110e9ef7f2da49641c925fe60989fb5e21dd5e2e13409fc7e60b3722 SHA512 ac5270276552b934736dd111eefe7019cfe091a14ed7e2fe107527b69652e82415f4142a1199db5e3a1a3e0b48b7ee0166f650bfe0fb25bdc69908b376baf3d3
 AUX perf-6.10-expr.patch 1355 BLAKE2B d4dcb3b8b79944f304fd8789cd680e91e2fb1deffaa0ac108e200130f9ab669bea6a8ad65efc66b730b3282d523f839812cc4de6861b665c86bf2ba400645743 SHA512 0b031a675c49149b0f7623c0e663e4b6c2866ab4fa7e7e29712a55ebbceccef68bdde8ebe1f70a0f3e035e75e6e8e6fb90c06d0c16d39d2866ecbded4ff0c5cc
+AUX perf-6.10.3-bpf-capstone.patch 11856 BLAKE2B 17f3d66a4fd0508f3ac89d4c9d18341dac97cf4b753bde85887a1b9ee79c10a3e1e94d28bb2c77a69dd35c5db21ef7ffe83314c8adca95dcc3ca353829eff139 SHA512 c41dcee2e85676a56178a0cb9998f1a56dab1aba8c49cdac506fd05bf72065a6dc51a46d48fe968a45ab5a872235f6839aab93b3464e6cf25aa66580b92ac652
 AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871ca92b9cf9f57b2e44627fddfcedaf6d7f64ddf74fd103c23aa0db71c4d147f7841743eb5c5a466c9bbb150597ea SHA512 da1b69c190491dd926ba1e98a43965a5ffd543df4134e6a10d187ab544695617fcffede3190bce4cbef13b897d113dee743f67a98ff249a486f8de2d49e62f9f
 AUX perf-6.7-expr.patch 1257 BLAKE2B 1ff41975d84f835a343d2b2f9f049edd817bf80ca576879c7f819608506341b5d19147cf3ecd67a731ab6ecf9a45ce494a8a665aa1bff86cc14f3967a6dd12a0 SHA512 8f1a5a8412464f7623b10da562552b2ac17ca8e70eb4507a3751493662e64066828f2b7a73f1bc7546f463d8d21919f59622b978a6bacafed6a93f232a15ff0b
 DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
-DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
-EBUILD perf-6.10.ebuild 9219 BLAKE2B 08efab0eaaeb0cc12d490dea13d4ae5e5b7e6ffe506bb9614d433ec8c1cfdaef54648bf36bd5026998c2301cd63ba4437c0bdf73ce59abd795a52dcb9aaa7aeb SHA512 dacc8ff9d4f82c5964360d2447de00b68f8be82491c7f421b749b3d9a8a9e870efa61d80a01eaa59e207765bbc6a0c9fedc6e65db4a9d93ddf98a692d2daf073
-EBUILD perf-6.3.ebuild 7858 BLAKE2B c571be537787a682baea6755bfb8df0c1ca1e62be4982ca3bb440aa513189dfe7388705720531d47fe8c18f1c6d04871e96a1804e29296181c194237efaabcea SHA512 3f1aed8b58ce5f3b2b3449e8661d596d31f7991054c86d33b836bed80ba06a042f10681a16be6b67327da1797f144926a30a383c5388c694769e48785e2f5bda
-EBUILD perf-6.7.ebuild 9070 BLAKE2B b20b9e581e7ec7e5587882bb7529e172134fde86d8bde0953c1d02114c45238d3052c76b02b877f650c92dc3b5de622929ec67af756bfced9156bf0d16604139 SHA512 5dfed5bff7320a35a71d2fe84068b19d653f81ba8a1a4b38daeb0d1aaa2e8a402d65a30b659de39cc3c415e4d914bccd2824f48f77e0bdd399acc9fa9b7a60a0
-EBUILD perf-6.8.ebuild 9094 BLAKE2B 6d08a549e098b38ddc79fe12d1458725742570176720cc29156d01a171f5d1810e6704b215df121ad23a54aa7bc3f349f170189fb4fa58229c4ee3d66bc80226 SHA512 007b468f181524514ffd325789a07c4f4e640ff9137abdbe71f411b67b2b7394e154ad2aea0994966bab53877105608b7a08bebd0b454cf2504e068dadae1f04
-EBUILD perf-6.9.ebuild 9218 BLAKE2B 5042f013b883b8aeb0333c9423ff04f4663bb16337350bfff8678b108a7965805b2444f56dafdfd2fbbfa125ca64b92696bb2f1a6561b4428440c257b7c0337c SHA512 e8658f8151150bc9800d7f56bdb0d2c343f0a580144b6bdf009676622b6b04c80787d42f812174957ea47b50eb8cd3ce693775ad9aec9a8c30f7ca6bcefd37df
+DIST patch-6.10.3.xz 252260 BLAKE2B 65acf62ff3e326d5ebb9f47067b626a25295fde2057531cf43e537601c42b0110419c0d6eee8c7c24e5d6d88ecf30e9b76d516efb925c91817504c52780b4df1 SHA512 28ad0de2086ca4b59637f8a7c69c6f5436b53235bf52c9ee18f428748c773780c54606a5c96d71614cadd49c707a8bb11843a7393da078e15d7f554244bfb9ca
+EBUILD perf-6.10.3.ebuild 9475 BLAKE2B d1e1e0eb11bfcb7ed02c00761ad21bdf377fadb0f283fa100c247bb476d0eef592c823796b3a56a3e64fb981482d5a3795d1102b0b22c5700dee3a6a35e10a9a SHA512 835d88cd1fda72f99430cbd78d9162db5b66f511c727b7f34cfdb4fb5be44764b62abe205d148e6b3a74e0464380971e86ad24605b704eab86b5bad75cae5180
+EBUILD perf-6.10.ebuild 9295 BLAKE2B a20ab3cc49bf4d646cf6047c920bd88396d8c028bf367c200382a8de3c8b90fc684a6dead227e020c85a4a32e708c2e6664522499242cd2b21eecc349535f5f3 SHA512 644ea690c8753b8ba03372c7ecfa5c8ee246dfbab04f7839ce9384f31850d9482fcc8434b79455365f26f7c70f814ed722f5a6614d196a2f486cd6fe77ca7a27
+EBUILD perf-6.3.ebuild 7885 BLAKE2B 8064f00011eaf9fbba45781a264d1f3559724e59cd246d9994fda95ecfd0d3cc58dbd42929c4a771cb3933ccd0f6757664b863e8399c3636ca9f032911b2b22f SHA512 ba5453c708de6723d1593c450864ad5b979cbbfc62fc6be117dd5c4513482bee4bae8dd89ffe0138e7436d77a466a1c401981b01ba66d503a95abf4b75a825b8
+EBUILD perf-6.7.ebuild 9095 BLAKE2B f18c9a1bff929d6dc56840ff0561e5a935f8c3e20567c1bc73a755c9fa8c762077fc7dcc5ae829eacda6267fcc89ead28eb8713567a0eef84d810e6b399fdb5a SHA512 b16a36370d306477722d8fe7f15245e6e52fad4072583e7baf360937d0f8591add503faf5cf392871fe2f8406aad3f365e4fbe22939869c155e0e709be8c5830
 MISC metadata.xml 1732 BLAKE2B 03176060a38c63b19df545d60440a68581f637aa5533a8cf31ac1aa0412d30e73ac1fd65bd13e50d731fc2a028dda5fbe3eac92d85fa7acefb3884fb3cf490dd SHA512 2910d91429859d9ac69d275422239341dcbbd24b0010d716ee9de52272b817e72e59af0c7b524404366140e55491d3fe3b3abe14ec6df98ca064e91eab51b923
diff --git a/dev-util/perf/files/perf-6.10-bpf-capstone.patch b/dev-util/perf/files/perf-6.10-bpf-capstone.patch
new file mode 100644
index 000000000000..ebae9a3ad080
--- /dev/null
+++ b/dev-util/perf/files/perf-6.10-bpf-capstone.patch
@@ -0,0 +1,456 @@
+From a7728af2f25fe99ee72d211bb4ddec17a8601f5f Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@gentoo.org>
+Date: Tue, 6 Aug 2024 11:34:05 +0200
+Subject: [PATCH]  Fix bug #936439. Replay of upstream commit onto v6.10.
+
+Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
+---
+ tools/perf/util/Build        |   1 +
+ tools/perf/util/disasm.c     | 187 +--------------------------------
+ tools/perf/util/disasm_bpf.c | 197 +++++++++++++++++++++++++++++++++++
+ tools/perf/util/disasm_bpf.h |  12 +++
+ 4 files changed, 211 insertions(+), 186 deletions(-)
+ create mode 100644 tools/perf/util/disasm_bpf.c
+ create mode 100644 tools/perf/util/disasm_bpf.h
+
+diff --git a/tools/perf/util/Build b/tools/perf/util/Build
+index da64efd8718f..384c4e06b838 100644
+--- a/tools/perf/util/Build
++++ b/tools/perf/util/Build
+@@ -13,6 +13,7 @@ perf-y += copyfile.o
+ perf-y += ctype.o
+ perf-y += db-export.o
+ perf-y += disasm.o
++perf-y += disasm_bpf.o
+ perf-y += env.o
+ perf-y += event.o
+ perf-y += evlist.o
+diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c
+index 72aec8f61b94..766cbd005f32 100644
+--- a/tools/perf/util/disasm.c
++++ b/tools/perf/util/disasm.c
+@@ -15,6 +15,7 @@
+ #include "build-id.h"
+ #include "debug.h"
+ #include "disasm.h"
++#include "disasm_bpf.h"
+ #include "dso.h"
+ #include "env.h"
+ #include "evsel.h"
+@@ -1164,192 +1165,6 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
+ 	return 0;
+ }
+ 
+-#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-#define PACKAGE "perf"
+-#include <bfd.h>
+-#include <dis-asm.h>
+-#include <bpf/bpf.h>
+-#include <bpf/btf.h>
+-#include <bpf/libbpf.h>
+-#include <linux/btf.h>
+-#include <tools/dis-asm-compat.h>
+-
+-#include "bpf-event.h"
+-#include "bpf-utils.h"
+-
+-static int symbol__disassemble_bpf(struct symbol *sym,
+-				   struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct bpf_prog_linfo *prog_linfo = NULL;
+-	struct bpf_prog_info_node *info_node;
+-	int len = sym->end - sym->start;
+-	disassembler_ftype disassemble;
+-	struct map *map = args->ms.map;
+-	struct perf_bpil *info_linear;
+-	struct disassemble_info info;
+-	struct dso *dso = map__dso(map);
+-	int pc = 0, count, sub_id;
+-	struct btf *btf = NULL;
+-	char tpath[PATH_MAX];
+-	size_t buf_size;
+-	int nr_skip = 0;
+-	char *buf;
+-	bfd *bfdf;
+-	int ret;
+-	FILE *s;
+-
+-	if (dso->binary_type != DSO_BINARY_TYPE__BPF_PROG_INFO)
+-		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
+-
+-	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
+-		  sym->name, sym->start, sym->end - sym->start);
+-
+-	memset(tpath, 0, sizeof(tpath));
+-	perf_exe(tpath, sizeof(tpath));
+-
+-	bfdf = bfd_openr(tpath, NULL);
+-	if (bfdf == NULL)
+-		abort();
+-
+-	if (!bfd_check_format(bfdf, bfd_object))
+-		abort();
+-
+-	s = open_memstream(&buf, &buf_size);
+-	if (!s) {
+-		ret = errno;
+-		goto out;
+-	}
+-	init_disassemble_info_compat(&info, s,
+-				     (fprintf_ftype) fprintf,
+-				     fprintf_styled);
+-	info.arch = bfd_get_arch(bfdf);
+-	info.mach = bfd_get_mach(bfdf);
+-
+-	info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
+-						 dso->bpf_prog.id);
+-	if (!info_node) {
+-		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
+-		goto out;
+-	}
+-	info_linear = info_node->info_linear;
+-	sub_id = dso->bpf_prog.sub_id;
+-
+-	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
+-	info.buffer_length = info_linear->info.jited_prog_len;
+-
+-	if (info_linear->info.nr_line_info)
+-		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
+-
+-	if (info_linear->info.btf_id) {
+-		struct btf_node *node;
+-
+-		node = perf_env__find_btf(dso->bpf_prog.env,
+-					  info_linear->info.btf_id);
+-		if (node)
+-			btf = btf__new((__u8 *)(node->data),
+-				       node->data_size);
+-	}
+-
+-	disassemble_init_for_target(&info);
+-
+-#ifdef DISASM_FOUR_ARGS_SIGNATURE
+-	disassemble = disassembler(info.arch,
+-				   bfd_big_endian(bfdf),
+-				   info.mach,
+-				   bfdf);
+-#else
+-	disassemble = disassembler(bfdf);
+-#endif
+-	if (disassemble == NULL)
+-		abort();
+-
+-	fflush(s);
+-	do {
+-		const struct bpf_line_info *linfo = NULL;
+-		struct disasm_line *dl;
+-		size_t prev_buf_size;
+-		const char *srcline;
+-		u64 addr;
+-
+-		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
+-		count = disassemble(pc, &info);
+-
+-		if (prog_linfo)
+-			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
+-								addr, sub_id,
+-								nr_skip);
+-
+-		if (linfo && btf) {
+-			srcline = btf__name_by_offset(btf, linfo->line_off);
+-			nr_skip++;
+-		} else
+-			srcline = NULL;
+-
+-		fprintf(s, "\n");
+-		prev_buf_size = buf_size;
+-		fflush(s);
+-
+-		if (!annotate_opts.hide_src_code && srcline) {
+-			args->offset = -1;
+-			args->line = strdup(srcline);
+-			args->line_nr = 0;
+-			args->fileloc = NULL;
+-			args->ms.sym  = sym;
+-			dl = disasm_line__new(args);
+-			if (dl) {
+-				annotation_line__add(&dl->al,
+-						     &notes->src->source);
+-			}
+-		}
+-
+-		args->offset = pc;
+-		args->line = buf + prev_buf_size;
+-		args->line_nr = 0;
+-		args->fileloc = NULL;
+-		args->ms.sym  = sym;
+-		dl = disasm_line__new(args);
+-		if (dl)
+-			annotation_line__add(&dl->al, &notes->src->source);
+-
+-		pc += count;
+-	} while (count > 0 && pc < len);
+-
+-	ret = 0;
+-out:
+-	free(prog_linfo);
+-	btf__free(btf);
+-	fclose(s);
+-	bfd_close(bfdf);
+-	return ret;
+-}
+-#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-static int symbol__disassemble_bpf(struct symbol *sym __maybe_unused,
+-				   struct annotate_args *args __maybe_unused)
+-{
+-	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
+-}
+-#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-
+-static int
+-symbol__disassemble_bpf_image(struct symbol *sym,
+-			      struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct disasm_line *dl;
+-
+-	args->offset = -1;
+-	args->line = strdup("to be implemented");
+-	args->line_nr = 0;
+-	args->fileloc = NULL;
+-	dl = disasm_line__new(args);
+-	if (dl)
+-		annotation_line__add(&dl->al, &notes->src->source);
+-
+-	zfree(&args->line);
+-	return 0;
+-}
+-
+ #ifdef HAVE_LIBCAPSTONE_SUPPORT
+ #include <capstone/capstone.h>
+ 
+diff --git a/tools/perf/util/disasm_bpf.c b/tools/perf/util/disasm_bpf.c
+new file mode 100644
+index 000000000000..010b961c4ae9
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.c
+@@ -0,0 +1,197 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#include "util/annotate.h"
++#include "util/disasm_bpf.h"
++#include "util/symbol.h"
++#include <linux/zalloc.h>
++#include <string.h>
++
++#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++#define PACKAGE "perf"
++#include <bfd.h>
++#include <bpf/bpf.h>
++#include <bpf/btf.h>
++#include <bpf/libbpf.h>
++#include <dis-asm.h>
++#include <errno.h>
++#include <linux/btf.h>
++#include <tools/dis-asm-compat.h>
++
++#include "util/bpf-event.h"
++#include "util/bpf-utils.h"
++#include "util/debug.h"
++#include "util/dso.h"
++#include "util/map.h"
++#include "util/env.h"
++#include "util/util.h"
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct bpf_prog_linfo *prog_linfo = NULL;
++	struct bpf_prog_info_node *info_node;
++	int len = sym->end - sym->start;
++	disassembler_ftype disassemble;
++	struct map *map = args->ms.map;
++	struct perf_bpil *info_linear;
++	struct disassemble_info info;
++	struct dso *dso = map__dso(map);
++	int pc = 0, count, sub_id;
++	struct btf *btf = NULL;
++	char tpath[PATH_MAX];
++	size_t buf_size;
++	int nr_skip = 0;
++	char *buf;
++	bfd *bfdf;
++	int ret;
++	FILE *s;
++
++	if (dso->binary_type != DSO_BINARY_TYPE__BPF_PROG_INFO)
++		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
++
++	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
++		  sym->name, sym->start, sym->end - sym->start);
++
++	memset(tpath, 0, sizeof(tpath));
++	perf_exe(tpath, sizeof(tpath));
++
++	bfdf = bfd_openr(tpath, NULL);
++	if (bfdf == NULL)
++		abort();
++
++	if (!bfd_check_format(bfdf, bfd_object))
++		abort();
++
++	s = open_memstream(&buf, &buf_size);
++	if (!s) {
++		ret = errno;
++		goto out;
++	}
++	init_disassemble_info_compat(&info, s,
++				     (fprintf_ftype) fprintf,
++				     fprintf_styled);
++	info.arch = bfd_get_arch(bfdf);
++	info.mach = bfd_get_mach(bfdf);
++
++	info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env,
++						 dso->bpf_prog.id);
++	if (!info_node) {
++		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
++		goto out;
++	}
++	info_linear = info_node->info_linear;
++	sub_id = dso->bpf_prog.sub_id;
++
++	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
++	info.buffer_length = info_linear->info.jited_prog_len;
++
++	if (info_linear->info.nr_line_info)
++		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
++
++	if (info_linear->info.btf_id) {
++		struct btf_node *node;
++
++		node = perf_env__find_btf(dso->bpf_prog.env,
++					  info_linear->info.btf_id);
++		if (node)
++			btf = btf__new((__u8 *)(node->data),
++				       node->data_size);
++	}
++
++	disassemble_init_for_target(&info);
++
++#ifdef DISASM_FOUR_ARGS_SIGNATURE
++	disassemble = disassembler(info.arch,
++				   bfd_big_endian(bfdf),
++				   info.mach,
++				   bfdf);
++#else
++	disassemble = disassembler(bfdf);
++#endif
++	if (disassemble == NULL)
++		abort();
++
++	fflush(s);
++	do {
++		const struct bpf_line_info *linfo = NULL;
++		struct disasm_line *dl;
++		size_t prev_buf_size;
++		const char *srcline;
++		u64 addr;
++
++		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
++		count = disassemble(pc, &info);
++
++		if (prog_linfo)
++			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
++								addr, sub_id,
++								nr_skip);
++
++		if (linfo && btf) {
++			srcline = btf__name_by_offset(btf, linfo->line_off);
++			nr_skip++;
++		} else
++			srcline = NULL;
++
++		fprintf(s, "\n");
++		prev_buf_size = buf_size;
++		fflush(s);
++
++		if (!annotate_opts.hide_src_code && srcline) {
++			args->offset = -1;
++			args->line = strdup(srcline);
++			args->line_nr = 0;
++			args->fileloc = NULL;
++			args->ms.sym  = sym;
++			dl = disasm_line__new(args);
++			if (dl) {
++				annotation_line__add(&dl->al,
++						     &notes->src->source);
++			}
++		}
++
++		args->offset = pc;
++		args->line = buf + prev_buf_size;
++		args->line_nr = 0;
++		args->fileloc = NULL;
++		args->ms.sym  = sym;
++		dl = disasm_line__new(args);
++		if (dl)
++			annotation_line__add(&dl->al, &notes->src->source);
++
++		pc += count;
++	} while (count > 0 && pc < len);
++
++	ret = 0;
++out:
++	free(prog_linfo);
++	btf__free(btf);
++	fclose(s);
++	bfd_close(bfdf);
++	return ret;
++}
++#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++int symbol__disassemble_bpf(struct symbol *sym __maybe_unused,
++				   struct annotate_args *args __maybe_unused)
++{
++	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
++}
++#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++
++int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct disasm_line *dl;
++
++	args->offset = -1;
++	args->line = strdup("to be implemented");
++	args->line_nr = 0;
++	args->fileloc = NULL;
++	dl = disasm_line__new(args);
++	if (dl)
++		annotation_line__add(&dl->al, &notes->src->source);
++
++	zfree(&args->line);
++	return 0;
++}
++
+diff --git a/tools/perf/util/disasm_bpf.h b/tools/perf/util/disasm_bpf.h
+new file mode 100644
+index 000000000000..2ecb19545388
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.h
+@@ -0,0 +1,12 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#ifndef __PERF_DISASM_BPF_H
++#define __PERF_DISASM_BPF_H
++
++struct symbol;
++struct annotate_args;
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args);
++int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args);
++
++#endif /* __PERF_DISASM_BPF_H */
+-- 
+2.45.2
+
diff --git a/dev-util/perf/files/perf-6.10.3-bpf-capstone.patch b/dev-util/perf/files/perf-6.10.3-bpf-capstone.patch
new file mode 100644
index 000000000000..57b298d8ccd7
--- /dev/null
+++ b/dev-util/perf/files/perf-6.10.3-bpf-capstone.patch
@@ -0,0 +1,455 @@
+From b382a433e0178d3840a8fb4b05ba3dbecba075fa Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@gentoo.org>
+Date: Tue, 6 Aug 2024 11:34:05 +0200
+Subject: [PATCH]  Fix bug #936439. Replay of upstream commit onto v6.10.3.
+
+Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
+---
+ tools/perf/util/Build        |   1 +
+ tools/perf/util/disasm.c     | 187 +--------------------------------
+ tools/perf/util/disasm_bpf.c | 196 +++++++++++++++++++++++++++++++++++
+ tools/perf/util/disasm_bpf.h |  12 +++
+ 4 files changed, 210 insertions(+), 186 deletions(-)
+ create mode 100644 tools/perf/util/disasm_bpf.c
+ create mode 100644 tools/perf/util/disasm_bpf.h
+
+diff --git a/tools/perf/util/Build b/tools/perf/util/Build
+index da64efd8718f..384c4e06b838 100644
+--- a/tools/perf/util/Build
++++ b/tools/perf/util/Build
+@@ -13,6 +13,7 @@ perf-y += copyfile.o
+ perf-y += ctype.o
+ perf-y += db-export.o
+ perf-y += disasm.o
++perf-y += disasm_bpf.o
+ perf-y += env.o
+ perf-y += event.o
+ perf-y += evlist.o
+diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c
+index e10558b79504..766cbd005f32 100644
+--- a/tools/perf/util/disasm.c
++++ b/tools/perf/util/disasm.c
+@@ -15,6 +15,7 @@
+ #include "build-id.h"
+ #include "debug.h"
+ #include "disasm.h"
++#include "disasm_bpf.h"
+ #include "dso.h"
+ #include "env.h"
+ #include "evsel.h"
+@@ -1164,192 +1165,6 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
+ 	return 0;
+ }
+ 
+-#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-#define PACKAGE "perf"
+-#include <bfd.h>
+-#include <dis-asm.h>
+-#include <bpf/bpf.h>
+-#include <bpf/btf.h>
+-#include <bpf/libbpf.h>
+-#include <linux/btf.h>
+-#include <tools/dis-asm-compat.h>
+-
+-#include "bpf-event.h"
+-#include "bpf-utils.h"
+-
+-static int symbol__disassemble_bpf(struct symbol *sym,
+-				   struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct bpf_prog_linfo *prog_linfo = NULL;
+-	struct bpf_prog_info_node *info_node;
+-	int len = sym->end - sym->start;
+-	disassembler_ftype disassemble;
+-	struct map *map = args->ms.map;
+-	struct perf_bpil *info_linear;
+-	struct disassemble_info info;
+-	struct dso *dso = map__dso(map);
+-	int pc = 0, count, sub_id;
+-	struct btf *btf = NULL;
+-	char tpath[PATH_MAX];
+-	size_t buf_size;
+-	int nr_skip = 0;
+-	char *buf;
+-	bfd *bfdf;
+-	int ret;
+-	FILE *s;
+-
+-	if (dso__binary_type(dso) != DSO_BINARY_TYPE__BPF_PROG_INFO)
+-		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
+-
+-	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
+-		  sym->name, sym->start, sym->end - sym->start);
+-
+-	memset(tpath, 0, sizeof(tpath));
+-	perf_exe(tpath, sizeof(tpath));
+-
+-	bfdf = bfd_openr(tpath, NULL);
+-	if (bfdf == NULL)
+-		abort();
+-
+-	if (!bfd_check_format(bfdf, bfd_object))
+-		abort();
+-
+-	s = open_memstream(&buf, &buf_size);
+-	if (!s) {
+-		ret = errno;
+-		goto out;
+-	}
+-	init_disassemble_info_compat(&info, s,
+-				     (fprintf_ftype) fprintf,
+-				     fprintf_styled);
+-	info.arch = bfd_get_arch(bfdf);
+-	info.mach = bfd_get_mach(bfdf);
+-
+-	info_node = perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env,
+-						 dso__bpf_prog(dso)->id);
+-	if (!info_node) {
+-		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
+-		goto out;
+-	}
+-	info_linear = info_node->info_linear;
+-	sub_id = dso__bpf_prog(dso)->sub_id;
+-
+-	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
+-	info.buffer_length = info_linear->info.jited_prog_len;
+-
+-	if (info_linear->info.nr_line_info)
+-		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
+-
+-	if (info_linear->info.btf_id) {
+-		struct btf_node *node;
+-
+-		node = perf_env__find_btf(dso__bpf_prog(dso)->env,
+-					  info_linear->info.btf_id);
+-		if (node)
+-			btf = btf__new((__u8 *)(node->data),
+-				       node->data_size);
+-	}
+-
+-	disassemble_init_for_target(&info);
+-
+-#ifdef DISASM_FOUR_ARGS_SIGNATURE
+-	disassemble = disassembler(info.arch,
+-				   bfd_big_endian(bfdf),
+-				   info.mach,
+-				   bfdf);
+-#else
+-	disassemble = disassembler(bfdf);
+-#endif
+-	if (disassemble == NULL)
+-		abort();
+-
+-	fflush(s);
+-	do {
+-		const struct bpf_line_info *linfo = NULL;
+-		struct disasm_line *dl;
+-		size_t prev_buf_size;
+-		const char *srcline;
+-		u64 addr;
+-
+-		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
+-		count = disassemble(pc, &info);
+-
+-		if (prog_linfo)
+-			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
+-								addr, sub_id,
+-								nr_skip);
+-
+-		if (linfo && btf) {
+-			srcline = btf__name_by_offset(btf, linfo->line_off);
+-			nr_skip++;
+-		} else
+-			srcline = NULL;
+-
+-		fprintf(s, "\n");
+-		prev_buf_size = buf_size;
+-		fflush(s);
+-
+-		if (!annotate_opts.hide_src_code && srcline) {
+-			args->offset = -1;
+-			args->line = strdup(srcline);
+-			args->line_nr = 0;
+-			args->fileloc = NULL;
+-			args->ms.sym  = sym;
+-			dl = disasm_line__new(args);
+-			if (dl) {
+-				annotation_line__add(&dl->al,
+-						     &notes->src->source);
+-			}
+-		}
+-
+-		args->offset = pc;
+-		args->line = buf + prev_buf_size;
+-		args->line_nr = 0;
+-		args->fileloc = NULL;
+-		args->ms.sym  = sym;
+-		dl = disasm_line__new(args);
+-		if (dl)
+-			annotation_line__add(&dl->al, &notes->src->source);
+-
+-		pc += count;
+-	} while (count > 0 && pc < len);
+-
+-	ret = 0;
+-out:
+-	free(prog_linfo);
+-	btf__free(btf);
+-	fclose(s);
+-	bfd_close(bfdf);
+-	return ret;
+-}
+-#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-static int symbol__disassemble_bpf(struct symbol *sym __maybe_unused,
+-				   struct annotate_args *args __maybe_unused)
+-{
+-	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
+-}
+-#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-
+-static int
+-symbol__disassemble_bpf_image(struct symbol *sym,
+-			      struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct disasm_line *dl;
+-
+-	args->offset = -1;
+-	args->line = strdup("to be implemented");
+-	args->line_nr = 0;
+-	args->fileloc = NULL;
+-	dl = disasm_line__new(args);
+-	if (dl)
+-		annotation_line__add(&dl->al, &notes->src->source);
+-
+-	zfree(&args->line);
+-	return 0;
+-}
+-
+ #ifdef HAVE_LIBCAPSTONE_SUPPORT
+ #include <capstone/capstone.h>
+ 
+diff --git a/tools/perf/util/disasm_bpf.c b/tools/perf/util/disasm_bpf.c
+new file mode 100644
+index 000000000000..c76a7d2be1a7
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.c
+@@ -0,0 +1,196 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#include "util/annotate.h"
++#include "util/disasm_bpf.h"
++#include "util/symbol.h"
++#include <linux/zalloc.h>
++#include <string.h>
++
++#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++#define PACKAGE "perf"
++#include <bfd.h>
++#include <bpf/bpf.h>
++#include <bpf/btf.h>
++#include <bpf/libbpf.h>
++#include <dis-asm.h>
++#include <errno.h>
++#include <linux/btf.h>
++#include <tools/dis-asm-compat.h>
++
++#include "util/bpf-event.h"
++#include "util/bpf-utils.h"
++#include "util/debug.h"
++#include "util/dso.h"
++#include "util/map.h"
++#include "util/env.h"
++#include "util/util.h"
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct bpf_prog_linfo *prog_linfo = NULL;
++	struct bpf_prog_info_node *info_node;
++	int len = sym->end - sym->start;
++	disassembler_ftype disassemble;
++	struct map *map = args->ms.map;
++	struct perf_bpil *info_linear;
++	struct disassemble_info info;
++	struct dso *dso = map__dso(map);
++	int pc = 0, count, sub_id;
++	struct btf *btf = NULL;
++	char tpath[PATH_MAX];
++	size_t buf_size;
++	int nr_skip = 0;
++	char *buf;
++	bfd *bfdf;
++	int ret;
++	FILE *s;
++
++	if (dso__binary_type(dso) != DSO_BINARY_TYPE__BPF_PROG_INFO)
++		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
++
++	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
++		  sym->name, sym->start, sym->end - sym->start);
++
++	memset(tpath, 0, sizeof(tpath));
++	perf_exe(tpath, sizeof(tpath));
++
++	bfdf = bfd_openr(tpath, NULL);
++	if (bfdf == NULL)
++		abort();
++
++	if (!bfd_check_format(bfdf, bfd_object))
++		abort();
++
++	s = open_memstream(&buf, &buf_size);
++	if (!s) {
++		ret = errno;
++		goto out;
++	}
++	init_disassemble_info_compat(&info, s,
++				     (fprintf_ftype) fprintf,
++				     fprintf_styled);
++	info.arch = bfd_get_arch(bfdf);
++	info.mach = bfd_get_mach(bfdf);
++
++	info_node = perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env,
++						 dso__bpf_prog(dso)->id);
++	if (!info_node) {
++		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
++		goto out;
++	}
++	info_linear = info_node->info_linear;
++	sub_id = dso__bpf_prog(dso)->sub_id;
++
++	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
++	info.buffer_length = info_linear->info.jited_prog_len;
++
++	if (info_linear->info.nr_line_info)
++		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
++
++	if (info_linear->info.btf_id) {
++		struct btf_node *node;
++
++		node = perf_env__find_btf(dso__bpf_prog(dso)->env,
++					  info_linear->info.btf_id);
++		if (node)
++			btf = btf__new((__u8 *)(node->data),
++				       node->data_size);
++	}
++
++	disassemble_init_for_target(&info);
++
++#ifdef DISASM_FOUR_ARGS_SIGNATURE
++	disassemble = disassembler(info.arch,
++				   bfd_big_endian(bfdf),
++				   info.mach,
++				   bfdf);
++#else
++	disassemble = disassembler(bfdf);
++#endif
++	if (disassemble == NULL)
++		abort();
++
++	fflush(s);
++	do {
++		const struct bpf_line_info *linfo = NULL;
++		struct disasm_line *dl;
++		size_t prev_buf_size;
++		const char *srcline;
++		u64 addr;
++
++		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
++		count = disassemble(pc, &info);
++
++		if (prog_linfo)
++			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
++								addr, sub_id,
++								nr_skip);
++
++		if (linfo && btf) {
++			srcline = btf__name_by_offset(btf, linfo->line_off);
++			nr_skip++;
++		} else
++			srcline = NULL;
++
++		fprintf(s, "\n");
++		prev_buf_size = buf_size;
++		fflush(s);
++
++		if (!annotate_opts.hide_src_code && srcline) {
++			args->offset = -1;
++			args->line = strdup(srcline);
++			args->line_nr = 0;
++			args->fileloc = NULL;
++			args->ms.sym  = sym;
++			dl = disasm_line__new(args);
++			if (dl) {
++				annotation_line__add(&dl->al,
++						     &notes->src->source);
++			}
++		}
++
++		args->offset = pc;
++		args->line = buf + prev_buf_size;
++		args->line_nr = 0;
++		args->fileloc = NULL;
++		args->ms.sym  = sym;
++		dl = disasm_line__new(args);
++		if (dl)
++			annotation_line__add(&dl->al, &notes->src->source);
++
++		pc += count;
++	} while (count > 0 && pc < len);
++
++	ret = 0;
++out:
++	free(prog_linfo);
++	btf__free(btf);
++	fclose(s);
++	bfd_close(bfdf);
++	return ret;
++}
++#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, struct annotate_args *args __maybe_unused)
++{
++	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
++}
++#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++
++int
++symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct disasm_line *dl;
++
++	args->offset = -1;
++	args->line = strdup("to be implemented");
++	args->line_nr = 0;
++	args->fileloc = NULL;
++	dl = disasm_line__new(args);
++	if (dl)
++		annotation_line__add(&dl->al, &notes->src->source);
++
++	zfree(&args->line);
++	return 0;
++}
+diff --git a/tools/perf/util/disasm_bpf.h b/tools/perf/util/disasm_bpf.h
+new file mode 100644
+index 000000000000..2ecb19545388
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.h
+@@ -0,0 +1,12 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#ifndef __PERF_DISASM_BPF_H
++#define __PERF_DISASM_BPF_H
++
++struct symbol;
++struct annotate_args;
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args);
++int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args);
++
++#endif /* __PERF_DISASM_BPF_H */
+-- 
+2.45.2
+
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.10.3.ebuild
index b371ff4a861a..4c50de412173 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
@@ -139,8 +139,10 @@ pkg_setup() {
 # it's building from the same tarball, please keep it in sync with bpftool
 src_unpack() {
 	local paths=(
-		kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
-		scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
+		'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
+		'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
+		'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
+		'tools/scripts/*'
 	)
 
 	# We expect the tar implementation to support the -j option (both
@@ -152,8 +154,9 @@ src_unpack() {
 	if [[ -n ${LINUX_PATCH} ]] ; then
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
+		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+		test -s ${P}.patch
+		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
 		eshopts_pop
 	fi
@@ -176,7 +179,8 @@ src_prepare() {
 
 	pushd "${S_K}" >/dev/null || die
 	eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
-	eapply "${FILESDIR}"/perf-6.7-expr.patch
+	eapply "${FILESDIR}"/perf-6.10-expr.patch
+	eapply "${FILESDIR}"/perf-6.10.3-bpf-capstone.patch
 	popd || die
 
 	# Drop some upstream too-developer-oriented flags and fix the
@@ -247,6 +251,7 @@ perf_make() {
 		V=1 VF=1
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+		CLANG="${CHOST}-clang"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		prefix="${EPREFIX}/usr" bindir_relative="bin"
 		tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.10.ebuild b/dev-util/perf/perf-6.10.ebuild
index 3a49940473e4..c26fcdac95df 100644
--- a/dev-util/perf/perf-6.10.ebuild
+++ b/dev-util/perf/perf-6.10.ebuild
@@ -176,6 +176,7 @@ src_prepare() {
 
 	pushd "${S_K}" >/dev/null || die
 	eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
+	eapply "${FILESDIR}"/perf-6.10-bpf-capstone.patch
 	eapply "${FILESDIR}"/perf-6.10-expr.patch
 	popd || die
 
@@ -247,6 +248,7 @@ perf_make() {
 		V=1 VF=1
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+		CLANG="${CHOST}-clang"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		prefix="${EPREFIX}/usr" bindir_relative="bin"
 		tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 80e9fe676047..63546a59a6ca 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -196,6 +196,7 @@ perf_make() {
 	emake V=1 VF=1 \
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+		CLANG="${CHOST}-clang" \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
 		tipdir="share/doc/${PF}" \
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index 5d0dd06b320d..f07ddebfbf7d 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -247,6 +247,7 @@ perf_make() {
 		V=1 VF=1
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+		CLANG="${CHOST}-clang"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		prefix="${EPREFIX}/usr" bindir_relative="bin"
 		tipdir="share/doc/${PF}"
diff --git a/dev-util/perf/perf-6.8.ebuild b/dev-util/perf/perf-6.8.ebuild
deleted file mode 100644
index 71d7382d4545..000000000000
--- a/dev-util/perf/perf-6.8.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
-	PATCH_VERSION=$(ver_cut 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
-	# stable-release series
-	LINUX_VER=$(ver_cut 1-2)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-# setuptools (and Python) are always needed even if not building Python bindings
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.34-r2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)
-"
-
-RDEPEND="
-	audit? ( sys-process/audit )
-	babeltrace? ( dev-util/babeltrace:0/1 )
-	bpf? (
-		dev-libs/libbpf
-		dev-util/bpftool
-		dev-util/pahole
-	)
-	caps? ( sys-libs/libcap )
-	bpf? (
-		sys-devel/clang:=
-		sys-devel/llvm:=
-	)
-	crypt? ( dev-libs/openssl:= )
-	gtk? ( x11-libs/gtk+:2 )
-	java? ( virtual/jre:* )
-	libpfm? ( dev-libs/libpfm:= )
-	libtraceevent? ( dev-libs/libtraceevent )
-	libtracefs? ( dev-libs/libtracefs )
-	lzma? ( app-arch/xz-utils )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( sys-libs/slang )
-	systemtap? ( dev-debug/systemtap )
-	tcmalloc? ( dev-util/google-perftools )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	dev-libs/elfutils
-	sys-libs/binutils-libs:=
-	sys-libs/zlib
-	virtual/libcrypt
-"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	java? ( virtual/jdk )
-"
-
-QA_FLAGS_IGNORED=(
-	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
-	'usr/libexec/perf-core/dlfilters/.*' # plugins
-)
-
-pkg_pretend() {
-	if ! use doc ; then
-		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
-		ewarn "And without man pages, you won't get any --help output for perf and its"
-		ewarn "sub-tools."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~DEBUG_INFO
-		~FTRACE
-		~FTRACE_SYSCALLS
-		~FUNCTION_TRACER
-		~KALLSYMS
-		~KALLSYMS_ALL
-		~KPROBES
-		~KPROBE_EVENTS
-		~PERF_EVENTS
-		~UPROBES
-		~UPROBE_EVENTS
-	"
-
-	use bpf && llvm_pkg_setup
-	# We enable python unconditionally as libbpf always generates
-	# API headers using python script
-	python_setup
-
-	if use bpf ; then
-		CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
-	fi
-
-	linux-info_pkg_setup
-}
-
-# src_unpack and src_prepare are copied to dev-util/bpftool since
-# it's building from the same tarball, please keep it in sync with bpftool
-src_unpack() {
-	local paths=(
-		kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
-		scripts include lib "arch/*/lib" "arch/*/tools"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	eapply "${FILESDIR}"/perf-6.4-libtracefs.patch
-	eapply "${FILESDIR}"/perf-6.7-expr.patch
-	popd || die
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's@-Werror@@' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \
-		"${S_K}"/tools/lib/perf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
-	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" 1; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-
-	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
-	local arch=$(tc-arch-kernel)
-	local java_dir
-	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	# sync this with the whitelist in tools/perf/Makefile.config
-	local disable_libdw
-	if ! use amd64 && ! use x86 && \
-	   ! use arm && \
-	   ! use arm64 && \
-	   ! use ppc && ! use ppc64 \
-	   ! use s390 && \
-	   ! use riscv && \
-	   ! use loong
-	then
-		disable_libdw=1
-	fi
-
-	# perf directly invokes LD for linking without going through CC, on mips
-	# it is required to specify the emulation.  port of below buildroot patch
-	# https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
-	local linker="$(tc-getLD)"
-	if use mips
-	then
-		if use big-endian
-		then
-			use abi_mips_n64 && linker+=" -m elf64btsmip"
-			use abi_mips_n32 && linker+=" -m elf32btsmipn32"
-			use abi_mips_o32 && linker+=" -m elf32btsmip"
-		else
-			use abi_mips_n64 && linker+=" -m elf64ltsmip"
-			use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
-			use abi_mips_o32 && linker+=" -m elf32ltsmip"
-		fi
-	fi
-
-	# FIXME: NO_CORESIGHT
-	local emakeargs=(
-		V=1 VF=1
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		prefix="${EPREFIX}/usr" bindir_relative="bin"
-		tipdir="share/doc/${PF}"
-		EXTRA_CFLAGS="${CFLAGS}"
-		EXTRA_LDFLAGS="${LDFLAGS}"
-		ARCH="${arch}"
-		BUILD_BPF_SKEL=$(usex bpf 1 "") \
-		BUILD_NONDISTRO=1
-		JDIR="${java_dir}"
-		CORESIGHT=
-		GTK2=$(usex gtk 1 "")
-		feature-gtk2-infobar=$(usex gtk 1 "")
-		NO_AUXTRACE=
-		NO_BACKTRACE=
-		NO_DEMANGLE=
-		NO_JEVENTS=$(puse python)
-		NO_JVMTI=$(puse java)
-		NO_LIBAUDIT=$(puse audit)
-		NO_LIBBABELTRACE=$(puse babeltrace)
-		NO_LIBBIONIC=1
-		NO_LIBBPF=$(puse bpf)
-		NO_LIBCAP=$(puse caps)
-		NO_LIBCRYPTO=$(puse crypt)
-		NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
-		NO_LIBELF=
-		NO_LIBNUMA=$(puse numa)
-		NO_LIBPERL=$(puse perl)
-		NO_LIBPFM4=$(puse libpfm)
-		NO_LIBPYTHON=$(puse python)
-		NO_LIBTRACEEVENT=$(puse libtraceevent)
-		NO_LIBUNWIND=$(puse unwind)
-		NO_LIBZSTD=$(puse zstd)
-		NO_SDT=$(puse systemtap)
-		NO_SLANG=$(puse slang)
-		NO_LZMA=$(puse lzma)
-		NO_ZLIB=
-		TCMALLOC=$(usex tcmalloc 1 "")
-		WERROR=0
-		LIBDIR="/usr/libexec/perf-core"
-		libdir="${EPREFIX}/usr/$(get_libdir)"
-		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
-		"$@"
-	)
-	emake "${emakeargs[@]}"
-}
-
-src_compile() {
-	filter-lto
-
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation man
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	_install_python_ext() {
-		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
-	}
-
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	if use python; then
-		python_foreach_impl _install_python_ext
-	fi
-
-	if use gtk; then
-		local libdir
-		libdir="$(get_libdir)"
-		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
-		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
-		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
-			"${ED}"/usr/libexec/perf-core || die
-	fi
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-
-	# perf needs this decompressed to print out tips for users
-	docompress -x /usr/share/doc/${PF}/tips.txt
-
-	if use doc ; then
-		doman Documentation/*.1
-	fi
-}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 116b310b30c7..df009fb24b3d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -2,6 +2,11 @@ AUX radare2-5.8.2-vector35.patch 882 BLAKE2B 6453cdeec6e5656ff86af84f0876fd75438
 DIST radare2-5.9.0-vector35-arm64.tar.gz 1050988 BLAKE2B 889c5a98b6efb45026349ca25b73d39e8a8049fce052d49b5e37d974bff038de85f99f1d7651db6c621b036be2948e29a62e6b8261cab6a9bdfd72442858d7e9 SHA512 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
 DIST radare2-5.9.0-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
 DIST radare2-5.9.0.tar.gz 11425359 BLAKE2B 4e345eb93f50dd57f65d659e82918a3e83c29f86d758d6b98efbfea8a3ecebf2648d32dac53cc43c2a36b8a71aa969b6e1eaab87dd9bf667570110eb6ed056b1 SHA512 f184ad6e066a5113091912c11cca87cb9450eff20e920a00dc9da0efa9de97d6bfdaf44ae4d9e08a4760f4ebca82732832a309fad8452930adb4ee2438d9668e
+DIST radare2-5.9.2-vector35-arm64.tar.gz 1050988 BLAKE2B 889c5a98b6efb45026349ca25b73d39e8a8049fce052d49b5e37d974bff038de85f99f1d7651db6c621b036be2948e29a62e6b8261cab6a9bdfd72442858d7e9 SHA512 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
+DIST radare2-5.9.2-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
+DIST radare2-5.9.2.tar.gz 11461281 BLAKE2B ac849ec4bc0e2a1b8447256362d8db2518d72e2a4af3d29f9c8931ac815c1b0c339a072312658bbd725097b3401f28beee31c6f99a5eb5a62ff3eb0cf7ed122f SHA512 e190ec124c6d48e512939782148b23fb0ef50aeb66763c198fdf7a6329d6882bb49a10641902313045b6802fca233c56fbc0142155b52f915dab4099481923c9
 DIST radare2-testbins-32e2480e3b7b6959cd1ba483a200c792b4cb9236.tar.gz 156265712 BLAKE2B 4729c30f56ab9c318f8de83e2a0de820539351cb44aa64c500fa02ed94e4bf6494c60a928b64980767ec3003d72619c98769cfd229d8381524f5175027c03c2e SHA512 d8de16e7aacd2ea4e5ecc85ddc1d38c4b8c47b37964c680084bfcb49144e2da783bccd859cb0a84de6080c7ce893af08f27d170725dcdc5f87ee4f830c5dc6da
+DIST radare2-testbins-ff7a8fb14610c87f7b2d3b185eb267f2aff381ca.tar.gz 159774410 BLAKE2B 65b7712ab444f79f18b3568c790e0cbd250e44cea8fbff5f2ed9caeb0898779928f5018a49fdbd5c2dfba57f01c8b4ceb9c0aa9248612a5c545a147b4f876d90 SHA512 666ea966d94c661ed22c400f5cb7e5c5ca6f914d2436007b5510a57e43609ebc2637606e17d49d9c67d880d5229c295e57cef2295c4d093b856ead1f3d0a7f0a
 EBUILD radare2-5.9.0.ebuild 3240 BLAKE2B a36399f1207fae59e7efc9f23d7d4dc19537956281cd6692d88d252d2ad4408b55f8a34d5cc993adc7849ba020f7b458bad6e2f9a4df1adf7217f1eb978f28a4 SHA512 3cab706d9c81cf06c8945fe6094b5e6398803ad5121ab73d6dd4958d654e50422439908c2099b8bf6ce6786a81aea2e22d03ba2d39c2a3177b3c412da211576e
+EBUILD radare2-5.9.2.ebuild 3240 BLAKE2B f105bdc4a6d314b64b863bf623116cbc2ad1553ebc3b9e92f44d662311319416c9f693aadfd62e752a41301d8c9a7dad7da46a7aadc4c6da2ab4bacce4d491d4 SHA512 ddc56263f1148f4c6250dce27b1ed642e29744e069a54b8af6dbd862483799738fc9713455b942b0aada680396434b30555a9f7481d1ea9b20b82f13447ef5ed
 MISC metadata.xml 479 BLAKE2B 57c303d3344fd8a086d7c41ca92ca18d7291c77abbfc8eab6f9f3f1ff11481235aae3b04cc613e3ad28202ad972e9e24e5516a3a1d805341da2dd0ad74efb77b SHA512 e798ed2144748ea2784f7cd89da1a81c59d44bf77f67738de8bc11c797d50ea3c5e45a8cee7801c06c3fff4c634f400e28ef46c0d9bd1063ecc3066ba1b1809e
diff --git a/dev-util/radare2/radare2-5.9.2.ebuild b/dev-util/radare2/radare2-5.9.2.ebuild
new file mode 100644
index 000000000000..62dd267271be
--- /dev/null
+++ b/dev-util/radare2/radare2-5.9.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="https://www.radare.org"
+
+ARM64_COMMIT=55d73c6bbb94448a5c615933179e73ac618cf876
+ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
+BINS_COMMIT=ff7a8fb14610c87f7b2d3b185eb267f2aff381ca
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="fetch !test? ( test )"
+
+RDEPEND="
+	>=dev-libs/capstone-5.0_rc4:=
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
+)
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/arch/p/arm/v35/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/arch/p/arm/v35/arch-armv7 || die
+
+	if use test; then
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr || die
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_test() {
+	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
+	LDFLAGS=""
+	for i in "${S}"/libr/*; do
+		if [[ -d ${i} ]]; then
+			LDFLAGS+="-Wl,-rpath=${i} -L${i} "
+			LD_LIBRARY_PATH+=":${i}"
+		fi
+	done
+	export LDFLAGS LD_LIBRARY_PATH
+	export PKG_CONFIG_PATH="${S}/pkgcfg"
+	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit-tests || die
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+
+	# Create plugins directory although it's currently unsupported by radare2
+	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
+}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 606dc6d083ea..4f72edd16bd2 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -3,5 +3,5 @@ AUX rbtools-5.0-scmtool-crash.patch 18177 BLAKE2B 67d07d40ecaaf75ac2c2908f78127f
 DIST rbtools-4.1.tar.gz 619541 BLAKE2B 9b1aeca4f139a0189affb873363dba8f6d13eb954d4872939c543f6d91c00b09b2452cc379d4d99450c05d3d44a1996e910ff512ba9849292a7b705ce01be654 SHA512 58aa58ce6c55d4d3be9f221c493c8a3c15537776ff4e28be1ea44c0441f1dd9877ac9145066fdceb90d392c75cf29ec80e7efd154b0a2f1893422b65a0189ea0
 DIST rbtools-5.0.tar.gz 649338 BLAKE2B c6a08004e7c8ba17936865e53b78e086ec74e8f5fee7ecc124750f3bf24b9b52ab8a26d1caa7010cdd2822463fcb27b8e5c5f757068924e22d3e59268166f7bf SHA512 7fbc5198fc89ee911a3cc487ead094d46213cfc4f85ab01cf22bd2a628559acdaaed138b430b08aa94ea25dec1179bf7c28349ac8226d632a6112ec83e2b57b7
 EBUILD rbtools-4.1.ebuild 1421 BLAKE2B e3ad76841f38a456551bf7180645059c2dbd54be236eac0b4407b29936724d74e1bdac8197ab812e731eb5c09c49e92b0c7f83b5b96ed696f605fb4d1eb54a0c SHA512 c21b192ef90417f5e5726ae2158de614079a16a10275fd589b738788ed5f005cd0eeb33801435ada41b4932373ca04e10d62dfb8aa318ced52f39290c697c94a
-EBUILD rbtools-5.0-r1.ebuild 1580 BLAKE2B 93d644d3f6b0ae7ab73b74e9841cd60d60b5bd817a7501cfcb3381b53f3e4d3bc8389dc9fc27642ed2a18aeec0f8f7c8898d4f61b775dd291c21f59c562affc4 SHA512 89b375e100c567602654fa5a7361cabd4438fb59bbf781fe4f78d0124bfe63c2cd9abf6f07415437e1a50435e6ecfff0b4296fcf3907f0f5a3aede7c8400ea6c
+EBUILD rbtools-5.0-r1.ebuild 1578 BLAKE2B a3b361470d284fc7c4f529a636345ae0747603eb2848903b14c116faf4f07744cac82452e9e20e5733035b8c45bcddabf032b76cba002d6a236541dcd60d593b SHA512 e3c14040a96db41964e949f0ad3e612bdae8729a63b03a14a6c211102cfa23232e3109fb67b3c60e2cd157458c18de8ea010b826d478eb49dfda85880644c206
 MISC metadata.xml 310 BLAKE2B d4825072b11fd2f9cad88fd9f3e0670d42f997f2f49034539ea9cab13751e08d7f4153fc7534d4931baa55cab6a4bb1ae65f1790fce12d784dfab1eb747a344b SHA512 4b2b81003437f8f97af748509521ce7f946df9e0fcc4ffbabf4de5289b046eeee25d0e1acaf3604fa09995965728b7e4cd10233074ddc4e9bed54a68f26e6613
diff --git a/dev-util/rbtools/rbtools-5.0-r1.ebuild b/dev-util/rbtools/rbtools-5.0-r1.ebuild
index e3d01d77608e..4e2b59f18e7d 100644
--- a/dev-util/rbtools/rbtools-5.0-r1.ebuild
+++ b/dev-util/rbtools/rbtools-5.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/rbtools-release-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index ea3952af16db..1d1bb205d05d 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,5 +1,5 @@
 DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a
 DIST re2c-3.1.tar.xz 1448624 BLAKE2B ecf9e750aa94d9754d703ad65df50786e800ed8ad40f4cce39a24ae4154d7b73db60cacb4e77e371d175c2d16393a812d38fb8af780bc1fb9d1f64c7964bd4f7 SHA512 649c5e103f8012e2717a0c36af135601dfa0a090c3e400bbf466537e7038ad73bc9e0ed36c3717b7c3c785c24ad024d40c7c31998325a14caf4984c4f19cd998
 EBUILD re2c-2.2.ebuild 948 BLAKE2B 3740ff82532079047dfa1e74ae9a4d65e8d4974babd34822875233ec35f0196ca130e6db5709fd7017e9c37922e565e00e0d48c7daae9664d87353ac54025423 SHA512 aebc38beebfc737457b91ef7b1a0189dd0dbf0ef1cb469f80c7ba739e77fdf33095bf250b70005c6cc943fa2c15764aaa2d1ee09b60355b00bf178fece3c2fdb
-EBUILD re2c-3.1.ebuild 974 BLAKE2B 3607edffe38a443e48cf8a68d8ea3e8f9762d404183282049bb97f60def443dbfad5977d46c254fed5e4d24b4c76bb7251bba9aba53a9d5e51ec78d6d3873855 SHA512 d388d7d662341e89122685d868328d04bf72e2879427ec62ff5c4f6baf78a19eb71be264e44c34272c372209309fd49c05bb8e806646f384a43e44ac2aa0cd8e
+EBUILD re2c-3.1.ebuild 970 BLAKE2B 55c3bb24ff64b3a2bebb2f79385524df985971571c01734e853a154229486b679f8b03a48e6568d92e623aa159250d418f40dff8442e9551b9b56a8c866ec025 SHA512 f51c22723d5339a11666645fecbe3a09e351ab2be5a515e82c9eba21e5d7b8583d910014f3571e1a7f489ac6871fd1212c7d1ce988d349dbbf5e62bffe5ece0c
 MISC metadata.xml 399 BLAKE2B 808d2a6288aabce5ab52a390340da95cc85d463c7418db091a1129d8f1f3617e501c30a5ab35915470ed3926ae7ed532183a82278c6328eeb780319303f1b90d SHA512 b7232e0a8cb71647ac378149386d207d1f960a4bf6c1821cc87a4c4b09bc6836a6dfbc56d4a84cf97e8a0e6ac8726528c294018706c07ca7d785102c4261b974
diff --git a/dev-util/re2c/re2c-3.1.ebuild b/dev-util/re2c/re2c-3.1.ebuild
index 47be69c03566..bc097f2778eb 100644
--- a/dev-util/re2c/re2c-3.1.ebuild
+++ b/dev-util/re2c/re2c-3.1.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 )"
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index b81f631b4a46..286352438b42 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -5,5 +5,5 @@ DIST rebar-3.22.1.tar.gz 797521 BLAKE2B 7785dcfb400108324ea5ee351796cfdf7ca8658a
 DIST rebar-3.23.0.tar.gz 807007 BLAKE2B 97c4bdb2c2fa8d5ad6f3dd7760329ecff801495a3cd3c4e389a9197071fc6e34cc880626e94a30045a4783e0dd240fcd46d32f41a0d83f823daf8d304c02294b SHA512 4da1db8ed830c59fb322c1a652c2efe28d54e09ad74d12a87381ea7a7f13965b91815f383221831fbc14e6deed1a75db1039164f7df128a977d5b64048540cc3
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-3.22.1-r1.ebuild 1527 BLAKE2B 0ee47b404009f8c9b6b25eb6ca912ff75ce9b3574dcbff40fc58d53399446b84f9b6f2e15682804d0a3728d0fc72409a214982740e50df559ecd589df1bd0e62 SHA512 16789d1be7e77de2fc0eae32a5fbd56a544f30f1b7b3e85f70cbffc3d354c00eb25528109fefa0918b6e649ba7edcdedcf51ae15ff685e13465e826820e701ba
-EBUILD rebar-3.23.0.ebuild 1532 BLAKE2B 42a8d88eb729f58ffddd4348021fad811babce9c7d6ad9c118c2ca78118eb6b0f5ba8381b71eeef650cdf0e73ddeb7216a0623c031995cc9950c8cdceec80f8c SHA512 472308e5e2f8812ea99912c7868c48d2a1a2bf00ef454d7c26fb489dcc26edb4464d753d93f4aa074c066646998ef81a950cca2710a7a236bd14de0e5cccab18
+EBUILD rebar-3.23.0.ebuild 1527 BLAKE2B 0ee47b404009f8c9b6b25eb6ca912ff75ce9b3574dcbff40fc58d53399446b84f9b6f2e15682804d0a3728d0fc72409a214982740e50df559ecd589df1bd0e62 SHA512 16789d1be7e77de2fc0eae32a5fbd56a544f30f1b7b3e85f70cbffc3d354c00eb25528109fefa0918b6e649ba7edcdedcf51ae15ff685e13465e826820e701ba
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.23.0.ebuild b/dev-util/rebar/rebar-3.23.0.ebuild
index cac74bb37686..76fb5f3577b0 100644
--- a/dev-util/rebar/rebar-3.23.0.ebuild
+++ b/dev-util/rebar/rebar-3.23.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="Apache-2.0 MIT BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 946bdcb36f1c..34a424ea2d4c 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,11 +1,6 @@
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
 AUX rizin-0.5.2-find-tree-sitter-parser.patch 1128 BLAKE2B c3a72fda5005d50f47b2a1c5350b017f8e6fd4d4d232c8502adcceef6542d509c70f68ef396ffff159c4f37a8575931e4a440c689c403a653ac9145489fa4405 SHA512 2977c1004b76740a2e35156a2f92e415530a401eeaddbf59f4efc8ee36bc0fdec7f0402b4aa1732fc0827a4a5c505cc2851db65fb7a25d254ddb631c6c8542c9
-DIST rizin-src-v0.6.3.tar.xz 15411052 BLAKE2B 4ddde26dc2541917e1d16f38339bf1467b2148524a1365d739c417857ee856ecb7fbc9210a0f3b562a429c962e31f637bb88a0c0817f42a59868ed3093b0e902 SHA512 031ae1c5b43237d55b3e48d825d4bd9cda16a4a84a47464eb1745a02265a1412e2864345595c0dca7f8ea0cb348fe9760ea424556ff6b915ac8014a7f410b03c
-DIST rizin-src-v0.7.1.tar.xz 18941692 BLAKE2B d0384a272e5e8274c970dd9253d84204e8bc026de05ec63fe0252cb6fc9eaee9729bbf03ef3dba100c6e55c58e4a81f7755d7ecb15eebbbb041aa9bfb4c53d30 SHA512 e59b6fd748e551f10169da9a04f7c04ffb017182d3eb5856467df3b167c6d9b387d0faccdb0cd97ee7321ac71179eb7d9a28fa954f34dc028ea8e4259211eac7
 DIST rizin-src-v0.7.3.tar.xz 18604220 BLAKE2B 9bbfbd8cf86839dcfdc30beb12d4472abf68e7d8c81561f6124b4d8ac781242bbbe8b62e06d2873928830d2524203c18ab1c17fa35855ac2d344af7649b64b3c SHA512 bad89888b2cb1ce1227ce629ff1209f18d1afb9da55685f0ea4ead7dd1b4dfbf8ed72c173048b2ee47362a10d5e20a6c34e09d0bbaa210f3873073c10ebc4dc1
 DIST rizin-testbins-1203a9a2f51e32337c8434d9f4f7c4543552e271.tar.gz 185572487 BLAKE2B b274a58bebe0123bd8ab7b18a4e88833e7de53133d8f640d00b9efa953cf8ef766582acd5a0f65750ebb273be70d5cc1daf9b700cd6b9bfd4d464cf59ab735ba SHA512 47e8993bea5d7805acb46c1c4e034524fe47d2b0b2471af00d3255f3e853430617658cd6b1f8a4706a748704a52646ec43495f0d4e80f16bce4aaf34e29539a4
-DIST rizin-testbins-903588ed69d7717069955322b31dad5e666b338a.tar.gz 181644100 BLAKE2B ea491bea61a6d17fa2727e1b08b810be2bb99d05cf2afa4e97dc440a69a4fd376a39c25c6e86e9e2d499732b55e7c75e5eef39adef84f571e48d147e410d04e5 SHA512 fffef043d76440976e02e2b890138f57df849f507c0a7a48bd97b421fc1683e73696c50b6daddf906a53685eccfd7346e25881d3d498417e4e55b97ef56b8317
-EBUILD rizin-0.6.3-r1.ebuild 2531 BLAKE2B f0b8ed9b9bb4e75634987d4aaa1a40ac28207eb1504b352d83300501005b9f287aa940d90c96465652a1367b2ea33fcd26ed0babed7e4a09dbda35d3a9062f05 SHA512 48a966414515f9d748f5d8995aefb33c8024a58fef0f87e4e41777560fc6e69aebfec812da2d84adca4b9787b2f27dd742ac01898eecd9d94ca10ff949495cf4
-EBUILD rizin-0.7.1-r1.ebuild 2515 BLAKE2B fbe470d30a28edb631bd66c46bb1717be1f8b0bf68c0fc5fd25472340a1e1c13b72fe0f8765f6d9a1709a203a78c078e1edcf2e5ecceab183b648d8f45af686d SHA512 c160f0a74c153a5da7dc21a8e4e001fe5eda9d6425773fc2eba60c64e7dc84c9bf642165f38719cfe94318737db0abf3594bf96bdd021a7c0ec0fac8be05ed3b
-EBUILD rizin-0.7.3.ebuild 2514 BLAKE2B 39cc4fc096bbb969cea78d1d8610c5bf928958d0d18a45903bf1ca924e76f0b8ef09116e01beb52bd4e33b6fa1d0d01e26c9fed083e326d0b437d9ccbf98c68a SHA512 be049d24ed3638c590faf7230081cd75aac81814327e567e1fc7f9c3b5d4edc4661d3de8b9dc008776433800bc352bc7a66c1e3865382970a61dde25c43ab20d
+EBUILD rizin-0.7.3.ebuild 2513 BLAKE2B a75c5190ef23d3f0189c4ea6ac504fc55f747e740f370a9167736212a7c66f7d7eb38e876b24a02fa6ac6c8afff58293091003ab6a8134504bc1a514157a3ded SHA512 fba137f9ab4f0d52ca715dd25ec01a3665fc1037ceb8bb0f834fdd57845b21746ee4040aadf7fa21db9498366520f52806bae51b1fbc98694f57fdfd2aa4495b
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/rizin-0.6.3-r1.ebuild b/dev-util/rizin/rizin-0.6.3-r1.ebuild
deleted file mode 100644
index 49186f6b9d14..000000000000
--- a/dev-util/rizin/rizin-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="903588ed69d7717069955322b31dad5e666b338a"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
-	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test? ( fetch ) !test? ( test )"
-
-# TODO: unbundle dev-libs/blake3
-RDEPEND="
-	app-arch/lz4:0=
-	app-arch/xz-utils
-	>=dev-libs/capstone-5:0=
-	dev-libs/libmspack
-	dev-libs/libzip:0=
-	dev-libs/openssl:0=
-	>=dev-libs/tree-sitter-0.19.0:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
-	"${FILESDIR}/${PN}-0.5.2-find-tree-sitter-parser.patch"
-)
-
-src_prepare() {
-	default
-
-	local py_to_mangle=(
-		librz/core/cmd_descs/cmd_descs_generate.py
-		sys/clang-format.py
-		test/fuzz/scripts/fuzz_rz_asm.py
-		test/scripts/gdbserver.py
-	)
-
-	python_fix_shebang "${py_to_mangle[@]}"
-
-	# https://github.com/rizinorg/rizin/issues/3459
-	sed -ie '/dyld_chained_ptr_arm64e_auth/d' test/unit/test_bin_mach0.c || die
-
-	if use test; then
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcli=enabled
-		-Duse_sys_capstone=enabled
-		-Duse_sys_libmspack=enabled
-		-Duse_sys_libzip=enabled
-		-Duse_sys_lz4=enabled
-		-Duse_sys_lzma=enabled
-		-Duse_sys_magic=enabled
-		# https://github.com/rizinorg/rizin/issues/3841
-		# -Duse_sys_openssl=enabled
-		-Duse_sys_tree_sitter=enabled
-		-Duse_sys_xxhash=enabled
-		-Duse_sys_zlib=enabled
-
-		$(meson_use test enable_tests)
-		$(meson_use test enable_rz_test)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We can select running either unit or integration tests, or all of
-	# them by not passing --suite. According to upstream, integration
-	# tests are more fragile and unit tests are sufficient for testing
-	# packaging, so only run those.
-	meson_src_test --suite unit
-}
diff --git a/dev-util/rizin/rizin-0.7.1-r1.ebuild b/dev-util/rizin/rizin-0.7.1-r1.ebuild
deleted file mode 100644
index c213792fb694..000000000000
--- a/dev-util/rizin/rizin-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
-	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test? ( fetch ) !test? ( test )"
-
-# TODO: unbundle dev-libs/blake3
-RDEPEND="
-	app-arch/lz4:0=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	>=dev-libs/capstone-5:0=
-	dev-libs/libmspack
-	dev-libs/libzip:0=
-	dev-libs/openssl:0=
-	dev-libs/libpcre2:0=
-	>=dev-libs/tree-sitter-0.19.0:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
-)
-
-src_prepare() {
-	default
-
-	local py_to_mangle=(
-		librz/core/cmd_descs/cmd_descs_generate.py
-		sys/clang-format.py
-		test/fuzz/scripts/fuzz_rz_asm.py
-		test/scripts/gdbserver.py
-	)
-
-	python_fix_shebang "${py_to_mangle[@]}"
-
-	# https://github.com/rizinorg/rizin/issues/3459
-	sed -ie '/dyld_chained_ptr_arm64e_auth/d' test/unit/test_bin_mach0.c || die
-
-	if use test; then
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcli=enabled
-		-Duse_sys_capstone=enabled
-		-Duse_sys_libmspack=enabled
-		-Duse_sys_libzip=enabled
-		-Duse_sys_libzstd=enabled
-		-Duse_sys_lz4=enabled
-		-Duse_sys_lzma=enabled
-		-Duse_sys_magic=enabled
-		-Duse_sys_openssl=enabled
-		-Duse_sys_pcre2=enabled
-		-Duse_sys_tree_sitter=enabled
-		-Duse_sys_xxhash=enabled
-		-Duse_sys_zlib=enabled
-
-		$(meson_use test enable_tests)
-		$(meson_use test enable_rz_test)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We can select running either unit or integration tests, or all of
-	# them by not passing --suite. According to upstream, integration
-	# tests are more fragile and unit tests are sufficient for testing
-	# packaging, so only run those.
-	meson_src_test --suite unit
-}
diff --git a/dev-util/rizin/rizin-0.7.3.ebuild b/dev-util/rizin/rizin-0.7.3.ebuild
index 7e7a1b76d7c5..5b8d7bfee238 100644
--- a/dev-util/rizin/rizin-0.7.3.ebuild
+++ b/dev-util/rizin/rizin-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 # This is the commit that the CI for the release commit used
 BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 # Need to audit licenses of the binaries used for testing
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 91ed22d1a6aa..0dafdd502e26 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -2,6 +2,8 @@ AUX rocminfo-6.0.0-detect-builtin-amdgpu.patch 1004 BLAKE2B b75f82db423455391951
 AUX rocminfo-6.0.0_python-3.12.patch 3102 BLAKE2B b11743bceb52b280835eccfe23815541f702c205d62c8e08b1a2a72e5d68882f16689b517f8733738657cef7fab7c933886168d3c9260567400827409856cb06 SHA512 59cca81b13fb3a01a7fbb5e9abf838571cd2ce09ea14e5bb1a72447b6450681dfc58d79cc524e9ffca03c9f4f23fd0cc524bf272fffeb5bc3cd0d70d5358e207
 DIST rocminfo-5.7.1.tar.gz 17302 BLAKE2B 395c695ed0b79c771c4240310c457aec893ffd889ddd551866753d2a0c8d4e98399672d74a7114a89faf8b1960dd54fbb0425ea00f7d15e5c740e33ce4046d0b SHA512 38726bc52bd045b6281cccd702706fd6ea5b57cdc421ad23106d5447a002f4b530e8d4e4430d2bb8eb30803af3bacdaf34646a965cea26f42d726bf7f6aafbab
 DIST rocminfo-6.1.1.tar.gz 17740 BLAKE2B 6331054e1c8a59f2d4246c3fcb999afc28a8cabea9d5faf2b95d767f7153ab0930a633ee630cabc4472413a8a54fd9ef798516baa77e94aabda7687a36bf312f SHA512 d2982874ad09bfbe15418a88c2d3360f9bce262674d50f5858a08e52dd266e255f95116c85e069d7e8d28cb323164fb6999c5834163105f33e0c773aede4efdf
+DIST rocminfo-6.1.2.tar.gz 17734 BLAKE2B d92816dc0657a2ec0f04024311b5a7851a3cd487d73b496bfdb32ffe69cae957798f49622e477e5d0b47ac4ff86c2bba9a46e86228823f85da2d9f5376b6aef9 SHA512 fa1890797a89d67d18f29d73d213d68bcd31c7fd2b2cee89148b8dbd6fe7552e270af0582c7a50e80adc399197b3dc1cb5e858b1e983411079d088fc947c8c88
 EBUILD rocminfo-5.7.1-r1.ebuild 1339 BLAKE2B 5d7ba72f7c1309efc6e5cdd9d05a0c2fccd0abb972ed8caca46004bfb16818d81bbef1fee87ec2a8af1600f8d54ae9c3b775f2168ed3105401ea6d43ef0760ea SHA512 9dc874889be072acbafb3e45b18d336ce4084104efa3df800f3066fca41c7c9cd60e12df55a79efa98fb6259a6fe8eab656615eda90fb4607a3790768b42c755
 EBUILD rocminfo-6.1.1.ebuild 1255 BLAKE2B c1e6948dd71632d93aa11a6ec8c5884bc124daa9db5cc1fe655dc801fa7503479b22c5b39ddc67fb8410b59a696fbf251d8525ae68d66cadbb6cac7d789291b1 SHA512 3096db54c2cdd00029d11e183ef02e80762da6902a4750089dc93c6a8ec8816c4da2d9c01a51d623eb416d7f653246aea3d5a5ac1e82ed1c57729596bfad14fd
+EBUILD rocminfo-6.1.2.ebuild 1255 BLAKE2B c1e6948dd71632d93aa11a6ec8c5884bc124daa9db5cc1fe655dc801fa7503479b22c5b39ddc67fb8410b59a696fbf251d8525ae68d66cadbb6cac7d789291b1 SHA512 3096db54c2cdd00029d11e183ef02e80762da6902a4750089dc93c6a8ec8816c4da2d9c01a51d623eb416d7f653246aea3d5a5ac1e82ed1c57729596bfad14fd
 MISC metadata.xml 357 BLAKE2B 09a7d224662327ffc7936d1d98691ce626dec3a23ffb7ba1b87da12a58659bff330a7a7718798928898b46754bb96869ec63c766ba25719b3abf88b06dd286d3 SHA512 ddf900d23e4bc3f69f0f1b53c9cff6e6f309a7add531512860e288b0c3593ca76f0590f73a0e934bdb5a4d2cfadb47e64bcfce0a354c31d27af1ff6214c32da8
diff --git a/dev-util/rocminfo/rocminfo-6.1.2.ebuild b/dev-util/rocminfo/rocminfo-6.1.2.ebuild
new file mode 100644
index 000000000000..5f6dfcd53860
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-6.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit cmake python-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/ROCm/rocminfo"
+LICENSE="UoI-NCSA"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-detect-builtin-amdgpu.patch"
+)
+
+src_prepare() {
+	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" \
+		-i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/rocm_agent_enumerator" || die
+	python_foreach_impl python_doexe rocm_agent_enumerator "${BUILD_DIR}"/rocm_agent_enumerator
+}
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index 11eb5a272f6d..0d8e00dcd1b3 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -31,6 +31,7 @@ DIST cachedir-0.3.1.crate 8668 BLAKE2B 94b624651fad1acb2b82d7d886449db2b5558e672
 DIST camino-1.1.7.crate 36204 BLAKE2B ea87922e77401a23f25d66af303f39c568f37377e4f0cd6d206cb7b175a51528680bf67897e3b9830d276acb1b156b7c66e149b75370be202cb99fbbcea54233 SHA512 b82c809bd52549d16e286d514b5dbb1d640633b7ff05412ce3539e543de9c69d99bc3f62597b94fc0cedd7c8034ebf73663a6f647e46409b778baa4877928c45
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4
+DIST castaway-0.2.3.crate 11509 BLAKE2B bbecba400bf98ef4158581f3b1673ca77dbec3ad754d3749f0e9342a47d1fa9f638c1388f0762413277b73251854ade26e08dd85b7d7133c73a5750d4dbf7d92 SHA512 2565a4e5709a25118462ac25b9f741e92456c81ddbf7c4e791d8c647f2ca5227b2f59ffac108f9d32c77cedc12219c517218c51a78b1d22a1baef1bf2c16e0a9
 DIST cc-1.0.95.crate 76485 BLAKE2B fb86d2c49e9ee73f1a7f9268274a879260b13adafa49c8bd4bcd4acb77861b7b65c5cdda988877e1ad2d4a4eee52308ddc29b545a07cf90cdcf10268ce639986 SHA512 7e19d1c2271a094311db96edc6faa6576366070dc2e77a666ce43016c367d5a94e832724b95b170650bdb16998699699e45d3ac2cd0eda6655c58c1e141d40d1
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
@@ -41,12 +42,16 @@ DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113
 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
 DIST clap-4.5.7.crate 56343 BLAKE2B e2392ddd11213c8410344c474d84bf40d2d5a0663d25ce8126940ce59085a84334223e92ebd59fc387b4d1334b8f8cd7b76eb15f916adc5ef59b9858929c5787 SHA512 f126132811696d5fcac0242264121a08c1f7c59b4830d73b6b95b8c5b31a2c11928b0d7026151a5d1a0108aa912d7c6157652193ea1ef5a980669bdf388d5bfb
 DIST clap-4.5.8.crate 56338 BLAKE2B d8f07ac09b59f631047a54b0b9918d18d264508d5ba173c9895fc613102b0cfbbc76b89e58abafb43c1fde7dfa129f3a0b478219c3984eb41af6efd3ae138ff9 SHA512 cbfdb79e8020b72c618dcc2d554e41224f4995b6c47512c8406137aeb2df971a29fa198e504254b758c7b87bb2f2ea3cafc542f412d747744abf25a334ed6cb7
+DIST clap-4.5.9.crate 56348 BLAKE2B e2c60cc6dacc6d6c7d3718ae3748ed5f681722ef060c6b2c4ec1262da4ff4c3b235df3127946816ad61aa03d3b98c55739877dd14d1182a7d4c37daf6e1e349b SHA512 6eae38d69f99fdcc7e2a1f799b4ae770a00dc8556def97a10d578426f6770e0d86fc32816aac2dc5a59c147dbd7501eb9f7b94953a2342cf74b1034459705e88
 DIST clap_builder-4.5.7.crate 163957 BLAKE2B a1d6e728f05b7f7eab8fd9fc8dd0e25f8a066e0ba72ccd6084e747f5833ef90e98b63f4bb0b3af54b74c193df3ceb4eac63a45c9f3222570ef7ec85562346a01 SHA512 df0ef9adabb61538619d94ead0768fb8291cdef48c0cf47b323aa366fa2564d89ddf65cd0ef0b7162ef5e590be26a357cc775ae5278abf8048c05a5fbf58b5cc
 DIST clap_builder-4.5.8.crate 163870 BLAKE2B 291af36cff2cf7c97cf0b6b58843ebc8a590efcffefd8fadf0db1a1689ded94b2288fd40bfaebdcc827e50f081f8aa1758c4cbf2b5bb9f666e0cf66091fb8896 SHA512 9b0f422369086be254a7034e96d2bd5fc496da9d8be55d962528f765a5e77f003a048deb84569319d4e424abdaa3c653bdff2897fa393e7d34c1ff90a99c4eea
+DIST clap_builder-4.5.9.crate 164088 BLAKE2B 47021738e0d3e946360ddbc144923daadf7151129e8548607ea3688b75f9a71ba676a31dc543a7258981fd3e561359fc0c5ed5fb6a921420a679e5d7f072c5d1 SHA512 5f9e297036a86bc33daeb76a8d906e14c58899c460ab66c934b7db0309ed5a7f63bb10d644f84e692fbb84081c20102ae97e33cb39e9ed71bea920d4e5e6aac7
 DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
 DIST clap_complete_command-0.5.1.crate 8273 BLAKE2B 84302d7ffc34d9e947dd141421462b2035f324a77a8c68fa342a49242b0f97e43afc54be90d7cbb2efb311ea7848313af3d98c572402e7b25f83c22ff1fce8c4 SHA512 0cbd75f41349c709440ceee1075cd209f927b928c665b31907caecae91ab0b1e00c0a73f8185df754663e4d079467c6312abdc175bb6f8bd58c6d783b371754c
+DIST clap_complete_command-0.6.1.crate 7959 BLAKE2B 61bb266fdebb625ce3327164ab39d65943406fe9c101f10fa3a1f18d4728e0eeca07dcd8eb4e8f6eb63587cd1af86fb05beedf1c5b2bbaf22356f213ea738c7c SHA512 b364cac56e9604c7c06a84f5d687b62398f92e3c0407123b183d5c3846948a4a0975469326312ad57e2ce936574462f3dde61385062827e48efc3ff813185ef6
 DIST clap_complete_fig-4.5.0.crate 10932 BLAKE2B ea828d2d36a92f13b176af614562634ff2117f23a328ffc1bb873893ed3101d2cd52ed09cf5b1f299a5a51597e51ca2806411158cbde8dbceb6c56417b4b9111 SHA512 8cbe3e2466149f2af74aa9e9acf538ec84450111a698a83bd95684685419dc9c37251c3f1d06800d1ef8e8fe9739186f95c1d626fb61b27a672cb79bd0d08bc8
 DIST clap_complete_nushell-0.1.11.crate 32198 BLAKE2B 6a704251bfc10fa7fd113f7e82bdeb9655f2e23d851fc3d654332ee196214b179fa83ed6c57b436df247f6eb1d2feb28017090b9087b7b8d92283978e7ce9957 SHA512 04098511e19cb629df43509f2596904ec2a8690fa6bcf160825030c42dad73f77ed184e5a4dce10c8308b9718541540f10277b0ef0fee6b039ac1e7b482d3cf2
+DIST clap_complete_nushell-4.5.2.crate 34391 BLAKE2B ce7a44c4a9e3d577e014c71d6f8f6b16e192ae169f499973316f6f3c7febae59c957ba6acc153802bde423fd58301b5b5ef5b606e275bf8f608ad40fb192338b SHA512 1da7b7f01e948f4c055bb912426d950418f353837dda9e6bb8e249bda4169b29de2291173c9d0193f0c746ec1387ad8a893721f32125f14565948f2e90fddf53
 DIST clap_derive-4.5.5.crate 30017 BLAKE2B 8525d8adba25ec0165936f72f78dec3cdffedc9de8e537b078944b1830640222013e335e86a2337ae9ea3b07dd655275705eeeb8c2155224dc0950ed00e47f7f SHA512 90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134
 DIST clap_derive-4.5.8.crate 30024 BLAKE2B 3d2d7e3652c6e16329a0897b985288d8beb6c68051d3f6216e75c6aa98a773d2cf609c1df82df7ab2b5f43c62c8a028da29ff1e314cbde096376bd43ff6b3b70 SHA512 587b63b99ad47b6902094d40ee4cea6c4e1d547e11fa50095b007a8495b11b25b3b6ef37583526938a56103982aac7d2addda833d2323545b753a852fc830b43
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
@@ -56,6 +61,7 @@ DIST codspeed-criterion-compat-2.6.0.crate 10183 BLAKE2B dfbb550f0f21322d8f45a92
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e
 DIST compact_str-0.7.1.crate 57246 BLAKE2B 2da5cfdc91d417294ca87ce834e8006d3426aff4cb22945e6744ace7d22c940f0181a75f25e6acc41efb5d83bf6ba4ee0876db3ce5cc05b9524a9868dcb8c7c9 SHA512 29ed591024f8f1b478722384664f5700fbde97b44af82fa32a8d1ccdedca9dc425555f9e5a4431a6c954d58cd90d60a25a9ed7f18773ede13edfc68094a23275
+DIST compact_str-0.8.0.crate 70994 BLAKE2B 27ab4163d71915f9cfc160fdfa4ed049c98b06d0060def8c4bdd29e8ca37716a1c53877f70d1eb38260d44003e833c538b20bb4960f0b28a7becca5c9b29984e SHA512 5a236c501222b577fef7d7190882e20e85cc6deacf9d1f6a1d710893654b53a91c7d47373f0d10e9bfe138dbb2f4e99802deb2a92001bae7e130f6558ed9d1fd
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST console_error_panic_hook-0.1.7.crate 507196 BLAKE2B 90f2855b54c78258f9e4983849a0c0b41f842990d622bef0ea16ae5e3a93914919022d21b1437bb2ce644333d4e0c6e7b55d960452c4fa437e23bcd0da83a4dd SHA512 49f4fb2175c0068981678f291422ace3737dab7033b1a49d78fd821512c92fdd023c3fe28c7daed88c8f338c30a9c7f82f18bb4583c3fe7839ad8dcd0addd6b9
 DIST console_log-1.0.0.crate 28943 BLAKE2B 1717f161a7d3a92d5161119cb7ffc477b763716e5022e8cd528caf6e8d28eff9ec4bf53a7c45a68956d61109b4d50dcc582051e697c7a5e4a591e6e67e054510 SHA512 e44e2acf873fb86822474c6e2a7dc2964384db096b3ee13673bb57990dc0a930a306f53360f9d1145faa31bcbd194f8fcc1674bdbc2f6b236e7eefb4bc43a06a
@@ -173,6 +179,7 @@ DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a6
 DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
 DIST matchit-0.8.2.crate 33260 BLAKE2B b2781d1656439d471c709ecd26a763da032652578ef542394e92d0b1649478beb059b4445f290c1709191af48bb9841c30b733b2d48c4c5d776c24c244a31f52 SHA512 b5a478212b3fd7defc7c92c653c203c1be84bd0753391c17c2bb20c795f5d1462b34bac88f5b067e71d6fca0cde83e2157aafc9c09e950819d1a2b86621c34a4
 DIST matchit-0.8.3.crate 33299 BLAKE2B fe21d40c14fbdd4c3199ab893e519cd46383aed20927278027f0e0063be3e77cfae8d20517e4f042b0870039e520226dc478f99a6dcdc88ab723de842af37522 SHA512 c761203f18909ba3473beb22d20781f49dc69d8865cf635a63f47fcb81560696104bbc223feb89463ba2eec06870b96d2f8737142f9955826938db51e3285a7f
+DIST matchit-0.8.4.crate 33986 BLAKE2B 4d7b43199552cf01daee7aab49cd5bd114704d14985c1df7a800f2ad7951a7ac2b1047b9ca35e42b8443d701f2e76afb669f383380e442e60ff08f30418f7a41 SHA512 62cd181bb866a874c5d403ed1b14ac54628ccd356d87c5479ea88febdef2ec58e60eb02a42e8eb19cc12f14483e5aef0158608143ac2d78548f1d892910fa8ac
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST mimalloc-0.1.42.crate 4079 BLAKE2B 9cedd8487f419cf1132828fa798af8eecb587abfe2419aa063a1a4d3e24bd0b3dc5c379a24dec6f83d63d984e2fbe5742c4b968cbbc422724c4f43a8328f265a SHA512 d9d37dc9bdaf5bbd5b28921c2cf8d7fc3bf704c6fda893310f5ad43710f22f3543264fbca122097c90501cb543db73b282ce67aca9dc7ce774121085b1127f80
 DIST mimalloc-0.1.43.crate 4075 BLAKE2B f22e0d10c34319125ffbac904894e0e9623d56a1fe488c95d76a706bab047aadd8c511419ebb20136ede67bf6297019b3ec7f263a324f1dabb45aa4f257a6cca SHA512 f018df422932d5eb0bcc4c0bd91318a86ea09d6e3de51e76d8a65eb833f9f5185c759c1d734e78d3f46d9043d3642882ed3398354fe4b79a5fef05d346c002b9
@@ -239,6 +246,8 @@ DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd0
 DIST ruff-0.4.10.gh.tar.gz 4921666 BLAKE2B 4806d2ab308c2b9c1570a5249826d12de62041c53b801221d7d2e74933f8c4fbfe1c7f1300d21c679985783df05bf824566953d0bc5d4a3a39794e79e0167377 SHA512 b9e4bab56e94069b46e424edf6b2692e8c472f5239f74114dbcddc1c03375e2e0e711a157863f5317e1d15e55a2d372a99e7221d11fdd4202b65bf48e5a1a081
 DIST ruff-0.5.0.gh.tar.gz 4944255 BLAKE2B b62732bb924582485cca2cb98644eb81e0bf3c9b9223007e05b4e2335fa37e74d3d91746c537d7be5c332cd737cfd3d31b4a2dc446a556d888310687eb2549c2 SHA512 12b69297d1e5fab87b2ebf97d347bf376e1797f5c3633ee398c08847df6b79160907444a034e0e429861517dac15206b999117e155b622c4e4f76fb2db8c8ccf
 DIST ruff-0.5.2.gh.tar.gz 4931162 BLAKE2B 883ebe347418570a4e0ffb5fd046160bcfd913c411940607fcb12fb7751300f7a9b50913fe4fa58b4587c6862c25164662f546551e0d3a2f4bcf3aed7514b1ae SHA512 8e5d3038bea608c8428ffcfc84c473a8fb20a3eeb4f2e57ac7c971bfeea3597b21411f92efbd81ff3df8bdd9ca0f674990b9d3d14b66671e4420214b61d909d6
+DIST ruff-0.5.4.gh.tar.gz 4800683 BLAKE2B bfcc029ccfebfcbc845e1947aea19f28719edd7a715c73a02cf8cf275fbeb72f371f67b99c78397fe097244a5cdbc6c4b412dfc4e1d364a45d23a5fdac705cb2 SHA512 9dbcc11e149cdeb7f9e8e2dc3c673620ebc2abd4993bf06879b33b84e4de1ce0ba9e317b92a8cd105b06bda74f076ee923e35c1877fdf52b30337a6652bd810f
+DIST ruff-0.5.5.gh.tar.gz 4830364 BLAKE2B 7e49d058b291a9fdc25aa19845b73daf7cb131bcb10aeec5af9e2df3a0e946817e1d9c5537246359febcfe88ac91665b0b6cc7083949efa5d7b161dd0bf42e66 SHA512 0703fb61736d439fa9964e102bfba94e1ddbe8c550000ce74955240b7765fe3beb525bc66dc867144c6fc130af6f6b6b37b2b416404c586410f7a3abb5ee0aa5
 DIST rust-stemmers-1.2.0.crate 2351301 BLAKE2B d633c0d7091fd05e55a521670104831bed89deef7a2fb7c1eed3528246e65b67a97888fed48b134b10c477e7b95c034e8bbad70500c779b1ff7b0c334de0b37b SHA512 b9453a0984d41e5a692e5ea1a8a7bc6142de30f7b345a269489b8d4ebe3b3d442e7fe5f338c72a790521dea7a2ad9605c0ca8218a6b76d8bc5e19ae02cf711d7
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
@@ -273,8 +282,10 @@ DIST serde_spanned-0.6.6.crate 9120 BLAKE2B 6748b04f30cc63297fe01cacdef743b688aa
 DIST serde_test-1.0.176.crate 18390 BLAKE2B 2f4bba264e75ce33023fb6d46f59c2a908b57a70b72e13a8d9832d2c15ad5fe17d3013bcc4ccb52f35295b9422bde2acd20c64c1c4cf28be620034bdf4f5266e SHA512 a7d18de55a4b4e6871d62a5df63eb2132caffb7922edcb767a9ed8fad094d9aca16efe8bfa3b625f48a543cd4cb20c13d78e5ca9ed3965cfdeda9c9fa8bc9a0e
 DIST serde_with-3.8.1.crate 142294 BLAKE2B 92b3692f80b613b8d8d68e69c387a65285a969d5bb8b03d9c65af2e40b77e20be2e504044a0c59ed6de7e36b66dd31eff3686cc0b74199ae146d871b7d6f51e7 SHA512 1db8ea26a292c9c08c9451e946e74904a0a063bde854e22983a6575a6bf1c3cabeb8109dedbe028d6acb2abdb8c26adf4758b2f31c844cab692266e522a899c8
 DIST serde_with-3.8.3.crate 142734 BLAKE2B fdfa7fec85b147af7f0093dc2318578636f374eeffe67ebcc39c663ddb20c4b4dbe7d5ef4fd64a08ad173d86a2d9f46c426bef3b3328fdb308c10d49d73314fd SHA512 12d1ad7e6da78a94a93bc7460ff651d9e4a8d2f4323ea92efe600b2e7c5fb9bb6170a2b71b1f6d774c307e0c4865b36ae5a97fa3f06483bcda1626bb87f5200f
+DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
 DIST serde_with_macros-3.8.1.crate 30796 BLAKE2B e7fb0a20c839ecea75f52d6ad5841c918f2c01ead7efb5ec5f0dacca23715cb9868ad792c7811f20951429f289ebc5a90ec4c4f833ebeddc5ff484dce7839f1d SHA512 fc1b854729efb24377f830087c21b6d996b19024ed38fca31dd4377f65991189e32db481387143f6fbb4b16eb5e80a89d91e97f40fc1beedd873ee93b01abe7b
 DIST serde_with_macros-3.8.3.crate 30864 BLAKE2B c5ccc3049cb148d2ee226ed171f93ff351687c57735ceb662887c04185e1a38cd29374bd720394fd3c1f88aaebbf225787643ed2cbfadc10fe200eb4f803b2e0 SHA512 57759c252cd417e217704d60ede06b590de3ed2d4c8e7c13a838a03ac7d41e3de726e505f5661bc8a17f99d5839592d2bd63c93dd9d8c284877fcf57b4d31f0a
+DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
 DIST shellexpand-3.1.0.crate 25591 BLAKE2B ba395d9d98fed37979e97609689f909b264ddb44dae56ae4958da9a0e85aa382a00bbca42530cda2701e934233aa1d44509495235ba0512beb33a827cee5c9f0 SHA512 9b20074425db359cf92f29c52be91a3a58a91e6f3116b210913f24dc31b5371ef9d77fe46e7da39e42eac87fa4ccb8ebf9175d7bd5fe6b520d12b9d3b31cc65e
 DIST similar-2.5.0.crate 51648 BLAKE2B 43515b3014ff75e2a94debb0e40a081d60dfa371bc3bc3b3a7944cfbf2e326a8a56c6aa26ca2b6f9ab6f32929a89da673ec2fd4f037c07f8ff91ca95a77b1fe1 SHA512 7206380b6e4eb496b1dddc4501ac03d716bd6b5228971a35ca71f507940e799410dffad7e50e52c6f8fcd43c570ecef23220962fb057100665343498a5ce118f
@@ -295,6 +306,8 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST syn-2.0.69.crate 265441 BLAKE2B b01576c2c86426d2bbb2c9553dc1dce6a309d9922c35167ee6a718ad08cf3d0a22f0aed4d4c547cdbed85b47283e5b60a128fd1bbb230a6687f0c28af3a9c228 SHA512 fddc0f1ffa3e68ce57833c6ff18382296838287dd98f9f77f679ced471c3f801af30376363a870232f337bda27b3ba6ea93074f8e3c05ee390bcc024e3690bea
+DIST syn-2.0.71.crate 266398 BLAKE2B 78760c9965b59e14ab5d97e83c4dabdba99cd1933b66350c7d5c5f9e55f34fe68207597b51aeb023b211a065d986889655ab701b94347397ca6856a4fcbcdc85 SHA512 cf6264bc148ec550d943d7d146c7360a7d753e37ef553e6d0c6dc265bf516084530a5617f6826069275cc6f71d9f820014f7d92f04356ae964df8b79edaf7bbe
+DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
@@ -303,17 +316,25 @@ DIST test-case-3.3.1.crate 8797 BLAKE2B bad61b52f7865882cf6f1ad9448335a8c2eb7256
 DIST test-case-core-3.3.1.crate 14327 BLAKE2B cdca628ed77b8d7bbdf50c775268f733e125fdcdb4425d228691d9650558c3797876f5d8e900a7afc330f61c2be588452ced646248bd676fe4da1a4f8000decd SHA512 2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3
 DIST test-case-macros-3.3.1.crate 4961 BLAKE2B c3cab2832fbcf3deab12b13bfbb32bbe73528df4d98e84de589a39cd9f3540e308e307148eeedfef4822e3f6820e1b1ba93b102851c7792c5abda25f735b9abb SHA512 3383ad7fa23f09b3289e2beefb2a2ea6bb7f7f48d71339b4c1e613c4807e83e4ab816b1c36369524d65aec7929064d2951c758d9c88164e7792a0a46fbf2d933
 DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
+DIST thiserror-1.0.62.crate 21323 BLAKE2B fd2061bc5e7ea7ba43ed59c355c8cdbbcf416b189d0b2a3c33f725c270c1d0a8c6ca18ae538bc7d4634166ba747172c32be98b8139bd333a7522aa35730bed7b SHA512 29efa072b31e63e78a3e31fe84758fabbe7337d3e7338be4e4bfd35c8b083b53dc3cb68be78aaddf80eebabe301de00e2ee1908c7b00dd5a2168b0b66d8edffc
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-impl-1.0.62.crate 16047 BLAKE2B 63a1fe66d3dadec304b9ecc241cfd71a6b278081336f4377fd435c9f959997bd0e0b0de2b5c318ad60d747f1fcf27df0f03932ba63f1288491f9935d3ebba735 SHA512 5f852f4b37af396336a941ec9f0340d93c8c70bc39f0a2cdfae3c20f180e06e51b4590a7535ddbcb87a792eba7e52ef9274019a98ee870f1eaf1b3b7cadf3303
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST tikv-jemalloc-sys-0.5.4+5.3.0-patched.crate 884765 BLAKE2B 58789abe69c2a7c653fb0227aba06f814e2a0cc0d007f382a2d7fef34013022656a1d4c439bae8b86b85bf47b2b90f59ab14077af71176845c58998554fddc72 SHA512 d9c2254acb33fbae58048a978cc27173bbe3c5f1aed0c0c8ce8e86dd09e6faee80676cdced9950169758ca7298f8d5c6ead81e47909866d98bc35c7db16ea2c8
+DIST tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate 897133 BLAKE2B de23ef41550ab10a30da4ea1037a5f027c23dedc71e0aa491f11cfa104d0fc6144baa0efe65991b85793719b185aa24290f26f1072a479caf8807f8a7e46287a SHA512 411c6b21fc259f3345fb6890f71de1a178f392e75351c6e38c8c9b70dfe9c607d2efd7f083152c913c395e5a041429eae731d5a34df924481c35c0691978dcf3
 DIST tikv-jemallocator-0.5.4.crate 13101 BLAKE2B 4dfc9e39418ce00d2c9913624db9f558fcbffdd224ffa5536906092186c2e3cbed0b9df6e6e0c530a803887b5341d46af307c014faba9512fa312fb8f41796aa SHA512 e66a14d83e22fa3e895b631c1f2a141dfd526e8a8f0a83f272de814627340ad3ab7b9b986ef491d59ce53b05524f07ed5f643b999ac2f3feabc5e1ec0675cee2
+DIST tikv-jemallocator-0.6.0.crate 13700 BLAKE2B 86a14c00a953991da2abb96c379ddaa03cdd403810fa0468ee60a0234db03b3651ad87533221f4812389b8ad03730d8dfa16c75f0d6dee640a4594bbe81fe700 SHA512 411e172ef702a3dc3022c8d672806b8a0f4d0c9c2db95f8c5fbe4949d3235504ef748793225186f6311c17e170d88bcf03e49be37657336520d06b75bf97f07c
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST toml-0.8.14.crate 50645 BLAKE2B 264a757d09f443e9d4d2cd7efa07bec4bfa382d1ca82e59d268c0099114547536858be323e8004fe7add72967b5c193bea176a823b688ad8be2bd71b186607f2 SHA512 31af40bb5d8a172f45b5f0ea7f089862cfec57bc9bcea6559932b045efefe9e8be349df24f55d6ebe536f414fc35950f6545a4703e13a202212eec9fed6ecf62
+DIST toml-0.8.15.crate 50652 BLAKE2B e2aa6e1efc9f5d730659d79c9ccbed7e3f6e2150cd2f3e00dceb017e61fa24ba69dc9cf6b9594d89d23791914e4b7016826875644acc523722f3b770aa50c6fb SHA512 3aca72fd693d3d16fba005a03934c2473c72e175425f0214b43f795edc9dd75fc855daecffbe59279608931010948b32aa720a8411f8b6a68a06e27763e4c94c
 DIST toml_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
 DIST toml_edit-0.22.14.crate 103761 BLAKE2B 54acbfda77cb071d280790bdf167a9a7a3fc6c8297ef96c5a82d55c93fb036c0ed167fcfd380d558fba3602bfad26080947e6477a6011819795d2debb74e8d14 SHA512 fef6ca35315482f635bfe35c2c6753d09f9bd33681d8f032f448fb9c6f494d30fc5789d96f99657879be9fdd7b35a640d52fce7722fc6ca05d8b9d5ed91903c4
+DIST toml_edit-0.22.16.crate 106618 BLAKE2B e461b46de9da1fd443588811ce788875f3318dec3921a048cc84b3ab1a5a75c773918e85578a5185aa3d713d62f6e90c3764a49d184fe48ebc50d6a127d5d8e8 SHA512 338d3aae648a4855503b39f10aecbfecaf63fabc3cd904d42e5859ce22af840f734b29440bc8b72a31fcc3c689f6d8417ee4e3330713d461b5480d30699732a6
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
@@ -321,6 +342,7 @@ DIST tracing-indicatif-0.3.6.crate 26505 BLAKE2B 784809e0ce11f0a8828f8df748dc135
 DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285
 DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1
 DIST tracing-tree-0.3.1.crate 29349 BLAKE2B 7288834c39e69de9d4a2c20b4974cdd34a12340fc09b4a03299d2233fb1d024d88c1f101e28365d5a72879e24b824206a19589faa4e8baa9fc2fed5d173e7dcd SHA512 16cfda6bcf04d179296f83ad276797d1d8aaafe565fdd8587584c351b55be6ac0ed120e1c05110d724de477069047087c1c58e187c76d9b9e83959297c6eb155
+DIST tracing-tree-0.4.0.crate 29411 BLAKE2B 1c88107a853db0d81a182f15fb7e78c967fad653df1d72291fd9f31fafd915cfe98b5f8d54205a434271e2a57859d37e2fabee1ec8b4ec43b0fcffd36d2cc51f SHA512 0863d87b5c2982176c851f46664dfc9a6ee8316185407438f494e0490d74dc51ce300b44142bfea5dd1aa12582d72e5563b5359270f8fc1fefc78437eeec5e95
 DIST typed-arena-2.0.2.crate 11848 BLAKE2B 1d2821519c959b8e5f32942fb106f836a9aa753a43058cad6898588f8e0d9abcbe7a94a91ec8d30c62e59833563df48229c6aeec8bf7a396de20895e39571d11 SHA512 33f43488ff63ab763e4330d124e3290ece41e50ab78b6f12dae3a2be4d7f5bdf6ec876ab3b1f8cd81874e335fc41f3a2254994f250d3d6aba682fce557a6a399
 DIST unic-char-property-0.9.0.crate 6809 BLAKE2B d2bb66259b66e59e831ad74d89528882336a7cf6dfac7a9f49308a70a3d61d5ab88f3ade9df2c086f27ff4a6eae0d2d2b8e63bd154ce3e700cc525769f34542a SHA512 ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d
 DIST unic-char-range-0.9.0.crate 7020 BLAKE2B ab79b4298b999a9fbb769bf191f83e259b40b8d06cc5cb82abac48434162216a283fa82c1bc9af8b40656c2d06e5b6a919ff7888852eabb9001a92db12fa48d7 SHA512 bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb
@@ -343,8 +365,10 @@ DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d91
 DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1a8252c4e695de619fc8e5eee1595343c857651774b3670d13392144e9d7df579f2e226842aa7e4e023a76fb65 SHA512 44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa
 DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
 DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 DIST uuid-1.9.1.crate 47492 BLAKE2B 195f14f6ed60809c5be69a7bf5905fea0ed36588563f741d3100aaf2837dd5db26bc8557f239dfccbc27b92f806eb7fc03d365dcd7444437882e7bbca3aa2138 SHA512 4d2a728155eea2fb065f72df36bf88092d0f7edb4d1a1472e380943ceba9cf7b396364238fbf33d5f8d7891664c94daa56f3dd58148258644ffb539d5804111e
+DIST uuid-macro-internal-1.10.0.crate 9165 BLAKE2B ce7bb518752c74a8109ea24825feb1d77ce1132e0ffa6e61c411a2e1094877d527f98cc788b881b6edc464d4c606186a46ba979cd83dfac6b7ed3c77f96ce7a2 SHA512 5fbef2d1e2bf85da19abdfa30cebb42c634e46d25380547312eee062e807c440a5d67824ff77262b237da037a60624bff166b567d6edbbd0e18e133ba3357673
 DIST uuid-macro-internal-1.8.0.crate 9135 BLAKE2B de6d4b9891a39f1155ac34cd862b24ba93db87ad288bb8e8e83edff0eec35f87e4a47025ffcfb0ef211d5e0e1b446bf4f9b3f2109354ee7e4d83e54e48404aa0 SHA512 5e416f37953f50f98f97120a7cde52360d5ed0f135165117c165db288055c9a65e51f3124eebab420dd8bf65c14c63a3c67d36ef4737b4f1ad0740d3df71e5f3
 DIST uuid-macro-internal-1.9.1.crate 9164 BLAKE2B ddf3cdc6e19426f26bf2aa2cda1583de8fa2ed241dedb9b0314e403586a2b8a198b084831bfb2318da99555899199c16d5cf0388cd14c2d25b3700ff28666017 SHA512 d38f1f26df4534630951c102a818bc2b05e1458ca94e5bff9c5aa7329934b1d192d6cd323dc8e6558b2e9d5a5815fbb55015700328f94fe297fb24758c7cb3e4
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
@@ -412,4 +436,6 @@ DIST zstd-sys-2.0.11+zstd.1.5.6.crate 749078 BLAKE2B 6be19b2ea22e557a6b38bdb37c9
 EBUILD ruff-0.4.10.ebuild 9807 BLAKE2B b35c1bfcc8167422ecfcce42d542e9211aeca501442eea3f15f49d5e47058971a4e534171bc3c930eb1ca38973d3b3ce9aa7cfd37317a3c2e82da7819d7519b3 SHA512 6b21705671ede294be09371016b637c5d2963446633e58a924f8ede2815e84600a5132094dd0b083123db4de99af1fa886feb7a7c1e5183bb742cc89ec29d148
 EBUILD ruff-0.5.0.ebuild 9145 BLAKE2B b776169d7b3bc01c9e19f97246d22827ff9e55b891771c89a8403d8828e920a11e408ed446c17c26b99b8856162e5dcf8c7062b4fba9fdcabd66ae698d490697 SHA512 de1f258304e7f133a2e086fee4e3c06e07301f7485eefaa590788024f7dde82e00ff3c9bc999bca832f485ec467f684e705c1e0af54190e02c0eb5cf9702f520
 EBUILD ruff-0.5.2.ebuild 9138 BLAKE2B 7d40557fef4c04f5f24c03efeabc1019744c783f2742377742513d9de2542b9bcdfa91a6c2819b848e1d9a76e469e71f7e726f2ae228a25dd7a5267b8c19db9e SHA512 a05e34105a01555f44f7aa5fde9a919f211a770c019b77ce15641bb8bcde67e8535c4b6ccfd15ec9dd8e6abf62f718a5cadf43c2e9eba8cde5c5b530f63f6488
+EBUILD ruff-0.5.4.ebuild 9148 BLAKE2B 25ec396c24bc497d7afb4a0b28c980358c9eaf393d0ae2d8bb7cdf877b12362430a962a5454edb2179f4de004bd0ef4aaf87449c1f93edcd317642560b138513 SHA512 d853dab056b2e3964e57b1c7a5553616a595b0ca95c364058ca24684bacda8a734c456fd39961fa11f90a592258bcfe1a60dac0007d18789d8eebf988baf2e56
+EBUILD ruff-0.5.5.ebuild 9187 BLAKE2B 4e62deb6c6bcef73f9b9d57dc9a0c7e270430dc17118330dd580a5b96f196d816c73424dd95071902890a1a17ed78b90a71261e85f0aa51b5d063072c4968f9f SHA512 52cea283f7243cbd0a38fd20f5efa052afe32c0f4bb5eb4d77ef3b3d01a732a72956bacf704b64af9de39e644a46d73d39500f49dac6403407c88bdfe3de69a4
 MISC metadata.xml 480 BLAKE2B 6ddd486a0e095df64a5bb79eaccda8d230e05172dce0b05261e5bd8b2bc5d9c9dac19c69677dc88fb38ca8b5da4dbb203ccfe5c11176cfc9a488e74fdda4e4ec SHA512 9b29a47558bb67d83ff0e2da03096e0c4bfdd4d70146d4e084c590712a17f3823afb0318eac6501ff36ef457e5287c7161502115ea78b3aaf7042fa4ed865195
diff --git a/dev-util/ruff/ruff-0.5.4.ebuild b/dev-util/ruff/ruff-0.5.4.ebuild
new file mode 100644
index 000000000000..6db7d54d113e
--- /dev/null
+++ b/dev-util/ruff/ruff-0.5.4.ebuild
@@ -0,0 +1,457 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.2
+
+EAPI=8
+
+CRATES="
+	Inflector@0.11.4
+	adler@1.0.2
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.16
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	annotate-snippets@0.6.1
+	annotate-snippets@0.9.2
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.86
+	arc-swap@1.7.1
+	argfile@0.2.0
+	arrayvec@0.7.4
+	autocfg@1.2.0
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bstr@1.9.1
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	cachedir@0.3.1
+	camino@1.1.7
+	cast@0.3.0
+	castaway@0.2.3
+	cc@1.0.95
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chic@1.2.2
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.9
+	clap_builder@4.5.9
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.8
+	clap_lex@0.7.0
+	clearscreen@3.0.0
+	codspeed-criterion-compat@2.6.0
+	codspeed@2.6.0
+	colorchoice@1.0.0
+	colored@2.1.0
+	compact_str@0.8.0
+	console@0.15.8
+	console_error_panic_hook@0.1.7
+	console_log@1.0.0
+	core-foundation-sys@0.8.6
+	countme@3.0.1
+	crc32fast@1.4.0
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.19
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	ctrlc@3.4.4
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.0.1
+	diff@0.1.13
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	drop_bomb@0.1.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_logger@0.11.3
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.0.2
+	fern@0.6.2
+	filetime@0.2.23
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.1
+	globset@0.4.14
+	half@2.4.1
+	hashbrown@0.14.5
+	hashlink@0.8.4
+	heck@0.5.0
+	hermit-abi@0.3.9
+	home@0.5.9
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	idna@0.5.0
+	ignore@0.4.22
+	imara-diff@0.1.6
+	imperative@1.0.5
+	indexmap@2.2.6
+	indicatif@0.17.8
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta-cmd@0.6.0
+	insta@1.39.0
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.5
+	is-terminal@0.4.12
+	is-wsl@0.4.0
+	itertools@0.10.5
+	itertools@0.13.0
+	itoa@1.0.11
+	jobserver@0.1.31
+	jod-thread@0.1.2
+	js-sys@0.3.69
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.155
+	libcst@1.4.0
+	libcst_derive@1.4.0
+	libmimalloc-sys@0.1.39
+	libredox@0.1.3
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.13
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.6
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.4
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	natord@1.0.9
+	newtype-uuid@1.1.0
+	nix@0.28.0
+	nom@7.1.3
+	notify@6.1.1
+	nu-ansi-term@0.46.0
+	nu-ansi-term@0.50.0
+	num-traits@0.2.18
+	number_prefix@0.4.0
+	once_cell@1.19.0
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.0
+	os_str_bytes@6.6.1
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.14
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.1
+	peg-macros@0.8.2
+	peg-runtime@0.8.2
+	peg@0.8.2
+	pep440_rs@0.4.0
+	pep440_rs@0.6.0
+	pep508_rs@0.3.0
+	percent-encoding@2.3.1
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_shared@0.11.2
+	pin-project-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	pretty_assertions@1.4.0
+	proc-macro2@1.0.86
+	pyproject-toml@0.9.0
+	quick-junit@0.4.0
+	quick-xml@0.31.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_users@0.4.5
+	regex-automata@0.1.10
+	regex-automata@0.4.6
+	regex-syntax@0.6.29
+	regex-syntax@0.8.3
+	regex@1.10.5
+	ring@0.17.8
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.0.0
+	rustix@0.38.34
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.5
+	rustls@0.23.10
+	rustversion@1.0.15
+	ryu@1.0.17
+	same-file@1.0.6
+	schemars@0.8.21
+	schemars_derive@0.8.21
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	seahash@4.1.0
+	serde-wasm-bindgen@0.6.5
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_derive_internals@0.29.0
+	serde_json@1.0.120
+	serde_repr@0.1.19
+	serde_spanned@0.6.6
+	serde_test@1.0.176
+	serde_with@3.9.0
+	serde_with_macros@3.9.0
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	similar@2.5.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	static_assertions@1.1.0
+	strip-ansi-escapes@0.2.0
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.5.0
+	syn@2.0.71
+	synstructure@0.13.1
+	tempfile@3.10.1
+	terminal_size@0.3.0
+	terminfo@0.8.0
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.62
+	thiserror@1.0.62
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.8.14
+	toml_datetime@0.6.6
+	toml_edit@0.22.14
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing-indicatif@0.3.6
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing-tree@0.3.1
+	tracing@0.1.40
+	typed-arena@2.0.2
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-ucd-category@0.9.0
+	unic-ucd-version@0.9.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-width@0.1.13
+	unicode_names2@1.2.2
+	unicode_names2_generator@1.2.2
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.10.0
+	url@2.5.2
+	utf8parse@0.2.1
+	uuid-macro-internal@1.9.1
+	uuid@1.9.1
+	valuable@0.1.0
+	version_check@0.9.4
+	vt100@0.15.2
+	vte@0.11.1
+	vte_generate_state_changes@0.1.1
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-futures@0.4.42
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen-test-macro@0.3.42
+	wasm-bindgen-test@0.3.42
+	wasm-bindgen@0.2.92
+	web-sys@0.3.69
+	webpki-roots@0.26.1
+	which@6.0.1
+	wild@2.2.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	winnow@0.6.6
+	winsafe@0.0.19
+	yansi-term@0.1.2
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zeroize@1.7.0
+	zip@0.6.6
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-sys@2.0.11+zstd.1.5.6
+	zstd@0.11.2+zstd.1.5.2
+"
+
+declare -A GIT_CRATES=(
+	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;a1bf3a613f451af7fc0a59411c56abc47fe8e8e1;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;a1bf3a613f451af7fc0a59411c56abc47fe8e8e1;salsa-%commit%'
+)
+
+inherit shell-completion cargo
+
+DESCRIPTION="An extremely fast Python linter, written in Rust"
+HOMEPAGE="
+	https://docs.astral.sh/ruff/
+	https://github.com/astral-sh/ruff
+"
+SRC_URI="
+	${CARGO_CRATE_URIS}
+	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+	WTFPL-2
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+# libcst
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+
+BDEPEND="
+	>=virtual/rust-1.71
+"
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/zstd
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_compile --bin ruff
+
+	local releasedir
+	releasedir=$(cargo_target_dir)
+
+	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
+	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
+}
+
+src_test() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_test
+}
+
+src_install() {
+	local releasedir=$(cargo_target_dir)
+
+	dobin ${releasedir}/ruff
+
+	newbashcomp ruff-completion.bash ruff
+	newzshcomp ruff-completion.zsh _ruff
+
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/ruff/ruff-0.5.5.ebuild b/dev-util/ruff/ruff-0.5.5.ebuild
new file mode 100644
index 000000000000..32ece35aca99
--- /dev/null
+++ b/dev-util/ruff/ruff-0.5.5.ebuild
@@ -0,0 +1,457 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.2
+
+EAPI=8
+
+CRATES="
+	Inflector@0.11.4
+	adler@1.0.2
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.16
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	annotate-snippets@0.6.1
+	annotate-snippets@0.9.2
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.86
+	arc-swap@1.7.1
+	argfile@0.2.0
+	arrayvec@0.7.4
+	autocfg@1.2.0
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bstr@1.9.1
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	cachedir@0.3.1
+	camino@1.1.7
+	cast@0.3.0
+	castaway@0.2.3
+	cc@1.0.95
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chic@1.2.2
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.9
+	clap_builder@4.5.9
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.8
+	clap_lex@0.7.0
+	clearscreen@3.0.0
+	codspeed-criterion-compat@2.6.0
+	codspeed@2.6.0
+	colorchoice@1.0.0
+	colored@2.1.0
+	compact_str@0.8.0
+	console@0.15.8
+	console_error_panic_hook@0.1.7
+	console_log@1.0.0
+	core-foundation-sys@0.8.6
+	countme@3.0.1
+	crc32fast@1.4.0
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.19
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	ctrlc@3.4.4
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.0.1
+	diff@0.1.13
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	drop_bomb@0.1.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_logger@0.11.3
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.0.2
+	fern@0.6.2
+	filetime@0.2.23
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.1
+	globset@0.4.14
+	half@2.4.1
+	hashbrown@0.14.5
+	hashlink@0.8.4
+	heck@0.5.0
+	hermit-abi@0.3.9
+	home@0.5.9
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	idna@0.5.0
+	ignore@0.4.22
+	imara-diff@0.1.6
+	imperative@1.0.5
+	indexmap@2.2.6
+	indicatif@0.17.8
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta-cmd@0.6.0
+	insta@1.39.0
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.5
+	is-terminal@0.4.12
+	is-wsl@0.4.0
+	itertools@0.10.5
+	itertools@0.13.0
+	itoa@1.0.11
+	jobserver@0.1.31
+	jod-thread@0.1.2
+	js-sys@0.3.69
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.155
+	libcst@1.4.0
+	libcst_derive@1.4.0
+	libmimalloc-sys@0.1.39
+	libredox@0.1.3
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.13
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.6
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.4
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	natord@1.0.9
+	newtype-uuid@1.1.0
+	nix@0.28.0
+	nom@7.1.3
+	notify@6.1.1
+	nu-ansi-term@0.46.0
+	nu-ansi-term@0.50.0
+	num-traits@0.2.18
+	number_prefix@0.4.0
+	once_cell@1.19.0
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.0
+	os_str_bytes@6.6.1
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.14
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.1
+	peg-macros@0.8.2
+	peg-runtime@0.8.2
+	peg@0.8.2
+	pep440_rs@0.4.0
+	pep440_rs@0.6.0
+	pep508_rs@0.3.0
+	percent-encoding@2.3.1
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_shared@0.11.2
+	pin-project-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	pretty_assertions@1.4.0
+	proc-macro2@1.0.86
+	pyproject-toml@0.9.0
+	quick-junit@0.4.0
+	quick-xml@0.31.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_users@0.4.5
+	regex-automata@0.1.10
+	regex-automata@0.4.6
+	regex-syntax@0.6.29
+	regex-syntax@0.8.3
+	regex@1.10.5
+	ring@0.17.8
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.0.0
+	rustix@0.38.34
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.5
+	rustls@0.23.10
+	rustversion@1.0.15
+	ryu@1.0.17
+	same-file@1.0.6
+	schemars@0.8.21
+	schemars_derive@0.8.21
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	seahash@4.1.0
+	serde-wasm-bindgen@0.6.5
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_derive_internals@0.29.0
+	serde_json@1.0.120
+	serde_repr@0.1.19
+	serde_spanned@0.6.6
+	serde_test@1.0.176
+	serde_with@3.9.0
+	serde_with_macros@3.9.0
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	similar@2.5.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	static_assertions@1.1.0
+	strip-ansi-escapes@0.2.0
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.5.0
+	syn@2.0.72
+	synstructure@0.13.1
+	tempfile@3.10.1
+	terminal_size@0.3.0
+	terminfo@0.8.0
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.8.15
+	toml_datetime@0.6.6
+	toml_edit@0.22.16
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing-indicatif@0.3.6
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing-tree@0.4.0
+	tracing@0.1.40
+	typed-arena@2.0.2
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-ucd-category@0.9.0
+	unic-ucd-version@0.9.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-width@0.1.13
+	unicode_names2@1.2.2
+	unicode_names2_generator@1.2.2
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.10.0
+	url@2.5.2
+	utf8parse@0.2.1
+	uuid-macro-internal@1.10.0
+	uuid@1.10.0
+	valuable@0.1.0
+	version_check@0.9.4
+	vt100@0.15.2
+	vte@0.11.1
+	vte_generate_state_changes@0.1.1
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-futures@0.4.42
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen-test-macro@0.3.42
+	wasm-bindgen-test@0.3.42
+	wasm-bindgen@0.2.92
+	web-sys@0.3.69
+	webpki-roots@0.26.1
+	which@6.0.1
+	wild@2.2.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	winnow@0.6.6
+	winsafe@0.0.19
+	yansi-term@0.1.2
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zeroize@1.7.0
+	zip@0.6.6
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-sys@2.0.11+zstd.1.5.6
+	zstd@0.11.2+zstd.1.5.2
+"
+
+declare -A GIT_CRATES=(
+	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;a1bf3a613f451af7fc0a59411c56abc47fe8e8e1;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;a1bf3a613f451af7fc0a59411c56abc47fe8e8e1;salsa-%commit%'
+)
+
+inherit shell-completion cargo
+
+DESCRIPTION="An extremely fast Python linter, written in Rust"
+HOMEPAGE="
+	https://docs.astral.sh/ruff/
+	https://github.com/astral-sh/ruff
+"
+SRC_URI="
+	${CARGO_CRATE_URIS}
+	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+	WTFPL-2
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+# libcst
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+
+BDEPEND="
+	>=virtual/rust-1.71
+"
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/zstd
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_compile --bin ruff
+
+	local releasedir
+	releasedir=$(cargo_target_dir)
+
+	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
+	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
+}
+
+src_test() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_test --target-dir "${PWD}"/tested-target/
+}
+
+src_install() {
+	local releasedir=$(cargo_target_dir)
+
+	dobin ${releasedir}/ruff
+
+	newbashcomp ruff-completion.bash ruff
+	newzshcomp ruff-completion.zsh _ruff
+
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index a6582c99c2d3..b13c4ecf4efc 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -182,6 +182,8 @@ DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7
 DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
 DIST selenium-manager-4.14.0.tar.gz 78721372 BLAKE2B f57f5ed30f4439a83308909f5233187f924476de455d9b6504255e56a3217844d206968a96963c0f824c1a7dc5e69a196dde50a0cfb291820e6690be67a87c5e SHA512 b3b3f375ef0589cdc2afb454b50678ebe881d08cea841c697c9a5a4d745fc8ac84f941d2f5bbea9082c6e0c7052b7c5f08207947bb4389b0322c257dc81dcc89
 DIST selenium-manager-4.15.0.tar.gz 78935989 BLAKE2B 5ff5f620d206ece245a3166cbc77813ec8b5cc79942ad7e5b04df6ed02a0039b1b7af2af4b312cbcfd0e998aab25f4659e3c6aff52ac6d112c9440d49076fb69 SHA512 584e1637202681c2d60418a8e0bf7f8d28cf0edf901f076647c44996a589844a80db27ba52f1cdd22e5af5cc2ccfc890c0c6690a15d0656a35c8ebb9c20e5ee9
+DIST selenium-manager-4.23.0-crates.tar.xz 26763004 BLAKE2B b7f584637ae436f0c867ecaef2a04ba4a58178bdffce6f15a702bb6d254368303f7b2d9c1b50e950717deffc8ffe3bbbfc92ff14cd8f472f00387e4c114e924d SHA512 1dd54ae66b7ae93cb061c538140c64062b9185d18801fc759c67945792d59f2c3033f7173216d78f0b493db0000b4efd5cdb0e405b6f7aa242f5fa2472f88811
+DIST selenium-selenium-4.23.0.gh.tar.gz 77114209 BLAKE2B ce8b2be71c4bcf83eed5e16d4770f8aa9075cd29c69ab5a019c763e65f1417094bb9e97a2d5ce5bbc773029e187ab3dee4e8296bbef1bbec580e2935b1c8f258 SHA512 0ef7bdba5a1d592e6e9adadd6e3cb0da4949822c61b2787f6d3f282f615f1de692ff775b0ea3e3f179736a685a8543bf6e4790c1a03932ccfe5933719a2bb9a3
 DIST semver-1.0.17.crate 29685 BLAKE2B b9beb685eb9f6cffe557d1185997e1a93d0e50ecd8e9719d9855347f12dd430ed1020df81839b7924a984596437ae7fb2951e7ae44c5540692a7f37b591bee2e SHA512 5199923757e675506d68c252182b10f55955e47054880492e5471a0a0f9ad13ef25d552d2ab9bd68fba37121b8026d9989bf15db67e95265b3aa53d06377fda7
 DIST serde-1.0.185.crate 77337 BLAKE2B 602d8ce302f73327ce0dcfcdc5377408f4805be8a22ef93496fa31be512985188111c131b6dfaf110069ddbc45a9fdcdb8409d14689422fedcffa652e5a5000f SHA512 0c48d6ac7916104e108025c3ddf88a7e98b98ffaa98fcb7ff9eecbc4d3ed5930efbcb0de9e4072f795a3cbfa12aa5e17ee7eeeed948a7c99453c9a9d0c9985c3
 DIST serde-1.0.189.crate 76276 BLAKE2B e4cf8d9608f341007f9a92af434395659511238040ddd2cec137539a51c05b949f79c4965ad9ec25f67a72fe8341573f2d1075766f7ab5842a107b12e0468a3a SHA512 3fb1732f6866db8412cbc4ceb57bc8f90cbee005e2687a388b052e5b94dd464aebff57a91cc8ce5da62508bfbd6cc4e14a524090a5fa60724cc9bd1bb5ea1035
@@ -288,4 +290,5 @@ DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff
 DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b
 EBUILD selenium-manager-4.14.0.ebuild 6475 BLAKE2B cd9d6452b09ca6ea22bc8643881e5543478bde4b1315a934214768baef71df47b0df6b77012cba8829aaed9cfb0b75601a0e71de1907a20e7c60b79dde686c07 SHA512 ebe7971cfe43cbdbeada3d34bcd3a70c35eb12a4d46360f05210d29c4ac1c629fa03c8193f7c31ae4570197bf888fbe45a6d661afd88f72872c85fb7c1a0bc1e
 EBUILD selenium-manager-4.15.0.ebuild 6660 BLAKE2B 472d51687b6e8ac85ae01386c4c093a14a0073a025d9e59f132ced2406ccf404ae131bc2e40d25aaa7dc4f6f2314b3f015774ce15766ff7b4969d688134e13ec SHA512 228d28e31f342b19141a145cf053174f64ea6fec8318a69ef65f7e77fe3549c35e8de750522c90516aba98c548b0a347fafdf25201426b46ec27db8301b3d662
-MISC metadata.xml 342 BLAKE2B c293221b7d3260a1cca03f556d8d7879bfb8b0ae4b0075c02c3f77b73a92a4bdade63684364f2d2b7da64bbd66d95911ed48da0df3535a83a29325e207f69933 SHA512 c4196570c7af8bb2d3ddcb8486ac44c36e39a82c20fd0f657c154d6b23bef9f24d2581253c76e37a8a2d0ad1cfdd78722ff61f244d30aac8f20b4518e85659ae
+EBUILD selenium-manager-4.23.0-r1.ebuild 1942 BLAKE2B e51e170341af9ecf19c865c1d56824009698c454585c39342ba683742a47c84982b829ed56829f077094084c746bf0ca4793f434f20cd54a8703d5ac7c368020 SHA512 51596b7a89c37abb70f3e4842e4d8494383b699709976c45bc5ca009e4ebf7d53541b23115ae9b5147cc8572a381781d395d911ade15e8819b0fff5cf6b59157
+MISC metadata.xml 585 BLAKE2B 9810f0d387f5d0b8c6be3efd0bb41c04ccd0a47911b0d2fdd2722a9e2e00c590c27eb449449df764540c10359b698749c8de7a7e1abca2f8010dbaa649add6ca SHA512 2c1c2153adbf1af5a48bec25fd5879dc4dd4346f5ef5d37f1ed4abb8bbcf841870eed4ecd35ce69c50a861e0f50890fb2ee3da7c4980a29468acc6ecd54ecebd
diff --git a/dev-util/selenium-manager/metadata.xml b/dev-util/selenium-manager/metadata.xml
index 6c0a26cb93f5..3f8eb3fb2167 100644
--- a/dev-util/selenium-manager/metadata.xml
+++ b/dev-util/selenium-manager/metadata.xml
@@ -5,7 +5,16 @@
     <email>graaff@gentoo.org</email>
     <name>Hans de Graaff</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">SeleniumHQ/selenium</remote-id>
   </upstream>
+  <use>
+    <flag name="telemetry">
+      Disable sending telemetry by default (avoid-stats config option).
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-util/selenium-manager/selenium-manager-4.23.0-r1.ebuild b/dev-util/selenium-manager/selenium-manager-4.23.0-r1.ebuild
new file mode 100644
index 000000000000..02782b497544
--- /dev/null
+++ b/dev-util/selenium-manager/selenium-manager-4.23.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+inherit cargo
+
+TAG=selenium-${PV}
+MY_P=selenium-${TAG}
+DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
+HOMEPAGE="
+	https://www.selenium.dev/
+	https://github.com/SeleniumHQ/selenium/
+"
+SRC_URI="
+	https://github.com/SeleniumHQ/selenium/archive/selenium-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${P}-crates.tar.xz
+	"
+fi
+S="${WORKDIR}/${MY_P}/rust"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="telemetry test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		|| (
+			www-client/firefox
+			www-client/firefox-bin
+		)
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e '/strip/d' Cargo.toml || die
+	if ! use telemetry; then
+		sed -i -e '/avoid-stats/s:false:true:' src/config.rs || die
+	fi
+
+	# Avoid tests requiring Internet or specific browsers (or trying
+	# to fetch them, whatever).
+	rm tests/browser_download_tests.rs || die
+	rm tests/exec_driver_tests.rs || die
+	rm tests/grid_tests.rs || die
+	rm tests/browser_tests.rs || die
+	rm tests/config_tests.rs || die
+	rm tests/iexplorer_tests.rs || die
+	rm tests/mirror_tests.rs || die
+	rm tests/stable_browser_tests.rs || die
+	rm tests/webview_tests.rs || die
+}
+
+src_test() {
+	local -x PATH=${T}/bin:${PATH}
+
+	mkdir "${T}/bin" || die
+	if ! has_version "www-client/firefox"; then
+		# upstream expects "firefox" rather than "firefox-bin"
+		ln -s "$(type -P firefox-bin)" "${T}/bin/firefox" || die
+	fi
+
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	dodoc README.md
+
+	newenvd - 70selenium-manager <<-EOF || die
+		SE_MANAGER_PATH="${EPREFIX}/usr/bin/selenium-manager"
+	EOF
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 57f05e51814c..efeff070e1ac 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.283.0.tar.gz 472294 BLAKE2B b3d567006c3c584e6ceb8b0f28be62ac9c98bd1ee24152ecf4d8916e5140e4653b7940d86471f22fb1852abe73a3dff2963ce30c6a8615d04c59a91e99430b8d SHA512 2bb52f532a8a07d6eaf7e348fc79e798511740e3f6b3fb2d1de8834335598f57555c638e07e906935e94a26a1f71704f5ca1dd0dcc8d099b2d722d217f9591fa
+DIST spirv-headers-1.3.290.0.tar.gz 521685 BLAKE2B f6179e8666a66c2f512153a3574ea252925020903739956f06eb24972ab5dc063dc19692b5c5eee96a3106db6bce652b625209cbcfd587ee73cd95a960ddffdd SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
 EBUILD spirv-headers-1.3.283.0.ebuild 779 BLAKE2B cab82b4ec21fbfe852e435b5768f91ea8740686020dc423ce2c85a2097a03a2680c0f51b4696340f4de9905b42c7679a16440a8e1d025f753fc6e061e5d5562d SHA512 eac6f8a3f8af8d13905f1931b6cc634617c3629e00055186ce8367600eda0ab54fb7bfa0ed7b44bcac72beec0cfc341a8898e361e8beddddc41a03e98d532090
+EBUILD spirv-headers-1.3.290.0.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
 EBUILD spirv-headers-9999.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
new file mode 100644
index 000000000000..d0ba40d7e45e
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://registry.khronos.org/SPIR-V/ https://github.com/KhronosGroup/SPIRV-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPIRV_HEADERS_ENABLE_TESTS=OFF
+		-DSPIRV_HEADERS_ENABLE_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index a956005b2bac..00cfe3377523 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -7,8 +7,10 @@ DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b
 DIST spirv-llvm-translator-16.0.0.tar.gz 1542060 BLAKE2B bee72a776062266e60c5237396434ecba4e4da959ed52292ad08388bdd08d7749fd86cfac5c25af424032a1ba19f59b2d8c7eac0eaf50db6a4945841abe0836f SHA512 0bacacb89aa2b03d1173d1bfbcdd83fdce7441ebc3fff65e14dc5e901fc983861365a54c029b2a65075b6fa45046c30aa7bbad4e6150cf3382e7d050c598de98
 DIST spirv-llvm-translator-17.0.0.tar.gz 1601166 BLAKE2B c3e7a78fa55cd13ba61c024e2d3d82c47ac9dbf8c11bcbcf4ddc34a6838fb948885a263fd9af2d0f404b31f4c6e9226c9582e0f65b3220770e1af07cf85f4dac SHA512 ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c
 DIST spirv-llvm-translator-18.1.2.tar.gz 1694843 BLAKE2B 13409096e6ae69509a393741d674a89f5468797fd3ce51c06c69a766f1d34ba952b915013f1bc2aff3ea1524e863a81609d7179096a7b8141ded64a6b366546c SHA512 889cdc0960f6029129dad62f7afe6f61b51bed9d8fb9fa6b743318e2243252dce62cbacf71a2b56decec24ce37746b4b4787dd426ad76e2feb74e1781cb070c8
+DIST spirv-llvm-translator-18.1.3.tar.gz 1700577 BLAKE2B 0d92c6259956db9cb4a49c521dff7cbc0c4353ac779372bb92efb8ff4b1aa61d11ec35b56059e9d4ef22170e6550ba6eadd50f07b97811a65c81113758efeec6 SHA512 b47f4ddd2f404aaaa23e7eabe1450e7cc622809fcb0fb8679647b0f06e6340d36fc63286120580277db59e5a95ad61f086d61072adeeb060a5964436dca97186
 EBUILD spirv-llvm-translator-15.0.0-r1.ebuild 1371 BLAKE2B ab7fb7701634812654c2b3410190715c581369550385ac275588fff286d02d62c17fc4a75f97ba4082a707d18d5eb55e38f2aac290bc4abe3c676da98ab04b53 SHA512 e58d8f2d6b9474d8426242f90a567dda559228e5e783a6dd965bfae20976008a468075ee615aaf4139a167dd13efb038a7d064dd2ca998899d6b4ba8cb07f402
 EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1531 BLAKE2B 07ae6fb702fe5bc915ab9f07cff253f7c6f2049e013f5d0d77a6d7ae020a8bfb9522b6159327e5684b9f081a48aaf467556d26c792ae65fdac6b16ad3b4b1035 SHA512 70bcfeeb07c2089a7b43f8df82492ea1aecd957fdf582cbd710b8484689796c11234369f3fd324222f3de1dffdcf7eccc482da387be962cfb74f96b18711e436
 EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1512 BLAKE2B 9e642681cc67196b91532b36b44ec2817161d25423d057f6bd91fedacada2e33d12946257ff54c337143d0fbfc9d11f29816cfb485404685d209be906e75097f SHA512 96961a3225f9c10eb317741b39091341e40202e07b7a07434182e78f9b8ce5451f44b6ae8011d7e9f95b640157f2a5cf04c56b77d6b5647c806dea6fb09c97f1
-EBUILD spirv-llvm-translator-18.1.2.ebuild 1393 BLAKE2B 507e4728908a6fc5233764a3ade2b3cfffb7487e1eb2c4b9eb4b03c536d9bf3692d0c05be8bbf7b3160832c3a442bb3ad0b653e6515bd595f1503d2d87a2ba48 SHA512 0a0ede4782a3058d601ad4074d5157373dbc1f0d79f4ae2f2e871606c79275394ea38dfd1e9e25ac7aa5ce533cc5875392b6b7c7ef32845330bbb51987153c42
+EBUILD spirv-llvm-translator-18.1.2.ebuild 1390 BLAKE2B 26808cbccd8d7059134bf78f8846f09c3f8ed85c3153cb10659c01fa3240df851dbe9d9811821b83a2ea7e25f17d8fc1fe3595ca1a0a111c4d41e5a0029772c8 SHA512 78f8439a0fbc203e1723cdb9deb1eafad691cd3a545a9a6f0a530716df020a28d74bb74b529e7129d1c0d301f302fe1b5cf46040f56a6107013e3f18419a89ff
+EBUILD spirv-llvm-translator-18.1.3.ebuild 1379 BLAKE2B 7ff8eb133abbde5f8df3a2037de838b009135bf31143b31345648473c63ff1b834f17c8b27db507b12c3dc7d38462452a5f5485ab933887aabd0c4357bea510e SHA512 b02d7bfe338bbb9118476e7ca0ba0c1165dbeff0491e77f4ddd8e31b5df62232fccad71f6983ff1e0cde32a45cee3bff452fb23ef1d6c1b8bf49f78fb25363cf
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.2.ebuild
index 63f846f23177..6b7af0fa2094 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.2.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild
new file mode 100644
index 000000000000..d14939439935
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic llvm-r1 multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-tools
+	sys-devel/llvm:${SLOT}=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/spirv-headers-1.3.280
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		sys-devel/clang:${SLOT}
+	)
+"
+
+PATCHES=(
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
+	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 98c3cc9d6ef5..8ea12daf2452 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-1.3.283.0.tar.gz 3177854 BLAKE2B 385ee01d6559d84711c1ba1a0256ecb91472bdfce920560011678e042df1a921378b234812a446ce49d46697549f202309382d10d69b1e29e53d0394ebbd3f23 SHA512 45c521307c8df2d74bdf811a50ff37028a45a77f58dcac910924f3490dfe3f8e9dacace77dab989d8d261528cd0f0a8e36ca7627dda608b9b09afb2e374736e5
+DIST spirv-tools-1.3.290.0.tar.gz 3170780 BLAKE2B 37609534f77e411ffb90e2904e847b2baec80332b5f3d3d3fb6950d835f9526fb95778d4c903574cf8be142370a69cace50d2e69d41e2eccf5f74a764464c148 SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
 EBUILD spirv-tools-1.3.283.0.ebuild 1147 BLAKE2B c2204a99fcd4bf40da0f0386e32faf2393df4586e83e0db848a099f1dacb052538da626dd6457c1765a7379314879d16d437a46f3540fbc6e38f6d87f970a50f SHA512 e258bb7ae9a89b7d0ddb984f13ce244238e36c2dd0a480cc19980b0c5d15cabf0e67c9b895c40def8c985ca9b45cbe34038002466f5e31660d3448e8882ef319
+EBUILD spirv-tools-1.3.290.0.ebuild 1153 BLAKE2B e82b880ff4d815d41885a444aac1f4412d852f789556952bfde1bae0e13fbd9a8e3e0676de360070ad12f4591154eeba2ffe1fe5e331afc44f855bbd7c0368b4 SHA512 42f8dd7d74746f2fc22d615759b37da862ca93b85890235637dd544309d8de8e5dad058a65ca83f2b979112585df412635323944cd4d91f7427138356697b28b
 EBUILD spirv-tools-9999.ebuild 1153 BLAKE2B e82b880ff4d815d41885a444aac1f4412d852f789556952bfde1bae0e13fbd9a8e3e0676de360070ad12f4591154eeba2ffe1fe5e331afc44f855bbd7c0368b4 SHA512 42f8dd7d74746f2fc22d615759b37da862ca93b85890235637dd544309d8de8e5dad058a65ca83f2b979112585df412635323944cd4d91f7427138356697b28b
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
new file mode 100644
index 000000000000..8c5305b6b291
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+DEPEND="~dev-util/spirv-headers-${PV}"
+# RDEPEND=""
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
+		-DSPIRV_WERROR=OFF
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 447fbfdceae7..47e169f157d7 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -2,5 +2,7 @@ AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b77
 DIST nashorn-core-15.4.jar 2167292 BLAKE2B f40349e9f369eed1bb3795622ffe9353c98f35df1d5c2f5f3845d8f1fd5ecea553e11da15d17b9083f6ae2efa4485df131a9a9216499f1c7d440ca4b1d772a2b SHA512 3b560e1ae67d5d5d19250849dee3f813d2c801e56ba85d90439a067378a47f95020910da85b7c8afb6675ea2e25cd274953483efd07e89097656aadc804c8020
 DIST nb190_platform_20231030.zip 26056691 BLAKE2B 7815c08ad60515e8018336452e24c2fb0743d1ef48c58ffd80d371000fa664f8f0053a4c1d56a012b9e50f6714a44c300a915061afebd586f9438abae7867447 SHA512 779256d678c9a13dde4314a5771480c450ae86c49e80ac99eb90a4e9e32e3bc5759128f60a610aecc3ce9e7dbce56b0076b528c8f18a682ebac2dd74cb5a6eea
 DIST visualvm-2.1.8.tar.gz 11630256 BLAKE2B 503866654d969ef127455ce6d3c5d087c7543e100cb8bd8712d15dc3d0530ee3fd31ee571837be9dfe99cb01cbf0ebf7a29084cb16b80d9ebbf5ebc2654f945b SHA512 34329db8be5ab6727d1500e4a7bb07af704c6f815912418bd5fa0a872671f53237054c8fc13129124e5bb8c953bc31a47bb7c857962aa9ed080f16d2b6965331
+DIST visualvm-2.1.9.tar.gz 11781212 BLAKE2B e924134e211a7f0a95d299f21dab2fff35fb0c0f646ea25adc0eb1204628fbec752075380dc6f717ff902f566040cf9ed8186b1470f9277d39742e288142de67 SHA512 ed950c6216185b9d09ed0605729cd02b649df32fef0f204066419bf96f61f63887b7bad082e5434e740f23856270be2b5c0bd35aa825511cb35486059592b3e7
 EBUILD visualvm-2.1.8.ebuild 5699 BLAKE2B 29dc5dfa09f8810b36fc70e2015b98a67fc5d11b9d91971a5badf527202928ab3fde641ef2dbb55acc930ea436399cfdc0439961d1ca34f6cca3c98dbee446e6 SHA512 ea1e5d7fc905b73fba9d2c7d8447bef1532258c0da4b7d15e8387b61bfc005d054c1b8daca86bf5d72ff5b818b1b79aaf441f31d00f9138d0506d048c5ddabdd
+EBUILD visualvm-2.1.9.ebuild 5804 BLAKE2B 763702112f2a2bed8b3c1f0b81d26d18199443d8f81281fa50179a096d314497066d5cf9376f2ab94c9bc85bd0bcbf42efb566e28643b3bd78714834deffc513 SHA512 81cb2a1cf8b75de99df69bf6f4c2d6faecd38ed9f2853b26899b21831831274a8eb2a23920c1ccb0b7b98165af1e79e255db8f01412e2eb96f523070f8b54909
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.9.ebuild b/dev-util/visualvm/visualvm-2.1.9.ebuild
new file mode 100644
index 000000000000..4a81848ea960
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.1.9.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NBV=190
+NBT=20231030
+NBZ=nb${NBV}_platform_${NBT}.zip
+ASM_UTIL_VERSION="9.5"
+ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar"
+FLIGHT_RECORDER_VERSION="8.3.1"
+FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar"
+COMMON_VERSION="8.3.1"
+COMMON_FILE="common-${COMMON_VERSION}.jar"
+ENCODER_VERSION="1.2.3"
+ENCODER_FILE="encoder-${ENCODER_VERSION}.jar"
+LZ4_JAVA_VERSION="1.8.0"
+LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar"
+NASHORN_CORE_VERSION="15.4"
+NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar"
+
+inherit java-pkg-2 desktop
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/oracle/${PN}/releases/download/2.1.8/${NBZ}
+	https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}"
+S="${WORKDIR}/${P}/${PN}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-arch/unzip
+	>=dev-java/ant-1.10.14-r3:0
+"
+
+COMMON_DEPEND="
+	dev-java/jmc:0
+	dev-java/lz4-java:0
+	dev-java/owasp-java-encoder:0
+"
+
+# it does not compile with java 11
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/jdk:1.8
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-java/asm:9
+	dev-java/hamcrest-core:1.3
+	dev-java/jcommander:0
+	dev-java/jna:4
+	dev-java/junit:4
+	dev-java/junit:5
+	dev-java/testng:0
+	>=virtual/jre-1.8:*
+"
+
+QA_PREBUILT="
+	/usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+	/usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so
+	/usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so
+"
+
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	unpack ${NBZ}
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+
+	# link in external libraries
+	ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar"
+	java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \
+		|| die "Failed to link asm util jar"
+	java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \
+		|| die "Failed to link jmc common jar"
+	java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \
+		|| die "Failed to link jmc flightrecorder jar"
+	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
+		|| die "Failed to link lz4 java jar"
+	java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \
+		|| die "Failed to link owasp-java-encoder jar"
+}
+
+src_compile() {
+	eant -v \
+		-Dext.binaries.downloaded=true \
+		-Dant.build.javac.source="8" \
+		-Dant.build.javac.target="8" \
+		build
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{harness,platform}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins launcher/visualvm.conf ${PN}.conf
+	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" \
+		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
+	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" \
+		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
+	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
+		|| die "Failed to set jdk detection"
+
+	# replace bundled stuff
+	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die
+	for name in asm{,-commons,-tree}; do
+		rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die
+	done
+	popd > /dev/null
+
+	pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die
+	rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die
+	for name in jna{,-platform}; do
+		rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die
+	done
+	rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die
+	for name in junit-jupiter-{api,engine,params}; do
+		rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die
+	done
+	rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die
+	popd > /dev/null
+
+	pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die
+	rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die
+	rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die
+	rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die
+	rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die
+	rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die
+	popd > /dev/null
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest
index ad6e6f1a8892..fe59f5197e34 100644
--- a/dev-util/volk/Manifest
+++ b/dev-util/volk/Manifest
@@ -1,4 +1,6 @@
 DIST volk-1.3.283.0.tar.gz 62563 BLAKE2B 08e7b1f442970a51b2a621e0eb0e0fc0b52a814aacfbb6e1bfbd670b9b1c2de043043620ac682e53bd1bde4436760cfa4ea32aadc5f24ab6631733e370ed57fd SHA512 c3c69bfd899bab6b6447534b0c7c82392679c903a5ed2cabd7506ccd96135f332735888f6e2fa71787f6c1eec930bd51aa014db84955d51b5f068af95dcaec4d
+DIST volk-1.3.290.0.tar.gz 62571 BLAKE2B be7495fa0b5509f10259842b5394a651a2b57eb6d607a04b69a43faac2ab10ccc259acbd8445970d12d4111362806b20bf9acc2459438ff15c903d3978f395d7 SHA512 1af3933ab18120ab9418282069ee5a1ba86e8333b6fb1cfc04c85132f9c54ba1d21bbd833fa9e35cfd08edf2867982f19c536c0744569c6a91b0be8b54986e09
 EBUILD volk-1.3.283.0.ebuild 806 BLAKE2B 5ff99f912d5d9381218c0bb0d5ef9c173df362aa70e703bb43c0a98ad8d42a5a369bef79bfad1235aa6424ecf3cfcf4a9b24760ba825e53d4feb34354459f340 SHA512 2ec2e4b82b891f60cbcacf48ae643bf66099c95e435fadc338c86cac5fb257d8bc2e9afec46bd64710a8c52a6d7ef327e9fcfefc305b17b3d2fc8a228dbccd58
+EBUILD volk-1.3.290.0.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
 EBUILD volk-9999.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
 MISC metadata.xml 414 BLAKE2B 90b89b8f8cbc812c68d865df6379c29414f3a329ab31c5e56869d585570125835ae0961dae037bde864562bbb2f78736f0e023a3fad5757690b27d382ca7c7bf SHA512 2add3d201004761e26d8a05f878f221f350daaa6c804fabb856ea423d7fd8ae5a8da49f23c7a402b49db9ec19096736a88b4faf1d6ec44bfc49d769d8ab2bb93
diff --git a/dev-util/volk/volk-1.3.290.0.ebuild b/dev-util/volk/volk-1.3.290.0.ebuild
new file mode 100644
index 000000000000..dfe258834e94
--- /dev/null
+++ b/dev-util/volk/volk-1.3.290.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/zeux/volk.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Meta loader for Vulkan API"
+HOMEPAGE="https://github.com/zeux/volk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DVOLK_INSTALL=on
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index d0a065947018..c48315bcfaad 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.3.283.0.tar.gz 2271561 BLAKE2B 3701754f9d40f4078da491713310d0c615ae0df494b793a8e9ab0db5930a73dfa7876de16d2a93a3e128c922bfceee7651cbda8e51603ff32c687cfa13d300f1 SHA512 317a8b6051da86822c67c110ab41dcc222822e5502391813618c6258ba08e50d8b047605e4567421f47b4bc82f2c1b396bc6d8f2f0a3e202dc164d6c8db96627
+DIST vulkan-headers-1.3.290.0.tar.gz 2284263 BLAKE2B d0013a88fd6336fcd191931952a44b543647f70b1b8b4fc656e271468e94b3aa1f12b7031aac9750cb2792c55f17b520a2c5c93920802449c2e7a1eb114361d7 SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
 EBUILD vulkan-headers-1.3.283.0.ebuild 610 BLAKE2B 8d052a5d7de6a22ef9cf55324cd248b93f6d6e38a9c971179a6b050f446e97d7c610c4e709f8a2f30b1ac4e0e2aec7e758c7623d8fdaf92ec93c83cb86e78a54 SHA512 ad1b048e79fd3acf1ac6c80ba12956af781c32fc6afc3f3b9aee9690d487aa586fcc03c5186c628822d87236c0c989d74f9e9aa5b177a34ed9d69157616225df
+EBUILD vulkan-headers-1.3.290.0.ebuild 616 BLAKE2B 0fe97176826d856524c3045b5343fadc5dccd5444ee0476012efa42cbd59f01f3a786a45a76074619c7440bcda59a43a8ae28562baa8663955b75dd2f5db81cb SHA512 aafb6eeb54209f6d5a4782ff463429ba21dae83305511f1504b35bc3682caf779aa63bfdc1b5156f064c3b9b1a3fd6986e61fa4bd14256311d5547c08e2fbc7f
 EBUILD vulkan-headers-9999.ebuild 616 BLAKE2B 0fe97176826d856524c3045b5343fadc5dccd5444ee0476012efa42cbd59f01f3a786a45a76074619c7440bcda59a43a8ae28562baa8663955b75dd2f5db81cb SHA512 aafb6eeb54209f6d5a4782ff463429ba21dae83305511f1504b35bc3682caf779aa63bfdc1b5156f064c3b9b1a3fd6986e61fa4bd14256311d5547c08e2fbc7f
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.290.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0.ebuild
new file mode 100644
index 000000000000..df7a3c745a49
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 8fe5ba89a3ce..e0634ad244c8 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.283.0.tar.gz 753022 BLAKE2B dbd636186d7674c954f8237e7943f3cb89d172f870d0771d84d5615caec3013f284700a2c07b33a74f12e310e9c1bdd50ef8e93f459b73ace318fb68f33c7503 SHA512 714e2ff89cbd4171dae5c5825b71210572571965ba86c68f38c1ea62c9ff512e1c0dc278c02786d45d3a775985b40e8c1bd47ab37d22668105fd2e09d7524656
+DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 EBUILD vulkan-tools-1.3.283.0.ebuild 2067 BLAKE2B 3c9209c0d62c15724a711a426483b33938ce57661b79cc8434964d70fbaf0baec07c0bac572804ada6a8a8f1e8157efaf21d4f647e0aabf629285ebabff3041a SHA512 3ffe1e3ab44b872f9d7d0e2e3acf7e3acf9011cbb40649f8f473ca4631c71cc1ecf5968fa7403a0e1ad9a7f61b9cb7749a3823c52669ac8e47b1d06bac4ae155
+EBUILD vulkan-tools-1.3.290.0.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
 EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
new file mode 100644
index 000000000000..1c19288ef980
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland X"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}]
+	~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube-wayland
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	if use cube; then
+		if use X; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB)
+		elif use wayland; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND)
+		else
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY)
+		fi
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index cd7d0a1b7e01..fc41ae739b00 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-utility-libraries-1.3.283.0.tar.gz 538236 BLAKE2B 2b3b24fee507b6687685414805759802046241473dd93d7cc21b74957d5db17f6823f3f9cbf532c42de141c7da44c258a08305e25e63622b87f0e5ca8c2d903b SHA512 5f9ca8b54a2da85f0096c5834d13829fe5675a8f2de1d7c10901a6539880b5215d22af3f000db7bdda3ea8ad9d5c6c83aa74486f299f5293cd65aa95da7523d7
+DIST vulkan-utility-libraries-1.3.290.0.tar.gz 542854 BLAKE2B 669cb85d05fff69aa14461feb84848ef3f1667e79fc740d20ed1209f58a8972aba547f9dedffce4e304c157d6fb8bd63e270c796d927c00729c5c5a62ed638b5 SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
 EBUILD vulkan-utility-libraries-1.3.283.0.ebuild 1061 BLAKE2B afa01f095afff189f3049dd761ef9602fcbeacba80df0385062a69c3f49864d736930e0a5b369539d0586d06802e2df1ea441968e020b09bfcb94a22e55fd364 SHA512 19eb092822dbe9e47b359144d5761a2cd9f72c8c49ed5c19de3f7ffc35f3221642e2aa6ec772eca1d8a41350a07e88b417ca8e86a9e7030df97ec6ff6a52e421
+EBUILD vulkan-utility-libraries-1.3.290.0.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
 EBUILD vulkan-utility-libraries-9999.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
 MISC metadata.xml 442 BLAKE2B cd315d7e91cf05f2d05be32c171ef6145e818f9868d17886cc7b5a2cb5e5fb8d58961414f585b15ca6c9d989244c0004c366d022464bd3b3b70ea451a2b67c7d SHA512 3e059e27de852aa76dbfdcc3dac69f0f472f496c64e1ca2a9053799f090b9091800e397a92012b7e546fa8240702546a5ca0dd6b2be6cfee356f539e73439c94
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
new file mode 100644
index 000000000000..82dd22dc1006
--- /dev/null
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Utility-Libraries
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Share code across various Vulkan repositories"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="~dev-util/vulkan-headers-${PV}
+	test? (
+		dev-cpp/gtest
+		>=dev-cpp/magic_enum-0.9.2
+	)"
+RDEPEND="!<media-libs/vulkan-layers-1.3.268"
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 092e64cfdc8f..1cc15fe0a9ae 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1,6 +1,3 @@
-AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
-DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
 DIST weka-3-8-6.zip 59573134 BLAKE2B 00957c9c524a9a61f961146d8c8dd2e2272997584f89e8a94d6a22e1caf711a5b082e4977cc5f42b70f82ac556b96a83b86fc780a02eb267eba190b89bf8f29a SHA512 9499e1921fde51b827243b4905708d0e36a1ab454b92889f1d33eafce9638ec8039bb769c09aefba0654b2a83e66ec99f300c1fdba4652831e5e871ca2bb4916
-EBUILD weka-3.8.0-r1.ebuild 1675 BLAKE2B c8ea7bf08562ca4d5236c78318be4eb4c061d0f7c8f592c46c0f42f1eec7b9ab7bcb6292f53b0f2104f8d3017a4d8dfdec5f1e4c8c1b642b967e9875fe33e77d SHA512 2f7936581ef3e9cbad3207637150e963447db806e7f262aae3ce4deb50c7f91962ba36931d3105faf24e748b05e350cebc2510672ece8401c3eb87645ea4dcb5
-EBUILD weka-3.8.6.ebuild 1599 BLAKE2B 1754038495354e1ea4455721c8d7274b8873b2d114894071a280bb343fc96a8672078d6cfa445aff9c39524c7647c769f75713a3df90da458247bc18b1612297 SHA512 0cba7a0ddd1403dab6fc81ff4ca750d4a3ef1f945112d5268fcdc3069d9ea5678dfb3709dc359ac8f608c7fa681d23e1172be331ed32bce9ef7daeec0cddb755
+EBUILD weka-3.8.6.ebuild 1597 BLAKE2B 8803f319a07e3e87e8c8315fdb7cb165345867e51de86c77bf2d3c16b40daf4942ed74df1ab76e229454c72e63c40b52ac6060bb45f1c25a710d109ae36e8468 SHA512 fadcd378a6a8e40d05ba322f12748dd8c0f59bb4b7ab78fa55c955ec4baf51beb66d2f0b2c8297d199da93499d8892b33de9a7f5a8297e933cc2455868adb90d
 MISC metadata.xml 441 BLAKE2B 57e012777845edb06bf71cf440da0732148d1df26f83d5256adc3934c4a7d28654c93844532b0ada1038b776641bd372f896a6bc43cf894ede04a94fd51d61bb SHA512 46ca61a2faa1c21740356d1c49efab974e020f723fb8aa5595f98a753b0657f5cef9358619d689bee27690c04cd316215824534736c2a5c6e48fdbb8476d3eca
diff --git a/dev-util/weka/files/weka-3.8.0-build.xml.patch b/dev-util/weka/files/weka-3.8.0-build.xml.patch
deleted file mode 100644
index ca8264dc2291..000000000000
--- a/dev-util/weka/files/weka-3.8.0-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2016-05-15 10:56:04.011409745 +0200
-+++ b/build.xml	2016-05-15 10:57:43.971411711 +0200
-@@ -618,13 +618,6 @@
-          <include name="**/*.default"/>
-        </fileset>
-     </copy>
--    <rmic base="${build}/classes"
--       classname="weka.experiment.RemoteEngine"/>
--    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
--      <patternset>
--        <include name="java_cup/runtime/**/*"/>
--      </patternset>
--    </unzip>
-     <unzip src="${lib}/bounce.jar" dest="${build}/classes">
-       <patternset>
-         <include name="org/**/*"/>
diff --git a/dev-util/weka/weka-3.8.0-r1.ebuild b/dev-util/weka/weka-3.8.0-r1.ebuild
deleted file mode 100644
index 55852a241c27..000000000000
--- a/dev-util/weka/weka-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java data mining package"
-HOMEPAGE="https://ml.cms.waikato.ac.nz/weka"
-SRC_URI="https://downloads.sourceforge.net/project/weka/weka-3-8/${PV}/weka-${PV//./-}.zip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/jdk:1.8
-	dev-java/javacup:0"
-RDEPEND="virtual/jre:1.8
-	dev-java/javacup:0"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P//./-}"
-
-PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
-
-EANT_BUILD_TARGET="exejar"
-EANT_DOC_TARGET="docs"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-weka_get_max_memory() {
-	if use amd64; then
-		echo 512m
-	else
-		echo 256m
-	fi
-}
-
-src_prepare() {
-	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
-	rm -v weka.jar || die
-	rm -rf doc || die
-	java-pkg_jar-from --into lib javacup
-
-	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
-	default
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
-
-	# Really need a virtual to list all available drivers and pull the ones
-	# instaled
-	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
-
-	use source && java-pkg_dosrc src/main/java/weka/
-
-	dodoc README
-
-	insinto /usr/share/${PN}/data/
-	doins data/*
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from weka 3.7 to later"
-	elog "and your package manager does not start please delete"
-	elog "file installedPackageCache.ser from packages folder"
-	elog "in wekafiles located in your user home."
-	elog
-	elog "rm \${HOME}/wekafiles/packages/installedPackageCache.ser"
-}
diff --git a/dev-util/weka/weka-3.8.6.ebuild b/dev-util/weka/weka-3.8.6.ebuild
index d75d6aaf5b12..035711364244 100644
--- a/dev-util/weka/weka-3.8.6.ebuild
+++ b/dev-util/weka/weka-3.8.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P//./-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/javacup:0"
author	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
commit	b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree	f6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-util
parent	8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)