gentoo auto-resync : 01:02:2025 - 22:43:06

7 files changed, 213 insertions, 113 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 58c63ede8726..3808afd09420 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/langkit-contrib/Manifest b/dev-ada/langkit-contrib/Manifest
new file mode 100644
index 000000000000..524a041ab5cb
--- /dev/null
+++ b/dev-ada/langkit-contrib/Manifest
@@ -0,0 +1,3 @@
+DIST langkit-25.0.0.tar.gz 1560623 BLAKE2B ef03755397e85fde9b968dced7cf6bc72e85c21b6baef41160e527840caf32e0ea573d52f66c4b82ce9fa7e2dd0120286e06a3f3525e0acad5f9f11037be29b9 SHA512 27ffecb9b6c5568ebdba4864d9c5ef7e511718083fe087e3af60cfe8cc994b6ea7353cc745bc33395d33e169aaaf6916d991fa4941774932904df3e9b455f1dc
+EBUILD langkit-contrib-25.0.0.ebuild 3223 BLAKE2B ceb56272876ddb2a39372cebcd0bf2b1fec788d550adf3432a0e2315222039ee7662b9a18e097eafb753e8d270c22b928f35c9df8d429db55e4e4f6ecb92f464 SHA512 d27fcd18a883ed2234295593e825aca5fd16bd84139987d612746ede56a32e5159ff3b5b9882fa92bf5930094e02c43918f50e18ab34d190bde186e76ae8ed05
+MISC metadata.xml 880 BLAKE2B 7b5d947e9fd00cebd69774da16e0b393bb91c03312f6004f838924f3d3dd0f6cb53e2ad810a42365803e09a18c1a08d94eae071cd833ced96fa0734832a3f68c SHA512 cdfa00bf9730cd0c990a9b084e4fb09958f5e8611e16a292ffa0de1b9a3a34b4e231688c700d789166ab64bb45db828cfdae3593ea04cf5add2b1c0615d0afd6
diff --git a/dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild b/dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild
new file mode 100644
index 000000000000..781b9c6d13ee
--- /dev/null
+++ b/dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit python-single-r1 ada multiprocessing
+
+DESCRIPTION="A Python framework to generate language parsers - Contrib"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/langkit/archive/refs/tags/v${PV}.tar.gz
+	-> langkit-${PV}.tar.gz"
+
+S="${WORKDIR}"/langkit-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs static-pic"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	${ADA_DEPS}
+	dev-ada/langkit:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]
+	$(python_gen_cond_dep '
+		dev-ada/langkit[${PYTHON_USEDEP}]
+	')"
+BDEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_configure() {
+	cd contrib/python
+	${EPYTHON} manage.py generate -P --disable-warning undocumented-nodes
+	cd ../lkt
+	${EPYTHON} manage.py generate -P
+}
+
+src_compile() {
+	cd contrib/python
+	build () {
+		rm -f build/obj/dev/*.lexch
+		gprbuild -v -p -j$(makeopts_jobs) -Pbuild/libpythonlang.gpr \
+			-XLIBRARY_TYPE=$1 -XGPR_BUILD=$1 -XXMLADA_BUILD=$1 \
+			-XLIBPYTHONLANG_WARNINGS=true -gnatef \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprbuild -v -p -j$(makeopts_jobs) -Pbuild/mains.gpr \
+		-XLIBRARY_TYPE=relocatable -XGPR_BUILD=relocatable \
+		-XXMLADA_BUILD=relocatable -XLIBPYTHONLANG_WARNINGS=true \
+		parse.adb -gnatef -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} \
+		|| die
+	cd ../lkt
+	build () {
+		rm -f build/obj/dev/*.lexch
+		gprbuild -v -p -j$(makeopts_jobs) -Pbuild/liblktlang.gpr \
+			-XLIBRARY_TYPE=$1 -XGPR_BUILD=$1 -XXMLADA_BUILD=$1 \
+			-XLIBLKTLANG_WARNINGS=true -gnatef \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprbuild -v -p -j$(makeopts_jobs) -Pbuild/mains.gpr \
+		-XLIBRARY_TYPE=relocatable -XGPR_BUILD=relocatable \
+		-XXMLADA_BUILD=relocatable -XLIBLKTLANG_WARNINGS=true \
+		parse.adb lkt_toolbox.adb unparse.adb -gnatef \
+		-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
+	cd ../..
+}
+
+src_install() {
+	cd contrib/python
+	build () {
+		gprinstall -v -p -Pbuild/libpythonlang.gpr --prefix="${D}"/usr \
+			--build-var=LIBRARY_TYPE --build-var=LIBPYTHONLANG_LIBRARY_TYPE \
+			--sources-subdir=include/libpythonlang --build-name=$1 \
+			-XLIBRARY_TYPE=$1 -XGPR_BUILD=$1 -XXMLADA_BUILD=$1 || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	python_domodule build/python/libpythonlang
+	cd ../lkt
+	build () {
+		gprinstall -v -p -Pbuild/liblktlang.gpr --prefix="${D}"/usr \
+			--build-var=LIBRARY_TYPE --build-var=LIBLKTLANG_LIBRARY_TYPE \
+			--sources-subdir=include/liblktlang --build-name=$1 \
+			-XLIBRARY_TYPE=$1 -XGPR_BUILD=$1 -XXMLADA_BUILD=$1 || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	python_domodule build/python/liblktlang
+}
diff --git a/dev-ada/langkit-contrib/metadata.xml b/dev-ada/langkit-contrib/metadata.xml
new file mode 100644
index 000000000000..de96d346448b
--- /dev/null
+++ b/dev-ada/langkit-contrib/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="static-pic">Build static library with pic code</flag>
+	</use>
+	<longdescription lang="en">
+		Langkit (nickname for language kit) is a tool whose purpose is to make
+		it easy to create syntactic and semantic analysis engines. Write a
+		language specification in our Python DSL and Langkit will generate for
+		you an Ada library with bindings for the C and Python programming
+		languages.
+		The generated library is meant to provide a basis to write tooling,
+		including tools working on potentially changing and incorrect code,
+		such as IDEs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">AdaCore/langkit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 9d9a549cb338..dee7afbb284c 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,5 +1,6 @@
+DIST AdaSAT-25.0.0.tar.gz 30707 BLAKE2B 7256fa3db93273657d52b7b895e51efa95c102753efbe498d283ef33a6bed067ddf2975e72a357483aa67b5ce7d8073d4a192e9a4741ab204ce159ec0f57b529 SHA512 7781a683c5aef9efa9a6b57e82070184c02d734fcf448aa5aa79d9aaa3b40d181d87d7487d9c204f7dcd584a3d2dc1c9ebc027e82b2532c3418c25a2395fd9af
 DIST langkit-24.0.0.tar.gz 1282265 BLAKE2B 63aa3eb05be6ea590c3f4d0478cdfa0ee217606607c73b4c172c5b89d8a2a5d815efbf2bcd23b84548ececd11ffa1f89ebcbc5d411845b7a3834d6f7e16aa0b1 SHA512 b26a83cd7e57d8821d09e5e1aeaa2fa5837ab2f3901a006cfd49b059a3cfc98d7ea236dc39a2e24365196bd45c2124396795fd46fdaf4d7cb41aabb45ff85326
 DIST langkit-25.0.0.tar.gz 1560623 BLAKE2B ef03755397e85fde9b968dced7cf6bc72e85c21b6baef41160e527840caf32e0ea573d52f66c4b82ce9fa7e2dd0120286e06a3f3525e0acad5f9f11037be29b9 SHA512 27ffecb9b6c5568ebdba4864d9c5ef7e511718083fe087e3af60cfe8cc994b6ea7353cc745bc33395d33e169aaaf6916d991fa4941774932904df3e9b455f1dc
 EBUILD langkit-24.0.0-r2.ebuild 3007 BLAKE2B 9968470fb9fb85fe67152a07e679d168c6e06c7088a363a0e52d1a6a5bfac9aab50392fe13323ac5926a0111b89d08512a3ca0ff5f11971cb25eab711dc3890f SHA512 4cce11a944d2642f4d4916a1ba2e4ff063cd27525e11e10e8bec1b64c14c86f43d5e8826f969d49d92f95f399310c9cd4f655793b0ddfe2f1087ccb1de2fcd8e
-EBUILD langkit-25.0.0.ebuild 3194 BLAKE2B 4fd017e8c4c09273c2ce49102ff2ea0950b7fed1a87cb38f067e5f685ff0a79566fd8c255005171fa50268b6d21984c544cda5adbd3ff7a14e5c550f6108b980 SHA512 c365448ae922d6e9aad05ef6937d69f24fcbb713ee9bd3547bb9471efa7fec2eb0316df53a9a527b4250efe24eb0ceef87545318fc0a90fa1250595a787562e4
+EBUILD langkit-25.0.0-r2.ebuild 2324 BLAKE2B 320ab607270805b3f10c26db54899ee2e88e6a3b705ed0d038e4baf52605f6a837670ebbb3978cbf92881d490efacecbf5e25ce446f6ed68bcf9666e16c40770 SHA512 7ca7b88ca9383193ac97823eafdf366c61d127703c786397803b0d980ab0b4ebd559966bfe15c56990cfb2d207abf0927a635372e543576ee8447d3da8c3b25f
 MISC metadata.xml 930 BLAKE2B 5ec7305df09ee1011fc0a0b93f75bbbf315a153a835d0e3c074e95b717d6c95c7f0b29e99537375be3c6aa73e5cf089cd32fcc3567f78bb3c6768e171c3d4521 SHA512 8f0056d87158d87dc3fad08ceffcfc2a6c065977669b8d0f8560b72627f8b050ed34886e4cad19e51062b8a2e412f37b1c3ff983f1d33da79cb6283f6532df85
diff --git a/dev-ada/langkit/langkit-25.0.0-r2.ebuild b/dev-ada/langkit/langkit-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..af385c10ab09
--- /dev/null
+++ b/dev-ada/langkit/langkit-25.0.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 ada multiprocessing
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz
+	https://github.com/AdaCore/AdaSAT/archive/refs/tags/v${PV}.tar.gz
+	-> AdaSAT-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	${ADA_DEPS}
+	dev-ada/gnatcoll-bindings:=[${ADA_USEDEP},gmp,iconv(+)]
+	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs?,static-pic?]
+	dev-ada/prettier-ada:=[${ADA_USEDEP},shared,static-libs?,static-pic?]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/funcy[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/mypy[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+distutils_enable_sphinx doc
+
+python_prepare_all() {
+	mv "${WORKDIR}"/AdaSAT-${PV} langkit/adasat || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	build () {
+		rm -f langkit/support/obj/dev/*lexch
+		gprbuild -v -p -j$(makeopts_jobs) \
+			-P langkit/support/langkit_support.gpr -XLIBRARY_TYPE=$1 \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprbuild -v -p -j$(makeopts_jobs) \
+		-P sigsegv_handler/langkit_sigsegv_handler.gpr \
+		-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
+	sphinx_compile_all
+}
+
+python_install_all() {
+	build () {
+		gprinstall -v -P langkit/support/langkit_support.gpr -p \
+			--prefix="${D}"/usr --build-var=LIBRARY_TYPE \
+			--build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
+			--sources-subdir=include/langkit_support \
+			-XLIBRARY_TYPE=$1 --build-name=$1 || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p \
+		--prefix="${D}"/usr || die
+	einstalldocs
+}
diff --git a/dev-ada/langkit/langkit-25.0.0.ebuild b/dev-ada/langkit/langkit-25.0.0.ebuild
deleted file mode 100644
index 3a0d853147fb..000000000000
--- a/dev-ada/langkit/langkit-25.0.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 ada multiprocessing
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/AdaSAT[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/e3-core[${PYTHON_USEDEP}]
-	dev-ada/gnatcoll-bindings:=[${ADA_USEDEP},gmp,iconv(+),shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/prettier-ada:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/funcy[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/mypy[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/types-docutils[${PYTHON_USEDEP}]
-	dev-python/types-gdb[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	cd testsuite/tests
-
-	# missing gprbuild option to build libraries static/relocatable
-	rm -r {langkit_support,adalog,misc/link_two_libs} || die
-	rm -r misc/standalone || die
-
-	# other failures
-	rm -r misc/docstrings_lkt_roles || die
-}
-
-python_compile_all() {
-	build () {
-		rm -f langkit/support/obj/dev/*lexch
-		gprbuild -j$(makeopts_jobs) -p -v \
-			-XLIBRARY_TYPE=$1 -P langkit/support/langkit_support.gpr -XBUILD_MODE=dev \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	gprbuild -j$(makeopts_jobs) -p -v \
-		-P sigsegv_handler/langkit_sigsegv_handler.gpr -XBUILD_MODE=dev \
-		-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	sphinx_compile_all
-}
-
-python_test_all() {
-	export GPR_PROJECT_PATH="${S}"/langkit/support
-	${EPYTHON} ./manage.py make --no-langkit-support || die
-	eval $(./manage.py setenv)
-	${EPYTHON} ./manage.py test -v \
-		--disable-ocaml \
-		--disable-gdb \
-		--disable-tear-up-builds \
-		--restricted-env \
-		--jobs $(makeopts_jobs) \
-		|& tee langkit.testOut
-	grep -qw FAIL langkit.testOut && die
-}
-
-python_install_all() {
-	build () {
-		gprinstall -v -P langkit/support/langkit_support.gpr -p -XBUILD_MODE=dev \
-			--prefix="${D}"/usr --build-var=LIBRARY_TYPE \
-			--build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
-			--sources-subdir=include/langkit_support \
-			-XLIBRARY_TYPE=$1 --build-name=$1 || die
-	}
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use shared; then
-		build relocatable
-	fi
-	gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p -XBUILD_MODE=dev \
-		--prefix="${D}"/usr || die
-	einstalldocs
-}