gentoo auto-resync : 28:04:2023 - 05:11:40

14 files changed, 321 insertions, 27 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 96d2b41c73ca..842e076315ee 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 794d59fe198b..4f44770cfb39 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,4 +1,4 @@
 DIST ccls-0.20220729.tar.gz 160861 BLAKE2B db096f0f1e1d56967086e2711af63f4882e77128236b3d1af3cc107a3b320aa29bcacd4b21769904727261b5608bb2c8409dbb0f3b0d9b0907a94f3bb7c966c8 SHA512 63cb4eace1700118f9c8c4d2f4be40aac948f9c658485c8e3f49dcc863ce7bdd8b6de810b95ec8f46c943b65c8aa5fa643b110a6b981a2e43f57569d897d36c1
-EBUILD ccls-0.20220729-r1.ebuild 927 BLAKE2B 8693bf3372fa18d14616c71651eec46ee6fda83da3165185172835e0445fc9decb9b28850f5f69ec052517d2c4c6704f12ae45003036e888e08fa41d310d715d SHA512 672c3a11da93683587f5298f8470d4add84237f08cd1d359c0f602b7508061a2d8326211b797aca80c3313cb199d3f7398679c8c2066809dc8fd7a4304e37248
-EBUILD ccls-9999.ebuild 914 BLAKE2B 0767c02b5ff2a595801fc6ec587befe9dc6ccbfc9677d94a30fc8c945bfae0099a5b987dce590d74c8b0197bf8fd15b3ab3e26be85033ca0ad145e8a1b562d9f SHA512 3fb23bf47d0117b2785e7af861c76a95c9e5382563919bd91e0b421ed49893b4ef1555d5b59e3490f33a96aab75a0e48b59db1a42d12a805b3421a26c443bfa5
+EBUILD ccls-0.20220729-r1.ebuild 927 BLAKE2B bca9cf80e84ddfd37b0d51136b4e684a8118bfd1bb2824c00dbc56aeeff7ab93d7dce85ff537c722ebabe9bb53fac5fa2cee034ee946e7b2f8a80dd5dfaef4d9 SHA512 120629d1859d5d29c04fff073280c34c115aa7e38b4df3a923b046ba4608fd5b0707a109bc865dbd05db6a4b6b01cd2b5cd8de5e50d61167e5efff5040912b8f
+EBUILD ccls-9999.ebuild 914 BLAKE2B 0b446493e7068a4a333bd88bb79bd909cb161283fae626f63f578a7897b0dfb30594f60d19ba6462784128f60eba500f870ade5ddc6b7667b2f94df8c35972c8 SHA512 2268f0cf76ed6188984b87d58fcffcd6b7e0f57ec5506b3da1a558c88310f660bafc183ca02e9de454da11137686ad4665f43601d62b39a70be97d903ac95a07
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20220729-r1.ebuild b/dev-util/ccls/ccls-0.20220729-r1.ebuild
index c0642d5fde9d..8c45747e6f1b 100644
--- a/dev-util/ccls/ccls-0.20220729-r1.ebuild
+++ b/dev-util/ccls/ccls-0.20220729-r1.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
-	LLVM_MAX_SLOT=15
+	LLVM_MAX_SLOT=16
 else
 	LLVM_MAX_SLOT=15
 fi
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index 1bca777ce22c..6073146e6b16 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -7,9 +7,9 @@ EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
-	LLVM_MAX_SLOT=15
+	LLVM_MAX_SLOT=16
 else
-	LLVM_MAX_SLOT=15
+	LLVM_MAX_SLOT=16
 fi
 
 inherit cmake llvm ${GIT_ECLASS}
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 2ce91876f868..980413228fdb 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,8 @@
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
+DIST ctags-20230423.0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
 EBUILD ctags-20211017.0.ebuild 1982 BLAKE2B a5b8197924b1f44f349af5a768911ad7ae95e3d08867d7ae724079e78ce5230def73d96465cc27b243bd4d8706e3360b95fca8b9b93b9556028a44b662efb7a0 SHA512 b6e4d30ce386f27cbe42a6a12c60cea65eaf419582456ad5c2b8f955e6d2ced442bd784c80c1fc6b69ee6a14f63c87a2443a0c0c078261ae8d738df394acc53f
 EBUILD ctags-20220828.0-r1.ebuild 2298 BLAKE2B 81cc96e497eee6186d0041f91799f7fb707203a0deef34ea05dc2b009868e31a817e8165c19bb8421fc29c9f1308673afab52a7e21baa45dc47e217d615a56af SHA512 43c184dc94bac8259eafa05bf3f10ff4efa6efa41be7a64bb70c874cdc3247b7ee946a8d7a8f69431e5a0e1035a1d0e3c5057a8b4df2688a8bf278f7e991e68b
-EBUILD ctags-99999999.ebuild 2298 BLAKE2B 81cc96e497eee6186d0041f91799f7fb707203a0deef34ea05dc2b009868e31a817e8165c19bb8421fc29c9f1308673afab52a7e21baa45dc47e217d615a56af SHA512 43c184dc94bac8259eafa05bf3f10ff4efa6efa41be7a64bb70c874cdc3247b7ee946a8d7a8f69431e5a0e1035a1d0e3c5057a8b4df2688a8bf278f7e991e68b
+EBUILD ctags-20230423.0.ebuild 2298 BLAKE2B 06a313948e30b4bbd1907ca382dddba3fe99f667ff903c84627a565341254e0d8ad5018eefd663010e77406179f55c273e0a50808bb1e2ec2102dc2bb307ef76 SHA512 ea26f48b301d482897012dac095f15ff153a5ee0e405704bc1f7692554991dfba6250971ebabd3d4dcbc723a089a31f9d6d90db6ded89665298936518af65360
+EBUILD ctags-99999999.ebuild 2298 BLAKE2B 06a313948e30b4bbd1907ca382dddba3fe99f667ff903c84627a565341254e0d8ad5018eefd663010e77406179f55c273e0a50808bb1e2ec2102dc2bb307ef76 SHA512 ea26f48b301d482897012dac095f15ff153a5ee0e405704bc1f7692554991dfba6250971ebabd3d4dcbc723a089a31f9d6d90db6ded89665298936518af65360
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20230423.0.ebuild b/dev-util/ctags/ctags-20230423.0.ebuild
new file mode 100644
index 000000000000..afd8d7dfd353
--- /dev/null
+++ b/dev-util/ctags/ctags-20230423.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
+if [[ ${PV} == *99999999* ]] ; then
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p6.0.${PV}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json pcre seccomp test xml yaml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="app-eselect/eselect-ctags"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 5859ad5945c5..afd8d7dfd353 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -13,8 +13,8 @@ if [[ ${PV} == *99999999* ]] ; then
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-p5.9.${PV}
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p6.0.${PV}
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 10e84f04191e..359ee0c77cd9 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,6 +1,7 @@
 AUX cvise-2.5.0-no-werror-cflags.patch 1830 BLAKE2B 864cde94daabb54e691e59a3634e7cc7ff72dea86a41f757f6d3d764629a803de92950e6abc32f33738c361e5e6bdacffb09c214039c2ee0475fbf1c41366cd6 SHA512 e68e51ecda7005b6542589f3ce958ad5ffef17c72e19a38f9d2be2d1443dc77adb11d4984dfc690cc25cbcb3e1da1c2fc848b9d8869178a7d4eca479ea2d7007
+AUX cvise-2.7.0-llvm16.patch 2034 BLAKE2B 15752340e432219849b69bb5172b0534c88526ec30f0a534dfc33126d27ee80dc3d4ec0586d159442b894492117edfd21341c2a86263de825d7b37345aee8b8b SHA512 02e233993615535a23dc3ce230c69ec9033e51ab70fd4a1a3c1ba7a711d3bc7ddbb5410926e26598d57db223826b0a0fabba41ea3afb353b8be78b9c9b82b567
 DIST cvise-2.6.0.tar.gz 264295 BLAKE2B fcdd27905598c8db6f088c4bdadde966bcd0836560ede642269fa6dc32d1907d32081e56e7a33487bffca64ea53a49b05b05620debc5af352371203e37241b70 SHA512 1707cc46c342197c6b0e11b26a453548fd7bc7bc25baf20215230a7a4743053700189f96c1e0ba4ad6c9de4dd38920700a957ca333b0f123949b7a5a00854291
 DIST cvise-2.7.0.tar.gz 269155 BLAKE2B c0fe9bcf8207acc53f71c5d7cd9c0cb41ba3f771a276e86401c1de4789b9ebad2d91b2881a05e0263827d0ae70805ba4f9b05fdae64f27d83e16d08f89f518e0 SHA512 4da775e177c135d5282f8e3d9a33ae040f403eabcca8baf9f4f78adc05e3069626340005f9f41ab2f530c9269f4c5829bdd35b55433e2d539d42de002e42aa5e
 EBUILD cvise-2.6.0.ebuild 1356 BLAKE2B 4d5df4ee3efb1f7a65e3ed11e67b1a9b2dd8d1016247a2d27c7d0c25ee601da9d32f2f4cc22c5520978b8be22570ce4788c994b227b63972f415f2e4508c5dfc SHA512 ebb9f94de3cadfd3fe8c186f2c671a8913d055d1d2f9e0ecb391ae236dd480d6d15bce72c838d4bb270bdd63edb6d6d291d1f707050a10c9bc936f5cf8958b41
-EBUILD cvise-2.7.0.ebuild 1427 BLAKE2B 50cd416fae26ae8a2121bbaf5d398ccb66a8689689b55ce972c3342c2f48e15703a97a625157dab6ae5f5e6a21379d64baeaeda26fbe0ee25fbdfff87365c3e6 SHA512 326ade352b26dc14c495f413c48a1eddd9bd9f7f43c0fc1f1a74953e4f30759ebc87ed698b3fe16c01dbeb7cb5c203dea1fada53d7392ba35f60757a0c3f3f50
+EBUILD cvise-2.7.0-r1.ebuild 1473 BLAKE2B 7843443e9b55c1047cdc959aaacb9eb36df8b3d3d74215e2d61eb42e7d26c606a54156d03afdf09cbc626476f2be6b2cc0736b6d55af450067470b43a3bebb0d SHA512 b90569f1a74eb8d840781b2a376b7216c9b5a50c1c1a32ac9f5ebc9b138da35353a435618babdb5769e577532267239a8c974826e00c325918a1ceffe1a64043
 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9
diff --git a/dev-util/cvise/cvise-2.7.0.ebuild b/dev-util/cvise/cvise-2.7.0-r1.ebuild
index a432c67a8e92..0c599e87daf6 100644
--- a/dev-util/cvise/cvise-2.7.0.ebuild
+++ b/dev-util/cvise/cvise-2.7.0-r1.ebuild
@@ -20,12 +20,12 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 DEPEND="
 	|| (
+		sys-devel/clang:16
 		sys-devel/clang:15
 		sys-devel/clang:14
-		sys-devel/clang:13
 	)
 	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
 "
@@ -51,6 +51,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-llvm16.patch
+)
+
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
diff --git a/dev-util/cvise/files/cvise-2.7.0-llvm16.patch b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
new file mode 100644
index 000000000000..11f0100b6d28
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
@@ -0,0 +1,68 @@
+https://github.com/marxin/cvise/commit/2f4e1755aa32b131b49606cd55b5bfcc7714a8a8
+
+From 2f4e1755aa32b131b49606cd55b5bfcc7714a8a8 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Thu, 26 Jan 2023 09:17:16 +0100
+Subject: [PATCH] bump CMake minimal version
+
+Fixes building with the latest LLVM 16 due to use of IN_LIST operator:
+
+Policy CMP0057 is not set: Support new IN_LIST if() operator.  Run "cmake
+--help-policy CMP0057" for policy details.  Use the cmake_policy command to
+set the policy and suppress this warning.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ ###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ 
+--- a/clang_delta/CMakeLists.txt
++++ b/clang_delta/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ ###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ project(clang_delta)
+ 
+ ###############################################################################
+--- a/clex/CMakeLists.txt
++++ b/clex/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ ###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
+ 
+--- a/cvise/CMakeLists.txt
++++ b/cvise/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ ###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ project(cvise_python)
+ 
+--- a/delta/CMakeLists.txt
++++ b/delta/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ ###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
+ 
+
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index c5d72d53e192..ec26b1050f89 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,5 +1,8 @@
 DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c25470c6c9b9a8058ff29923a4cb7ecd5cb652b239bf6faa05c6b7e479b425e2fd4327a0d6e1703f3622299d743b72e8b5c SHA512 c06bfa95957390ca7abd1e47a79e2da813fd3bdfb8dcaf23bf81da697c77b67d9cd5457010291e2753fcc74f55803a1c81234aa3b8cb27c6b1ce3991f6ab60ab
 DIST libabigail-2.2.tar.xz 351078692 BLAKE2B fc03b1653fbe94213713e710c358133a2abd51cac46c8d4b5d797715b16e3d9923ddd99f9a2f85352599b6b5628f52e505f0ec2bca6dc3ea118826bbe69ff42b SHA512 c512c4a497ea6bb88283feae6c31cf5fe347c260cf1670fe65296bf158d3a2aa449ca518a4f2780e814ffbe6970c7856d2ab91e15499638db78bc52d67d794ce
+DIST libabigail-2.3-docs.tar.xz 48016 BLAKE2B 5649dec61017cada11fefcb40d71ecf438d3e2753c32cf424514ece2d5b737415f220e7a36b0edc597c3155a954c994256da7745e22318ae63dfb58d8d3bd72b SHA512 8ead43911fcb7cb3c3bc63ef7dea911ff72a4249845e1d79e28a730fb05216088713905daad31b228b5fc2b6f50b492321b68989be50a427f59425006a4ccc6f
+DIST libabigail-2.3.tar.xz 381350984 BLAKE2B 1a580cdc0f60fbf6edbf701e65531fb2b7254232a24edc23600aee49de87eea1c07c4ab93d55c1bce17ce7e0be6e074c7aab83ed6e3aff9076a844c224e52c74 SHA512 fdf0df51e2c262c723c11bef58cd0b89b27e67be196edeb33444fc06e7e61d3c2c227f59cb961aea6fc0c9b7f6f04e08b787a1cbbeb3d5507b968b8ae7630527
 EBUILD libabigail-2.2.ebuild 2896 BLAKE2B adb798d68eed170fd8564843a40b61d87b0769fde58f7300735a9045f7260e590ae021379815f5c02d90e094bcd2811f71d0fcbfcab9aecdf7a5f4abc86adfae SHA512 ffac845f21fed785fec6760e43e127d44a76341b3c98b311702280ccb268dabfd1f84929105c20c481b87830f687f282eba97bd36fb6f389932bf2b3eccc9e56
-EBUILD libabigail-9999.ebuild 2889 BLAKE2B 5419ed7b5c65b35a5d57557a7377bbd03247eabf62a49d8c1ae2029dba9de22ed14944d8ab56417484b0c3e6065d3330847d748d1e315fc0c576ac4061225b78 SHA512 6dbee007ad7277d803c3e7b7b5069ac465fa34546c74c3ad9c6ad4ba50e951d977a4ff1a4ad543766aab4ba7b53273c9538d78ddcbcf286b2dc0133343ca238a
-MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
+EBUILD libabigail-2.3-r1.ebuild 3015 BLAKE2B 7ebd4b281e0a82d0e88c5881ed76f86517b3d593f95cfc4872ced5360a429423b3bcc51c11ae780f60390d5868da585f6c5297ce43bfd1b198343cb985d864d0 SHA512 af67746c7c464fb567fd58849224dca9c086fafc75a6d1e3ac127226ede2282545636bacd65f1dba3e83ef02a9e2d6ca2c5023ccb48e85d82400f6189777a84d
+EBUILD libabigail-9999.ebuild 3015 BLAKE2B 7ebd4b281e0a82d0e88c5881ed76f86517b3d593f95cfc4872ced5360a429423b3bcc51c11ae780f60390d5868da585f6c5297ce43bfd1b198343cb985d864d0 SHA512 af67746c7c464fb567fd58849224dca9c086fafc75a6d1e3ac127226ede2282545636bacd65f1dba3e83ef02a9e2d6ca2c5023ccb48e85d82400f6189777a84d
+MISC metadata.xml 365 BLAKE2B c69fe6073d2650badf4c3426e991b46ccea688837970ff80f3f8410769bebabf2629b780218c95c5dc766fbd839e5da2b28c7f63944d2a13ece1c4c97dfdb4a5 SHA512 6caec9ea9f290685e73efd1a273d27948bb6be5d71aebae5e1fba93781ddf2b34e08fc67c912b27b29705143288a3d5ec068c2bb20533c431823e53c1a5b6361
diff --git a/dev-util/libabigail/libabigail-2.3-r1.ebuild b/dev-util/libabigail/libabigail-2.3-r1.ebuild
new file mode 100644
index 000000000000..d65ee49694bc
--- /dev/null
+++ b/dev-util/libabigail/libabigail-2.3-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 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..11} )
+
+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/2"
+IUSE="btf ${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-doc/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
+		--enable-bash-completion
+		--enable-python3
+		$(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 5f02f1b0e21e..d65ee49694bc 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -31,18 +31,20 @@ else
 		LIBABIGAIL_DOCS_USEFLAG="doc"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0"
-IUSE="${LIBABIGAIL_DOCS_USEFLAG} test"
+SLOT="0/2"
+IUSE="btf ${LIBABIGAIL_DOCS_USEFLAG} test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/elfutils
 	dev-libs/libxml2:2
-	elibc_musl? ( sys-libs/fts-standalone )"
+	btf? ( dev-libs/libbpf:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -51,7 +53,8 @@ BDEPEND="
 		dev-python/sphinx
 		sys-apps/texinfo
 	)
-	test? ( ${PYTHON_DEPS} )"
+	test? ( ${PYTHON_DEPS} )
+"
 
 src_prepare() {
 	default
@@ -61,16 +64,21 @@ src_prepare() {
 }
 
 my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-rpm415 \
-		--disable-ctf \
-		--enable-bash-completion \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
+	local myeconfargs=(
+		--disable-deb
+		--disable-fedabipkgdiff
+		--disable-rpm
+		--disable-rpm415
+		--disable-ctf
+		--disable-debug-ct-propagation
+		--enable-bash-completion
+		--enable-python3
+		$(use_enable btf)
+		$(use_enable doc apidoc)
 		$(use_enable doc manual)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 my_src_compile() {
diff --git a/dev-util/libabigail/metadata.xml b/dev-util/libabigail/metadata.xml
index e306ca22e31b..d145f4ebc760 100644
--- a/dev-util/libabigail/metadata.xml
+++ b/dev-util/libabigail/metadata.xml
@@ -5,4 +5,7 @@
 		<email>soap@gentoo.org</email>
 		<name>David Seifert</name>
 	</maintainer>
+	<use>
+		<flag name="btf">Handle reading kernel debug files in BTF format via <pkg>dev-libs/libbpf</pkg></flag>
+	</use>
 </pkgmetadata>