7 files changed, 251 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 82e4a3f08985..aeb98c8caedf 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 4aaf7df893a7..03ddeae61d91 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -2,7 +2,10 @@ DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c2547
 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
+DIST libabigail-2.4-docs.tar.xz 50320 BLAKE2B 6e3cc1a8ffc42d0a1307ed57576ec31254d4831ad785b868504ea67310d9a25633403a87b545ee6bcbedb164c7f2ac7fdef307a15a28520daebc505c7da852eb SHA512 48ede7c3b6bab8b26dfdbe3683f4ec6dd9ef0f4626e8bd7b4bc0242795bcad0f7638ee4dee21a65aa3c8f178514aa42223e67ff5a2804c8167db0bcc5bd4a105
+DIST libabigail-2.4.tar.xz 357840964 BLAKE2B c3d1c23c598fc8754405df10fcd1cfded6fe80e6949ae9d15ee28e99aad571477b331ceac2aeaa5a93f47da77de7ca41a692902b741e3a4aea1d72a7043d4a91 SHA512 f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
 EBUILD libabigail-2.2.ebuild 2896 BLAKE2B adb798d68eed170fd8564843a40b61d87b0769fde58f7300735a9045f7260e590ae021379815f5c02d90e094bcd2811f71d0fcbfcab9aecdf7a5f4abc86adfae SHA512 ffac845f21fed785fec6760e43e127d44a76341b3c98b311702280ccb268dabfd1f84929105c20c481b87830f687f282eba97bd36fb6f389932bf2b3eccc9e56
-EBUILD libabigail-2.3-r2.ebuild 3111 BLAKE2B 86db2fd9d69772c7b717948132686a4097628e0c9d727e03993a24b6ef17dd7565d4cf629860c54cd84534f22bd902e0c3693bcb6fc723480c83405429f279ee SHA512 b108a83e4836c23e42719933c1e796800f7926e453b7d35af40a21fec48e678ebcde7c1606d3545838e61e6923b08be4d885e9084b1b861c874567f0e44337f7
-EBUILD libabigail-9999.ebuild 3111 BLAKE2B 86db2fd9d69772c7b717948132686a4097628e0c9d727e03993a24b6ef17dd7565d4cf629860c54cd84534f22bd902e0c3693bcb6fc723480c83405429f279ee SHA512 b108a83e4836c23e42719933c1e796800f7926e453b7d35af40a21fec48e678ebcde7c1606d3545838e61e6923b08be4d885e9084b1b861c874567f0e44337f7
+EBUILD libabigail-2.3-r2.ebuild 3108 BLAKE2B a4b478795f4878787eb720d8dbaa45e127f2b6166e4545fc2a933174be4dff90ada1439f3d486edd31a851334b98765469c629a0475b603da64f373474c468bb SHA512 7ad03a73335aab9477d411a6acb677cb42cb66ecbdcba8c73514c7ae45d2c9e8eafd9d2c982f3ae27bed5e039e975914a971a0aeac1a31c5a1eccb555563d534
+EBUILD libabigail-2.4.ebuild 3112 BLAKE2B 1e624a170ca211a26db717f5d983bb2c16a74ce54be958179ead9115384aa1ef3705dc2be97680fbca7d01b359b56bc2f3ef6f2206054f7f6325a2f5976b5424 SHA512 59969f8b2e0668c44a6192d783737bba363dabca42ff48d07ba583b6e1778fda3332be942fc5406afbe347410498fecb946c86f434834deeeb7b9b664684626e
+EBUILD libabigail-9999.ebuild 3112 BLAKE2B 1e624a170ca211a26db717f5d983bb2c16a74ce54be958179ead9115384aa1ef3705dc2be97680fbca7d01b359b56bc2f3ef6f2206054f7f6325a2f5976b5424 SHA512 59969f8b2e0668c44a6192d783737bba363dabca42ff48d07ba583b6e1778fda3332be942fc5406afbe347410498fecb946c86f434834deeeb7b9b664684626e
 MISC metadata.xml 365 BLAKE2B c69fe6073d2650badf4c3426e991b46ccea688837970ff80f3f8410769bebabf2629b780218c95c5dc766fbd839e5da2b28c7f63944d2a13ece1c4c97dfdb4a5 SHA512 6caec9ea9f290685e73efd1a273d27948bb6be5d71aebae5e1fba93781ddf2b34e08fc67c912b27b29705143288a3d5ec068c2bb20533c431823e53c1a5b6361
diff --git a/dev-util/libabigail/libabigail-2.3-r2.ebuild b/dev-util/libabigail/libabigail-2.3-r2.ebuild
index 9dca18088bcc..d984d3b5bf84 100644
--- a/dev-util/libabigail/libabigail-2.3-r2.ebuild
+++ b/dev-util/libabigail/libabigail-2.3-r2.ebuild
@@ -31,7 +31,7 @@ else
 		LIBABIGAIL_DOCS_USEFLAG="doc"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
diff --git a/dev-util/libabigail/libabigail-2.4.ebuild b/dev-util/libabigail/libabigail-2.4.ebuild
new file mode 100644
index 000000000000..885005cc2531
--- /dev/null
+++ b/dev-util/libabigail/libabigail-2.4.ebuild
@@ -0,0 +1,120 @@
+# 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_{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-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
+		# 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 9dca18088bcc..885005cc2531 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -14,7 +14,7 @@ LIBABIGAIL_DOCS_VERSION="${PV}"
 # bug #830088
 LIBABIGAIL_DOCS_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools bash-completion-r1 python-any-r1 out-of-source
 
@@ -35,7 +35,7 @@ else
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0/2"
+SLOT="0/3"
 IUSE="btf debug ${LIBABIGAIL_DOCS_USEFLAG} test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b371bec0a841..4128f9de5473 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -12,11 +12,13 @@ DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d976890
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
 DIST meson-1.2.2.tar.gz 2190455 BLAKE2B b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857 SHA512 8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
+DIST meson-1.3.0rc1.tar.gz 2139141 BLAKE2B b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81 SHA512 196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
 EBUILD meson-1.2.1-r1.ebuild 2929 BLAKE2B 7aa73d3b5686c6bff2d58e3509c7b95e2fc24ceb80b0ea537d9fd8a15d32cb5a831e2c1dd15a4166016f3b01abbdaec2b8714e1520906370d676b98e013be69b SHA512 cf4d5fdb53cfce0bc3d6d8444144caea4d1f036d3ecb51c097b069b381c9fb34bec5096633cc55f315a0ff23a1e58177de86f88ffe3036eb97065233d9086dc4
 EBUILD meson-1.2.1-r2.ebuild 2971 BLAKE2B a5bb18feae89e623c6631edb1abc93e0a1bd90465fa44f1bdccebf8fdb0007c064ce20a1d2dbbb3579be98170d4acec6367efb851db6207068f6bfd21c9b4a59 SHA512 9c43bf123f882a1678c27485d91f5e5be441235886ba85567bc5b955703c12f6eeb366f303821d370011475ac22a6157ec7caf7cccc5dba2c2012ab43f657b3b
 EBUILD meson-1.2.2-r1.ebuild 2965 BLAKE2B bc2763679dd6434347c4ee75a8ebfe25afe7f603ef6ab2c0225d8ac38689c55e3f6c1a16ff70a79c11b9d62c7d9fd3f9f3df32c1ac4a2cedbb2f38c712bdd426 SHA512 4333232907351921b5ca0dbc5c1e91273c5dc79d9a08e77e6273b3cfe1ff99f51419b1c62d3392b5bc5e96b7e2c00aec3fd4b6863ecea1dade0e473fa50d4981
 EBUILD meson-1.2.2.ebuild 2944 BLAKE2B 230bbf1cd033c90abadb8ba0301087a49a5c0c2f5374758d094a7c39e050041d9a9e1c2f4152f8de569b0dae0a3b1701f291d0eba584dc9b0fba13609da4542b SHA512 3cd303a67f560f260fad17983a6398594abf5d0eb3c1767d011bcbd73b394c3186b34ce5c4cb61cd8a7cec1264b29b149e00e343fc87beb4a4e0e0bb1d4c6590
 EBUILD meson-1.2.3.ebuild 2944 BLAKE2B 230bbf1cd033c90abadb8ba0301087a49a5c0c2f5374758d094a7c39e050041d9a9e1c2f4152f8de569b0dae0a3b1701f291d0eba584dc9b0fba13609da4542b SHA512 3cd303a67f560f260fad17983a6398594abf5d0eb3c1767d011bcbd73b394c3186b34ce5c4cb61cd8a7cec1264b29b149e00e343fc87beb4a4e0e0bb1d4c6590
+EBUILD meson-1.3.0_rc1.ebuild 2944 BLAKE2B 230bbf1cd033c90abadb8ba0301087a49a5c0c2f5374758d094a7c39e050041d9a9e1c2f4152f8de569b0dae0a3b1701f291d0eba584dc9b0fba13609da4542b SHA512 3cd303a67f560f260fad17983a6398594abf5d0eb3c1767d011bcbd73b394c3186b34ce5c4cb61cd8a7cec1264b29b149e00e343fc87beb4a4e0e0bb1d4c6590
 EBUILD meson-9999.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
 MISC metadata.xml 348 BLAKE2B 101a8ed796dd4fe7bc790c1f4d1f693948c80ff57ceae9500d8034b007cb067e3e0277f1f6423d92b847da07a96a4a4bf405a2e0d0dfa8c07846aac195c26012 SHA512 8ffe88b93e7f0bbfa4fbd9b3b7e318b2df1da076b0e7ee47f4f520c44207f2f507efc7b1cbc9b6f8d432938a805e4ceb922a6f477836f64ea8a12d9e0d361740
diff --git a/dev-util/meson/meson-1.3.0_rc1.ebuild b/dev-util/meson/meson-1.3.0_rc1.ebuild
new file mode 100644
index 000000000000..b2dcaf1c2b6b
--- /dev/null
+++ b/dev-util/meson/meson-1.3.0_rc1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	inherit pypi
+
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}