gentoo auto-resync : 19:04:2024 - 12:05:02

3 files changed, 127 insertions, 2 deletions

diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index b99787abe559..f224ca0d1ffb 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -4,8 +4,11 @@ DIST libabigail-2.3-docs.tar.xz 48016 BLAKE2B 5649dec61017cada11fefcb40d71ecf438
 DIST libabigail-2.3.tar.xz 381350984 BLAKE2B 1a580cdc0f60fbf6edbf701e65531fb2b7254232a24edc23600aee49de87eea1c07c4ab93d55c1bce17ce7e0be6e074c7aab83ed6e3aff9076a844c224e52c74 SHA512 fdf0df51e2c262c723c11bef58cd0b89b27e67be196edeb33444fc06e7e61d3c2c227f59cb961aea6fc0c9b7f6f04e08b787a1cbbeb3d5507b968b8ae7630527
 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.2.ebuild 2897 BLAKE2B aa3bc9e0c5d720364fbed01bd767ea7a2d32b70d1f587fb43b263ee22053160b8e0d42cc3bb6cc9235ad84a3d3e7f752663ffc2e79b9857e0cf719d7a58b3f8d SHA512 58745ee34673feaf857ed7cb0ebfa9ca9b015f3e63b362d8d7d33f4348228dc72f01a16c6339169f8a62a5126ffe8625eebbd76a7543b6feb9cac0a823205019
 EBUILD libabigail-2.3-r2.ebuild 3109 BLAKE2B 9a0dedadc1812248d70b52c8e0ed20a107f454a4691b0585b523b815fda1a5e60c54401467b900e44ce203a144f7a65ce08752ba958522243e0de693c4b77a24 SHA512 fc5fd93507e4cc265b6b1cd45a54a0f72bf4e7d62027003a83219f9827e46c886f998f708385a5ab751200bd601f2dd3a72259a21f295d0196abd8cf75685da0
 EBUILD libabigail-2.4.ebuild 3110 BLAKE2B d743179000f4f7a7285cdfb39f98b83c6e38bba67db8e78c3caccd0eb28f5482cb1d49400f00f983b0537e6feefd376b329d3345df86c7afd5ea2751eada6e06 SHA512 8f53f6f9ad4ae3f1869d033d122b3e04ce49597c169ab936b1eba54b1ce668c4aaefc23ac71bb60e0650c3ebb48e53504dabc2ca7c9a8685f2f12d88689be108
-EBUILD libabigail-9999.ebuild 3113 BLAKE2B c7312c12db618724470ade7d6d07a912d062c0d6b2fcdc0cd9367acca1d3b0bf64b644692282753ffdd6fef4ea32b141ea95f8ff1b79f0db5bc0dc04bf7c779a SHA512 a5895638f2ab9bd88213e028a847020da27b85f7d9114417e94c47845e358e90b6e062ebba48c3c307d9b338e3bf7bd6d58cd2476a6f4b7c8666ef5df7584f45
+EBUILD libabigail-2.5.ebuild 3131 BLAKE2B a7e546e661726e641553b83e633f00e2c66df5890d4d862a1bf45c69953bec79be97a1c2cad874e2421b55fb41ecb22590e0b78a742226e50ef6ed29cd851776 SHA512 38c266ef71e684f1da8fac9a7a190615360877e63a0e41df588a8f6f61e8874f201979e54944e53720ced48daa4c82dc4a114663b2e3ae08f78859c3ef81b53e
+EBUILD libabigail-9999.ebuild 3131 BLAKE2B a7e546e661726e641553b83e633f00e2c66df5890d4d862a1bf45c69953bec79be97a1c2cad874e2421b55fb41ecb22590e0b78a742226e50ef6ed29cd851776 SHA512 38c266ef71e684f1da8fac9a7a190615360877e63a0e41df588a8f6f61e8874f201979e54944e53720ced48daa4c82dc4a114663b2e3ae08f78859c3ef81b53e
 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
new file mode 100644
index 000000000000..0e0b6d252158
--- /dev/null
+++ b/dev-util/libabigail/libabigail-2.5.ebuild
@@ -0,0 +1,121 @@
+# 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/4"
+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-abidb
+		--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/libabigail/libabigail-9999.ebuild b/dev-util/libabigail/libabigail-9999.ebuild
index 5ca2dece0f9b..0e0b6d252158 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -35,7 +35,7 @@ else
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0/3"
+SLOT="0/4"
 IUSE="btf debug ${LIBABIGAIL_DOCS_USEFLAG} test"
 RESTRICT="!test? ( test )"
 
@@ -65,6 +65,7 @@ src_prepare() {
 
 my_src_configure() {
 	local myeconfargs=(
+		--disable-abidb
 		--disable-deb
 		--disable-fedabipkgdiff
 		--disable-rpm