5 files changed, 2 insertions, 125 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0506dc114bf7..de9e2ca150df 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index ecac8a7fbc41..89451629574d 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,8 +1,5 @@
-DIST libabigail-2.4-docs.tar.xz 50320 BLAKE2B 6e3cc1a8ffc42d0a1307ed57576ec31254d4831ad785b868504ea67310d9a25633403a87b545ee6bcbedb164c7f2ac7fdef307a15a28520daebc505c7da852eb SHA512 48ede7c3b6bab8b26dfdbe3683f4ec6dd9ef0f4626e8bd7b4bc0242795bcad0f7638ee4dee21a65aa3c8f178514aa42223e67ff5a2804c8167db0bcc5bd4a105
-DIST libabigail-2.4.tar.xz 357840964 BLAKE2B c3d1c23c598fc8754405df10fcd1cfded6fe80e6949ae9d15ee28e99aad571477b331ceac2aeaa5a93f47da77de7ca41a692902b741e3a4aea1d72a7043d4a91 SHA512 f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
 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 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.4.ebuild b/dev-util/libabigail/libabigail-2.4.ebuild
deleted file mode 100644
index eb16b68487c9..000000000000
--- a/dev-util/libabigail/libabigail-2.4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libabigail-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${LIBABIGAIL_DOCS_PREBUILT:=1}
-
-LIBABIGAIL_DOCS_PREBUILT_DEV=sam
-LIBABIGAIL_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-LIBABIGAIL_DOCS_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools 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
-else
-	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
-	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBABIGAIL_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs.tar.xz )"
-		LIBABIGAIL_DOCS_USEFLAG="doc"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0/3"
-IUSE="btf debug ${LIBABIGAIL_DOCS_USEFLAG} test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/libxml2:2
-	btf? ( dev-libs/libbpf:= )
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-
-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
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		--disable-deb
-		--disable-fedabipkgdiff
-		--disable-rpm
-		--disable-rpm415
-		--disable-ctf
-		--disable-debug-ct-propagation
-		# Don't try to run Valgrind on tests.
-		--disable-valgrind
-		--enable-bash-completion
-		--enable-python3
-		$(use_enable debug assert)
-		$(use_enable btf)
-		$(use_enable doc apidoc)
-		$(use_enable doc manual)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		doinfo "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/texinfo/*.info
-		doman "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/man/*.[0-8]
-	elif use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	local file
-	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
-		dobashcomp bash-completion/${file}
-	done
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 6ee2a4f892b5..2cf69b8b08cd 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -5,6 +5,6 @@ DIST pkgconf-2.3.0.tar.xz 316160 BLAKE2B cca3476df0b79cdbca798ed3a067611414e9b42
 EBUILD pkgconf-1.8.1.ebuild 1551 BLAKE2B 2b42672b35fe644eea22e86ad1b3cdf1631a23d2c1f8d10f190e3f70c7701202b8648be766ca850ee5e1dcd98c35acd3e8ddeb9a4dd6dd258d3ae3b9b7f21c17 SHA512 efdc1b8653af1cadcacd10be802886141601569a1a936dbeb0c18def909d667e22026b3af199e7cb1a4bdb32f640f0cf9b8841f13be9ad5bda3e479eb85e2105
 EBUILD pkgconf-2.1.1.ebuild 1621 BLAKE2B 867c6c220f3bec14a5b87edab790bcfbd273dbc34cd67a4ad0dc610229590ccc8ca3e5b6e2c0624637f007400fbfbdec6f0488f4c788dfa4238211c80038e270 SHA512 57e97efec973dad315f0789562ae6613f1e175ee48f8814394a1158a92c76b7f2f6f3af6c6f8428e909f38c04ba0042aec9ad79d5226e4bddf44e91feb248537
 EBUILD pkgconf-2.2.0.ebuild 1621 BLAKE2B 6ce0acecf10de80426ea609cc4793250e0b26c778dc0a82b6b5ae2137feec67f4d481863bc9deed9fcdaab327beb3bb97041d93bf476cac9ade6bfb85adeb828 SHA512 ee160fcbf02af08f8ac70c11542db76a94d653b980be6638e50d3071145552c597a367e278847d714473f31746a92ac008bdadf50a1999c122cbe1a7de403f1c
-EBUILD pkgconf-2.3.0.ebuild 1622 BLAKE2B 6bb6d6b45a971082f7dc4bfb77747ae5fffe31f99fe28e04da5e09fe396bc6c0a5488fbc932a57dee089e01cfcb7e2bf2ffe0da0e2f44a9ab2e2277d7384fc8f SHA512 1f906c08fdd7d12df8dfd1ae89c4aedc0cb635b56391a439bc45f056100c9dd88b54dadb5ef6426e08a3696bc139fba510267d07a60b663190dfc999f651736f
+EBUILD pkgconf-2.3.0.ebuild 1621 BLAKE2B 6ce0acecf10de80426ea609cc4793250e0b26c778dc0a82b6b5ae2137feec67f4d481863bc9deed9fcdaab327beb3bb97041d93bf476cac9ade6bfb85adeb828 SHA512 ee160fcbf02af08f8ac70c11542db76a94d653b980be6638e50d3071145552c597a367e278847d714473f31746a92ac008bdadf50a1999c122cbe1a7de403f1c
 EBUILD pkgconf-9999.ebuild 1629 BLAKE2B 75241cc2ea76b0775dc070f773d551c43fb8e07f6cb28e597b9fe01abb401a4f208581648ea22842b11403146e7ae23e7e65d4da3c5b6d66ff0b956ce629525e SHA512 00065b6c7745731f47f782d9b8ddda9b82f7931904d418dc80528d74382e737c233e10b3d62872b779cafb9011913fa16dab4c3093bfebd62b5d0f11f1e73fcb
 MISC metadata.xml 667 BLAKE2B 38e2c6be57a2584630a634e98651c4cd6d86df6130cba3108c174dab434c5c0f0322a297543106fe543984c44e51c02eaeaa70a841f7fe1c5f70a48595d43b07 SHA512 30813cedabd5bb71c64e74c788d6c2c909d00aa78864a7fb1d2388ff9db23ddb4a8032dfc5767baa585467852a9b423b5c3b04ca22abf299030d196c1534f392
diff --git a/dev-util/pkgconf/pkgconf-2.3.0.ebuild b/dev-util/pkgconf/pkgconf-2.3.0.ebuild
index 09d0e3627956..23b3cffe1858 100644
--- a/dev-util/pkgconf/pkgconf-2.3.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"