gentoo auto-resync : 12:09:2024 - 12:31:23

19 files changed, 181 insertions, 36 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7a30f0344a49..2e1b54b80ae1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 341c08ccbb17..5e2abdfd2348 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,5 +3,5 @@ DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d
 DIST aruba-2.2.0.tar.gz 130616 BLAKE2B f2f359d5ba79232e575a240e6d278b936f17d532d01e58f840f537a4d1e6a3663c04b24636aa20fda64ac3eccd4111c61d2f18e26e8c18cef35c7eeaaf7d797b SHA512 e4802dd915062b61e0a536d31294165310ce80aca3e4560f59bb23fcb3e01ea73a547d3f5738d3590c33175fb55268fa69512fe8f33f7cea6b83070e26b7cfee
 EBUILD aruba-0.6.2-r3.ebuild 1051 BLAKE2B 74adb785f62d6ca6379a782b93de3634bbde652e593eb897954b613a529d4389a022a9345fd0606b6c2762675c78e215231bdc5cf31fe40f9628ea2eb2ced212 SHA512 b6fee287b335d67a3b90f422bacf2977f622cfb77a35373c94fa7a25a75bebb9a0a348c9a98c05a5a331efa09a8456883a0ad0cfabe94ef1dd73e1338d71a75c
 EBUILD aruba-2.1.0.ebuild 2248 BLAKE2B f1ae5aed5b5b558b4f00851516277cef0f8fa7468f2217d3c4ef3d15e1fa0585a313811a43550579a1ca3cd4e5027bad713f29bbf8693646910024373b96a44f SHA512 a0bbf2a14dffe700fea2d18ccc810a2a55da23ec03cfcaaacea8b57fb9ddf131eca5ecaefa058a4d0b2f21d9a51eea3fe72e0f7e343c2e95171831456b7d9030
-EBUILD aruba-2.2.0.ebuild 2395 BLAKE2B fb21b0959070e3ed2191fefb0116d098139175318529dcea7dbcd28c7494657f4cc1e40af702befa3b4e3b082f52e982e1dbabb903a59f9c1418017a331b583c SHA512 e1bb40194aa9af4c82dc36ea2061bcd79ef0385f42401d9cb5b52c6a32a04b5efc4b688f46f7da213e28622bcf21cf2bd6b29ef958c7f9bf2665389ebfeb36e8
+EBUILD aruba-2.2.0.ebuild 2394 BLAKE2B f88915cc755b5bfc8f738b013822cd40426a277bbb30e7b54fa07d3d6c373447effed2b0b57174054ebeef343f11412c7ea7f0e13e96700bc2cb03d49e44dac3 SHA512 d862eb1bf3ebed366022891fc43952d3776d13cc10e35310e8f90889b0c32d3e78240162c588abd011b2e437ce1db9efa8cad51b3169f43c42bbda2399869bc0
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-2.2.0.ebuild b/dev-util/aruba/aruba-2.2.0.ebuild
index 4bc5759f8af9..ce8c3c6b446c 100644
--- a/dev-util/aruba/aruba-2.2.0.ebuild
+++ b/dev-util/aruba/aruba-2.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 DEPEND="${DEPEND} test? ( app-alternatives/bc )"
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index b6c7f3488101..728dab26b7c2 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,7 +1,10 @@
 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.6.1.tar.bz2 230500 BLAKE2B 827bfdc14de670ada49556b564d50cf96e015a7e982e939e564faf7eaee4dfd3698257051b3a43ad0c2933307fa7ede727bf9ed8625b9761e6ae338b4b120a16 SHA512 b62fcedc6afe683fc466e86f572d3b39df59fd03c951406c6efff44b893c26df74ede315ffeec1a336f79773f7e1503361365f61e10fa1e07e97c036bd076320
+DIST astyle-3.6.1.tar.bz2.asc 488 BLAKE2B 9af44cf696b3f7d62649a8f0ce9ae296263e5de5cd5032f96ef90f83fb762c1de92c91e470839e11dda228be14706406eb6eb31cdc06c9e74f42f4edc524ef91 SHA512 b297e6d4cf3fe6599ac25a8d792865f62e4fb5f917101d6615dd18b87840bc52e5e9be83b1fa25e85cc80a2838b28fbefecda2b70c3e73bff650447f3c8a8951
 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.9-r1.ebuild 2225 BLAKE2B 78f81a8bad0b4c7e648bc7a626008c9af147673ea977e82ca4780a774f557331719e045358d171624c5fca2bcbd6a5e4a59c6d2768244e41d0734c9325d0e908 SHA512 5f1f2085f4775c19bae79a0de8370b07d2745ad554bf2f2a592946d9176ed261e32694700f0fc0e1b42e29a8067fc073b112084174e1c195e0960916a3c15e98
 EBUILD astyle-3.4.9.ebuild 2146 BLAKE2B 4944318e4b5a5bae5b74e2859cdec40ea898189a3f484c1a56db0cef7ec8770ace93367eddd9e06872259b7245571c67ad172ea37290580c96196b4e84238eeb SHA512 b14e366d0c1d457d5c07887b5540d66845c516620b0970d7fcfe7b576948400f437d4aa436bd03cf8531c6907448912b0bcd53e0313e8501d4ffcf388358c2c6
+EBUILD astyle-3.6.1.ebuild 2225 BLAKE2B 78f81a8bad0b4c7e648bc7a626008c9af147673ea977e82ca4780a774f557331719e045358d171624c5fca2bcbd6a5e4a59c6d2768244e41d0734c9325d0e908 SHA512 5f1f2085f4775c19bae79a0de8370b07d2745ad554bf2f2a592946d9176ed261e32694700f0fc0e1b42e29a8067fc073b112084174e1c195e0960916a3c15e98
 MISC metadata.xml 728 BLAKE2B 8928b84671119c82cba6cf161e7255d0fd3c0006ee9d81b3bdfba6683e6267c9ab99c606149b9f15c672da485f751feb6165a400d7c123b2bb8540c9d6919674 SHA512 186d0cff75a1deb2d3d72dd17a0775db105a17eb48a0a97c4ae8f5b9156f326bce3b3ac3a301e470457650f97f5e9a647b1325c129f3319cadcaf92ce2209f21
diff --git a/dev-util/astyle/astyle-3.6.1.ebuild b/dev-util/astyle/astyle-3.6.1.ebuild
new file mode 100644
index 000000000000..401c4b1a41b8
--- /dev/null
+++ b/dev-util/astyle/astyle-3.6.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+HOMEPAGE="https://astyle.sourceforge.net/ https://gitlab.com/saalen/astyle"
+SRC_URI="
+	https://downloads.sourceforge.net/astyle/${P}.tar.bz2
+	http://www.andre-simon.de/zip/${P}.tar.bz2
+	verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="MIT"
+SLOT="0/3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples java static-libs"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+"
+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() {
+	if use java ; then
+		java-pkg-opt-2_src_prepare
+		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+			-e "s:ar crs:$(tc-getAR) crs:" \
+			-i build/gcc/Makefile || die
+	else
+		default
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usev java) \
+		$(usev static-libs static)
+}
+
+src_install() {
+	doheader src/${PN}.h
+
+	pushd src/bin >/dev/null || die
+	dobin ${PN}
+
+	local libastylename="lib${PN}.so.${SLOT##*/}.0"
+	local libastylejname="lib${PN}j.so.${SLOT##*/}.0"
+	local libdestdir="/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1 ${SLOT##*/})"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
+	if use java ; then
+		dolib.so "${libastylejname}"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1 ${SLOT##*/})"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
+	fi
+	if use static-libs ; then
+		dolib.a lib${PN}.a
+	fi
+	popd >/dev/null || die
+	if use examples ; then
+		docinto examples
+		dodoc -r file/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 84d43051517a..82cea62537bc 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,6 +2,7 @@ AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168
 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863
 AUX bcc-0.25.0-cmakelists.patch 358 BLAKE2B 0159aa6e483bd5fab0bc920e8416a94a43809d99a29344b17321bc92890614f99cba1bb8bea02522b890be456904250ef2875d2d88b3f6d55022ad2d4ad2910e SHA512 9521e22cb9318b56601e1d27362903d63fcd8954b7539e6e92db267406d8aed6be8261b62f02d186edb82d548d64578bd99674f93c86e36e1fdd43332dc1552a
 AUX bcc-0.31.0-dont-install-static-libs.patch 867 BLAKE2B 4661b7524cf337bc3b64c0a2465945cf9896bb894383fd42afdcecd6f78878fa9904722f29c8ef1cc0c539f7bd9569c98ea6795defa79c35f74c9ba34030a0dc SHA512 e612a1ea7f97d147e2d8fd26e8929803d37164e209cbb45535742f99ff2f461bd8269ea8983701d7a98287338984a097d371098fdb83e693ac89663f5dcfcaa5
+AUX bcc-0.31.0-no-automagic-deps.patch 459 BLAKE2B 807202dc7acd8e621772d563d9dbd8f03712ab455bc977bf359866e3074ff11e496c8880670e5fe377b43a456d0df554d75f90d64bee0ada4d67e4230578536b SHA512 dfb9032457d1e6253375087ea09910947debe55b57066b6757363a4c86e1e5ced2f9abfe30fe979b2f5e9a596cae836f914440e0d91dc2b5d96943ec20ca41ae
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 DIST bcc-0.29.1.tar.gz 6778304 BLAKE2B 23df483df59ef7d66117b15628299a32155136aa5254edbf76f7507a972f3ebcba1d4b2aa83c41e8f061eeeb96812f522c34fed27e9a37e5f4ad3478c7cde88f SHA512 9e60130ea602e19e6c6f88a8c17023cea5daf4c5bcc7af8816e9f5c662341136eb449a3fdf870ffad215495ac3bf895115c0d968d92ce79ebe2899b3e2464d24
 DIST bcc-0.30.0.tar.gz 6797246 BLAKE2B 517f4fcce8bcaf4c8c17075f9a906b452ee14a0c46fa500c301521fe46d854fcf4f632e741b34168dfeb819d9b0d64b967e716fa6222ba7dcaeddb03570985e6 SHA512 70478ca8c18e7f106c462513ca9af46f49b4ebcca6380a9393208fca88f83895a7396f918bf5d01dce1bc4a876bccb9b95aa56d426e55d384cf11c9baaa6a89b
@@ -9,5 +10,5 @@ DIST bcc-0.31.0.tar.gz 6807504 BLAKE2B 75739914a18a7952bbefbed6f55b88d3be4f0483d
 EBUILD bcc-0.29.1-r1.ebuild 3076 BLAKE2B 336b061630c512e338f92f29cd2cb83b8445436fcd31ae75008f38a989481725b589d185173ced2ba1e86d75017827a8d4619cd53ff59e45280cab67cb733d6d SHA512 544bf5ec686458b51a2e9dbc18ffb10e08d33c1626cee2698c395fa51b283a0e069fefb94dbb1f15a61406fd515a419024811a8f0de7adef4448281752cc09cc
 EBUILD bcc-0.29.1-r2.ebuild 3214 BLAKE2B 2bd87d02bf6a10f467971dd38ce76d83705664026d8b716c36b3ad03f5fa9263aaeef5df0653a661420620b16831c12cc8fce62148469d666d938fa16ed3316b SHA512 a836d324e5a5da246facc5d35546c719e23b0ed0eb1588252e49a146a4b62e83925ef18d7c6a6ceba2327c58fda471f02a615c560978a43c20816b1f3cfcb8a5
 EBUILD bcc-0.30.0-r1.ebuild 3099 BLAKE2B 81fe5952644ea5393523b9652e4e68af72ce496d4ccd6b9c3fdef15a5125dae89619c7c90469b0b5118d5f581b26ebc4fcc64470309495effbeb6bf144ac093e SHA512 98eeb13444dbbe044915fc61d1c3c955f338499e8bdb8ad1ec9229213c14a6783b856b49f7a36c6db30667d882fca07a9221ed25df82eb27e5773102da054724
-EBUILD bcc-0.31.0.ebuild 4056 BLAKE2B 3b3b4bf9b7dbda9576774404297e1a6385a71ac6f55a502946e231ad951d86cd621a2753911244ad8f62f870626e36261a3fa092db5bc3a709799939c71f93d5 SHA512 058c4d1eb7a982b5d41a3f1ba140243a4cf0941f2f1184a2fde205b024fd1195607efddd875c8168788027bc09e6ddfaf524976b2cfe3adf069a5e022f0ec12e
+EBUILD bcc-0.31.0-r2.ebuild 4683 BLAKE2B 43682b1eca84468fa5e18b71ba1b570cbf0007306f6cb86013b5e79918b3f3e3364e1cdff4933056afce53cc11caeb3c070b9b9d233c486fd0f27de4a916d92f SHA512 7d6fd7fed86a30d665aca034d71975947d481ec7c6914dc772dd99e2841c9f32beb56bf1421b32eb0de24d8f5c400f1e348376d36289613c06e6215d3197c483
 MISC metadata.xml 419 BLAKE2B 8b46153f6ab2d6959a767f105a9e33109f705bf879bd4d6708eb4a85e310140d8f810569bf3e37f89bd5a07758de7653697214643b606dc314009e8b8db709ac SHA512 3036d51a8ff5c5adc507387aad252ab7a90c341c5f04c626158353d938992e78c6b5e344354220141979f91522e0204e388d47fd0ccf91415634f6cde646a0c3
diff --git a/dev-util/bcc/bcc-0.31.0.ebuild b/dev-util/bcc/bcc-0.31.0-r2.ebuild
index 274d6f9b7d3a..f595931e6352 100644
--- a/dev-util/bcc/bcc-0.31.0.ebuild
+++ b/dev-util/bcc/bcc-0.31.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+lua +python static-libs test"
+IUSE="+lua lzma +python static-libs test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,13 +29,20 @@ REQUIRED_USE="
 RESTRICT="test"
 
 RDEPEND="
+	app-arch/zstd:=
 	>=dev-libs/elfutils-0.166:=
 	>=dev-libs/libbpf-1.2.0:=
+	dev-libs/libffi:=
 	sys-kernel/linux-headers
+	sys-libs/ncurses:=[tinfo]
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}=
 		sys-devel/llvm:${LLVM_SLOT}=
 	')
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
 	python? ( ${PYTHON_DEPS} )
 	lua? ( ${LUA_DEPS} )
 "
@@ -52,6 +59,8 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/zip
+	sys-devel/flex
+	sys-devel/bison
 	virtual/pkgconfig
 	python? ( ${DISTUTILS_DEPS} )
 "
@@ -60,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
 	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
 	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+	"${FILESDIR}/bcc-0.31.0-no-automagic-deps.patch"
 )
 
 pkg_pretend() {
@@ -102,6 +112,8 @@ src_prepare() {
 		mv "${script}" "tools/old/old-${script##*/}" || die
 	done
 
+	sed -i '/#include <error.h>/d' examples/cpp/KModRetExample.cc || die
+
 	use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" )
 
 	# use distutils-r1 eclass funcs rather than letting upstream handle python
@@ -122,13 +134,15 @@ src_configure() {
 		-DREVISION=${PV%%_*}
 		-DENABLE_LLVM_SHARED=ON
 		-DENABLE_NO_PIE=OFF
+		-DWITH_LZMA=$(usex lzma)
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
 		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
 		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DNO_BLAZESYM=ON
 		-Wno-dev
 	)
 	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
+		mycmakeargs+=( -DWITH_LUAJIT=ON )
 	fi
 
 	cmake_src_configure
@@ -140,13 +154,32 @@ src_compile() {
 	bcc_distutils_phase
 }
 
+bcc_tool_name() {
+	local -A rename_tools=(
+		[trace]=1
+		[profile]=1
+		[inject]=1
+		[capable]=1
+	)
+
+	local name="${1}"
+
+	local name="${name##*/}"
+	name="${name%.py}"
+
+	[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+
+	printf -- '%s\n' "${name}"
+}
+
 python_install() {
 	distutils-r1_python_install
 
+	python_scriptinto /usr/sbin
+
 	local tool
 	for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do
-		local tool_name="${tool##*/}"
-		python_newscript "${tool}" "${tool_name%.py}"
+		python_newscript "${tool}" "$(bcc_tool_name "${tool}")"
 	done
 }
 
@@ -155,16 +188,16 @@ src_install() {
 	bcc_distutils_phase
 
 	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-	local -A rename_tools=(
-		[trace]=1
-	)
 
-	local tool name
+	local tool target
 	for tool in "${ED}"/usr/share/bcc/tools/*; do
-		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-		name=${tool##*/}
-		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
-		dosym -r "${tool#${ED}}" /usr/sbin/${name}
+		[[ -d ${tool} || ! -x ${tool} || ${tool} =~ .*[.](c|txt) ]] && continue
+		grep -qE '^#!/usr/bin/(env |)python' "${tool}" && continue
+
+		target="/usr/sbin/$(bcc_tool_name "${tool}")"
+		[[ -e ${ED}${target} ]] && continue
+
+		dosym -r "${tool#${ED}}" "${target}"
 	done
 
 	docompress /usr/share/${PN}/man
diff --git a/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch
new file mode 100644
index 000000000000..baadf2f7ea6c
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18407e86..1af91242 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,9 @@ if(NOT PYTHON_ONLY)
+     find_package(FLEX)
+     find_package(LibElf REQUIRED)
+     find_package(LibDebuginfod)
+-    find_package(LibLzma)
++    if(WITH_LZMA)
++        find_package(LibLzma)
++    endif()
+     if(CLANG_DIR)
+       set(CMAKE_FIND_ROOT_PATH "${CLANG_DIR}")
+       include_directories("${CLANG_DIR}/include")
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a67056009a1a..cd3603b95adc 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -6,5 +6,5 @@ DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad5
 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-r1.ebuild 3406 BLAKE2B 103dba27b32dcaf826df9fd54802c50a267ce144be4e9e3fabf8b6f086b949a6577690831f036cb15b55f8a09742eccdc900372e26ac3d28c965553122917195 SHA512 420b881e0c19dbfc74a4d33c4b96244cd9de18582b63fa7af055abe340441e37919779cceb0a4e92b76d3dfb256a9ce8ca436e277f3662097cbd28325d12d717
+EBUILD bpftool-7.5.0-r1.ebuild 3405 BLAKE2B 74da665bc8e3ddd5ea372590455345ea6e75348500eefe7117926d313d8d4c75579e31635b8b67761ffe1ad3284788dfd19f524709f2a951b1f9790a41ea3b1e SHA512 a228790899d82206d7378d24aaf02257b6fb540983ea83157eb7a0ef4c09d420c57257849830c8352df4a1f55f482fad9490813d8657e6b512bbe28b46958429
 MISC metadata.xml 650 BLAKE2B 4e195974ef7cee9b087c5c5f58e1782ff6b884603c68042c3d28471d4e7eb92004e9963ecdf534b360579e475424e64dd905fa5e98a74385aaadbe132b598176 SHA512 4a9d57fc518a3dbe67b0c0436ba41a66cd25d970e9b4c1d0cb1c8120f8d02e1e4fcca7e68d878dd74ae16e7804952a68c486621a44d59e5782341d1800f2e142
diff --git a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
index 44e89eba098d..57daaf8bbca5 100644
--- a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
@@ -26,7 +26,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="caps llvm"
 
 RDEPEND="
diff --git a/dev-util/bugbite-cli/Manifest b/dev-util/bugbite-cli/Manifest
index 579443edccd6..ee669bc97bff 100644
--- a/dev-util/bugbite-cli/Manifest
+++ b/dev-util/bugbite-cli/Manifest
@@ -1,3 +1,3 @@
-DIST bugbite-cli-0.0.11.tar.xz 21068652 BLAKE2B a75137923c1578c8411a3b701564ad9883352478ba0467f7202ae3f668ae42d6890075b7a9b1f1d8ae1eb54a4280f3925f13d4b8656056e56c2a32f9f790ccd1 SHA512 b1df78427a3f5d1c44df95d077284fec5112385f31a480c6488fef20b53b43cbf1f80b1dcffd78b40f04d62364f8a8a7fd17f12ca0985d10ad3ee8f23ec3ae59
-EBUILD bugbite-cli-0.0.11.ebuild 1320 BLAKE2B 597ad034f202df0aab1c235495714bba346a8a84e9b2a2eeea00f3a8bd362fb3801ecae914b8e89e99274122b49f787bcce111fe9ab1da3f2b68bf0c7cf97d11 SHA512 6c452da5527c35617a273ab845718a03f2828a5b4be87075b8ec245ce53e102bcd832b8bab3c614070213d694d8fefed5fbbfa4019e181a6ae557587463a9e6f
+DIST bugbite-cli-0.0.12.tar.xz 21202148 BLAKE2B dd7d7b0927741d77b3a724273360348558fc2675e22e948f2f9e2b418db6a263986e051ebb700094610e98021af6264288ebcbe271c0efac88c8091f9cd0725e SHA512 2056450d13ccbdf484ef2f4e4ea663a4f10fbd4222574e630510a85a0d10b2c939e9250be947b3bd1ea3a43a78f946b6e142db94f650aab0cd46db910f369411
+EBUILD bugbite-cli-0.0.12.ebuild 1320 BLAKE2B 597ad034f202df0aab1c235495714bba346a8a84e9b2a2eeea00f3a8bd362fb3801ecae914b8e89e99274122b49f787bcce111fe9ab1da3f2b68bf0c7cf97d11 SHA512 6c452da5527c35617a273ab845718a03f2828a5b4be87075b8ec245ce53e102bcd832b8bab3c614070213d694d8fefed5fbbfa4019e181a6ae557587463a9e6f
 MISC metadata.xml 493 BLAKE2B 99fd8405920676653bbb75a4d71b81789d03638b4ad3970a23d3335c9af73fad4947000f40f6a211fc3ab9e1362d5cd19eeb26d80e93bc8d0838fdddaf179ed9 SHA512 5ad93bfef807b5d88adec2773e6496a4462f7e000ac15d4d4e7ea9b0646d530290bd9d7be23de31c5bfd33e352b2ea66fc3937ef417ffcc93232842132db3b6d
diff --git a/dev-util/bugbite-cli/bugbite-cli-0.0.11.ebuild b/dev-util/bugbite-cli/bugbite-cli-0.0.12.ebuild
index 54904ffd4168..54904ffd4168 100644
--- a/dev-util/bugbite-cli/bugbite-cli-0.0.11.ebuild
+++ b/dev-util/bugbite-cli/bugbite-cli-0.0.12.ebuild
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index debde27f9af1..7fc040f45fa6 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -3,6 +3,6 @@ DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae
 DIST cppcheck-2.14.2.tar.gz 3723248 BLAKE2B 551c783e13202f496b705602566799848b611bcc706f7a803c9ff530b3405db9e0b5294d2ce51ef5a4889e08c5b9d54c15d40a7ec6f4dc59333a7b6ed24b1f02 SHA512 8e90fa87845a083a4de66ec86edf707184a2293eb346fd79bfcafb73f93db049216472fcb2ab802ce529680f9708261ba3c26675c6fd9637e1dc83903bc44c4b
 DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
 EBUILD cppcheck-2.13.0.ebuild 3174 BLAKE2B 8809bee9b0fcebb6e56de883dcd1db2102ddd50789d1992445416eaf76d22a0dbb5c8583e32b5e88cef51425c9769b11b7a69399e8b8bfbb1a3c33a2a2caa342 SHA512 d0ec553281ddcdca9d2750fe2d786f87336847ab4dcbd31f259a98d4014163e85a2ed145a85b2795362f8ce8d1dea9510aaf5eae51c5d201f778fcd77bd71757
-EBUILD cppcheck-2.14.2.ebuild 3075 BLAKE2B c28bb7c0dd7b039b7fe5f3188c6d2a0905acbefe912ed562415441d6e16953bade9de1e31c19d1b20d3972c33cb4c90c6903970a0d2b30e3f69d1faa9e540f80 SHA512 0b417a09a8d212cd3cd3efdd229dbc018952feb9c7e548f4c69b7148da4ad5cda14cdcd52373f4491446966aa678f5717b28f59f676341e1fa49c7b1e6cad061
+EBUILD cppcheck-2.14.2.ebuild 3074 BLAKE2B 874d2138c9fc44188534446001d90289d50dbe4f4ebb0a8493297ccd059598e3e3987ee48af205a6df6443ae5ef6e2f77ed095c5c7ded2bc62b27929852e0bb6 SHA512 737a79d3b631b756478dbf33b40cd905075a6329d9f38b30ae7a947216d4a80a3c882fb2fd40974b777ce1d37794f473722ac686b81d301aafb09e85fb6c43c0
 EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0
 MISC metadata.xml 439 BLAKE2B 2fae88ef8445fcf382e68d615e7f9c4b41ce119785b9d3a8a3685297270043da641c8e454e40de2507f6e17a91846488e4dcb1a72e09e241287fb06cc531ae82 SHA512 64084c96f491b6f966d9b20409ec43a530280c01e29c2c531a43bb40d62263c7fb9e1c55079cddfe2eb437ffa6ca431a9dce758a5932c549bd8cb5850a8769c8
diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
index 75e296a70059..efdc1693e60a 100644
--- a/dev-util/cppcheck/cppcheck-2.14.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="charts gui qt6 htmlreport pcre test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 56f47abab7d4..c2d53fc8f658 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,5 +1,5 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8
-EBUILD desktop-file-utils-0.27-r1.ebuild 682 BLAKE2B 5c53e7aaab0dcc31f53374f849567b289969d2bc3759d410dfb50a5d0ac3105eba9b5387dd23edbe40a2c3ea9f7cbb25bfe61c1932874d5b90f4e1f811048cfb SHA512 9e9902f2b8c12802233c9b3590764a30ddec1b77799005fd3f65e2084356a522438afbdf0a8eb904494d599e5202f36644824f4aa241cc3e123186e05982aace
+EBUILD desktop-file-utils-0.27-r1.ebuild 681 BLAKE2B d6bf80b975c5242f588aae6aa55a39c6ef33ca52042e67bee30779faad6481947fa887bb52d811727ca756dec71c6bee2d6e6290f463cc1ed1480305717ba0e9 SHA512 297198b6b6ed6aabbc2ab1e01f0067add4ee9c889966ea630669a31da48a4cc5243f7bd6f7e40e69fba11f1341f864747c851c01cae7a1b972ebf9dc23e7d44a
 EBUILD desktop-file-utils-0.27.ebuild 1138 BLAKE2B 663705e02f3db2d6ae263e7369b5486ac0ea72a1278a5194492f76abf226fba159f46014cce32e442fdce91a47fbb6010ffa10ef1d007f0c402fca80a1d33b93 SHA512 b7cfff1f16bc53f53e9ca288d617f91d7fe18b4cc38cf0bb36b4a42c7a3b8442b54505bdeac273c3e9e9a5ee7313e8da7032a0f1654d4cb9848afa5585ac328f
 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
index 1db57ea08fc7..cc36e64e0ce8 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-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 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 43cb629892c9..ecac8a7fbc41 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -3,6 +3,6 @@ DIST libabigail-2.4.tar.xz 357840964 BLAKE2B c3d1c23c598fc8754405df10fcd1cfded6f
 DIST libabigail-2.5-docs.tar.xz 54388 BLAKE2B 5d0cdc349955e7d26c6e8655e124ed2b1961bf6da922ab8e77350fc8b0e52a3975a7873bd2d690cd2a7f4110c1c9938a7c1fecf1255d42a7f7b915511038a76f SHA512 cceb0a27031914fa6b02c73810a792bca35ad7b47b688022aa4d15ccbf81549e320b45871a99e7d81c21e10ed8a37ec4e6795662c0dc86f5d6e81dbb7b630856
 DIST libabigail-2.5.tar.xz 364174836 BLAKE2B 0d6515bb7efdccc35b36764ece48ad4afa4d4058a1fb9b51f71e796c73f8080123eefb097ee9bd3f0689e1c2a4b61c6d960792cc04b30a71c199929b344db2ad SHA512 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d
 EBUILD libabigail-2.4.ebuild 3110 BLAKE2B d743179000f4f7a7285cdfb39f98b83c6e38bba67db8e78c3caccd0eb28f5482cb1d49400f00f983b0537e6feefd376b329d3345df86c7afd5ea2751eada6e06 SHA512 8f53f6f9ad4ae3f1869d033d122b3e04ce49597c169ab936b1eba54b1ce668c4aaefc23ac71bb60e0650c3ebb48e53504dabc2ca7c9a8685f2f12d88689be108
-EBUILD libabigail-2.5.ebuild 3128 BLAKE2B 2a90a5c0d1976e03ad676fbab1ddc7de81222d87777b245adb3371da64c8f913a65f910172688e14cedf4c7cb76e4d24635caedcbdf7c270a690d89f388c633e SHA512 efe89415cc0857679b84f9f520c24519eb5191f68d6a4fb9da1d67dc358e99d4826db91f14464ea9580dac7d5b9736b3631740338aa63641c7f1db217b0a1a23
-EBUILD libabigail-9999.ebuild 3131 BLAKE2B a7e546e661726e641553b83e633f00e2c66df5890d4d862a1bf45c69953bec79be97a1c2cad874e2421b55fb41ecb22590e0b78a742226e50ef6ed29cd851776 SHA512 38c266ef71e684f1da8fac9a7a190615360877e63a0e41df588a8f6f61e8874f201979e54944e53720ced48daa4c82dc4a114663b2e3ae08f78859c3ef81b53e
+EBUILD libabigail-2.5.ebuild 3047 BLAKE2B efcea88e3013fbc264586af8a6005f8135b5c63703428b6c441b740b0de05c5c7ca3ae94cbe67de0fa6783d007645fa8ae634cf6d84e1e7f3f7f1202a7ae120b SHA512 1c41aecb6ed8c9c7515760537372743381f802923b6fd634ea55ca8b2ddab9700259aee5a1586fce60e4f3cae0db622fa5a43c2f55856d101c1b90ed13b028b2
+EBUILD libabigail-9999.ebuild 3017 BLAKE2B 5a7821dcdec50c406491d5af2f1aaa3aab697c5d51934d63fedb7929a5546582607716fedeb7ef1ba126ffc520af49fc34023ec4d66b320ec4aeb4e587939f42 SHA512 23f4c27bb01c9f3f6670b0ad300621a9c3fb56c97af7c19e9e6f5df79647fd86e7a93e98e63a3dded5ef4a78d3e57bafcf3acdf62cbe4aa808a52083db2bf019
 MISC metadata.xml 365 BLAKE2B c69fe6073d2650badf4c3426e991b46ccea688837970ff80f3f8410769bebabf2629b780218c95c5dc766fbd839e5da2b28c7f63944d2a13ece1c4c97dfdb4a5 SHA512 6caec9ea9f290685e73efd1a273d27948bb6be5d71aebae5e1fba93781ddf2b34e08fc67c912b27b29705143288a3d5ec068c2bb20533c431823e53c1a5b6361
diff --git a/dev-util/libabigail/libabigail-2.5.ebuild b/dev-util/libabigail/libabigail-2.5.ebuild
index c91b1fc7ec2d..94ba41550820 100644
--- a/dev-util/libabigail/libabigail-2.5.ebuild
+++ b/dev-util/libabigail/libabigail-2.5.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
 
 DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
 HOMEPAGE="https://sourceware.org/libabigail/"
 if [[ ${PV} == 9999 ]] ; then
 	LIBABIGAIL_DOCS_PREBUILT=0
 	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
 else
 	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
 	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +59,11 @@ BDEPEND="
 
 src_prepare() {
 	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
+	if [[ ${PV} = 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 my_src_configure() {
diff --git a/dev-util/libabigail/libabigail-9999.ebuild b/dev-util/libabigail/libabigail-9999.ebuild
index 0e0b6d252158..cefba4dd0aab 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
 
 DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
 HOMEPAGE="https://sourceware.org/libabigail/"
 if [[ ${PV} == 9999 ]] ; then
 	LIBABIGAIL_DOCS_PREBUILT=0
 	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
 else
 	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
 	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +59,11 @@ BDEPEND="
 
 src_prepare() {
 	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
+	if [[ ${PV} = 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 my_src_configure() {
@@ -71,7 +74,6 @@ my_src_configure() {
 		--disable-rpm
 		--disable-rpm415
 		--disable-ctf
-		--disable-debug-ct-propagation
 		# Don't try to run Valgrind on tests.
 		--disable-valgrind
 		--enable-bash-completion