4 files changed, 132 insertions, 3 deletions
diff --git a/dev-util/gnome-builder/gnome-builder-46.3.ebuild b/dev-util/gnome-builder/gnome-builder-46.3.ebuild
index 365c04812442..fbea73bfd68b 100644
--- a/dev-util/gnome-builder/gnome-builder-46.3.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-46.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 5f8c279234d3..5cb417b5a833 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,2 +1,4 @@
 DIST libabigail-2.5-docs.tar.xz 54388 BLAKE2B 5d0cdc349955e7d26c6e8655e124ed2b1961bf6da922ab8e77350fc8b0e52a3975a7873bd2d690cd2a7f4110c1c9938a7c1fecf1255d42a7f7b915511038a76f SHA512 cceb0a27031914fa6b02c73810a792bca35ad7b47b688022aa4d15ccbf81549e320b45871a99e7d81c21e10ed8a37ec4e6795662c0dc86f5d6e81dbb7b630856
 DIST libabigail-2.5.tar.xz 364174836 BLAKE2B 0d6515bb7efdccc35b36764ece48ad4afa4d4058a1fb9b51f71e796c73f8080123eefb097ee9bd3f0689e1c2a4b61c6d960792cc04b30a71c199929b344db2ad SHA512 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d
+DIST libabigail-2.6-docs.tar.xz 54856 BLAKE2B e89b916780d37ebcdb1e239580c36d6f5da23ac872ecb0469787081a7446005985f18e384ecc2ea9db2b58931763e7cd1247bedda550c04affc29ea3f837243e SHA512 8a121bc3e8b07bc0050c61f465c4f4fd3fb39f908ca850270c6f932bc88330e7bd6cd121c0c7c707e22c0d99bbe1da1e12721d2f9bc134ba8fb0e1c1b6b3bd09
+DIST libabigail-2.6.tar.xz 489598820 BLAKE2B d07ad7a35de0418cf933b2bf457778a5c778c2e4cd1452c3f82e08e1e98c61bf56e7bc03c4ab801ea2d67e31d88441996d56f79b9ecfd19591d8de66c860d380 SHA512 77983586c9fa99ab5593e41e33ddfc175aef7a2ddfabb7eac79a9adfd776e7dbbb317f6d4c26044c420f2eac1f9d25e0c04887a54bb3136cc91e61219a1343e4
diff --git a/dev-util/libabigail/libabigail-2.6.ebuild b/dev-util/libabigail/libabigail-2.6.ebuild
new file mode 100644
index 000000000000..d1d95f09f391
--- /dev/null
+++ b/dev-util/libabigail/libabigail-2.6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2025 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_{9,10,11,12,13} )
+
+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"
+	EGIT_SUBMODULES=()
+	inherit autotools 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/5"
+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}
+	dev-libs/xxhash
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} = 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		--disable-abidb
+		--disable-deb
+		--disable-fedabipkgdiff
+		--disable-rpm
+		--disable-rpm415
+		--disable-ctf
+		# 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 aa772fe44094..35be97e81ab6 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,13 +36,14 @@ else
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0/4"
+SLOT="0/5"
 IUSE="btf debug ${LIBABIGAIL_DOCS_USEFLAG} test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/elfutils
 	dev-libs/libxml2:2
+	dev-libs/xxhash
 	btf? ( dev-libs/libbpf:= )
 	elibc_musl? ( sys-libs/fts-standalone )
 "