4 files changed, 122 insertions, 126 deletions
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index c3c5ad25d086..15768b42e645 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1,5 +1,5 @@
-DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B 475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b SHA512 f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc
+DIST gpr2-with-gprconfig_kb-25.0.tgz 1772855 BLAKE2B f4bcde7f2ad951d00b7b03b2d49120c301836a2bc676de0c0f7c493573a03b15bc20a6fd7f8d3034a063f6227b47f54468efe14260de1bb52a1da6bc4d5b87d6 SHA512 70fe0fcf541f6d3d90a34cab1638bbc0283dcd765c000406e0cfb73bae1817b30ddfe73f3672247a97c6b6bfc41900bc96a4440ca0c660f9c2f7b9d3cc8f8dcf
 DIST gpr2-with-lkparser-24.0.tgz 2030278 BLAKE2B ae42fd876a08a654db2db919e6d777ba603d54d6db618e8b8dbdfcfd9313decad092e0a9feae09ca46ec324cd860eaffbb6fa670290d454414677ad7e4a61dc7 SHA512 eda3c693393763da31312733e2bc06e852b867a32b42da6afdddd623051a1d29f7243aabaef3ae50052b22686dce6db62d9823652ce516d79822e4215f4d87b1
-EBUILD gpr-23.0.0-r6.ebuild 3362 BLAKE2B 0763dd534b6bae5835ed377435d74460eb1fbee8a204b74f35c88b3e5cdcfb3a4d50bfc07ab5660af7e214df01ddcf224db3d9c7ab2e7cb06ffdf2bfaf35850e SHA512 782fe78be24b21926060c6ecc0bc3b46d68d06dbae8a799b148ac1b5c9b551423d0a896a743c7f943cd06f9bb943bf29e9404af64a3aabbf52c17d3eb57320e7
-EBUILD gpr-24.0.0-r1.ebuild 2323 BLAKE2B 37469f3937d00f77b5f3325047d68683ce7c53750a53623e70a1e8af736c3792e801a6cb0235aa78627494b8bebc1677202399aea2e4483d62160d99c2710349 SHA512 4fe3b002ca060bd7c487baceb4b9a32209cc2cae0f31273d32068df6b4031884e3ca781504af8f9577d23c7db3cc97b0b3aa47a10da24554a0336a9c1a0bc1dc
+EBUILD gpr-24.0.0-r1.ebuild 2326 BLAKE2B 94102422d96b289b3d1b04f243dc7d4a78267111e5ec3d68ea2129b6642ce16e95823cb16c7366e21dd2999014772a56a0cdd5e6fc399e0999c43e65d1b4db5f SHA512 b9813a7de8f82a431a2e743a53e2a9867ac5b33fa9511dddb9490abe823e717b7759e5321b20d23a8c5960688eda33c7b44ce9d45a34d60287cce680b09bab8f
+EBUILD gpr-25.0.0.ebuild 3419 BLAKE2B 2286f4a5f845d36548489178d091db3051313caaa83193870b381a7295880839b275530931313f38f7e3cbe6606d71678f4c41231357655f1d7ed5a5d62895bd SHA512 af7d3120d39bf74cda068f549f9bb04483509b3bd86f7d6eb6f639223c9f5b48c6206c4d7efc7cd1add50620eb11cf73bf4d5493cf00765c8fb9b338bc37f16a
 MISC metadata.xml 425 BLAKE2B f43600b21f72ac0a1e54e757848b52c070dafa69d36c142d60d7693cdd17c9f3049948da3b6c069a46a3b1e836bac18d268823a80c037f4e14e08f4822b8e1a3 SHA512 c6df0aded61f6d481d64a331b5db0da30dd6a75c56cc051ad5ba7f90cc7376f17ede0b7c2f94acd110ccc104773c138d961040b272edc7a11f1671d548008e7e
diff --git a/dev-ada/gpr/gpr-23.0.0-r6.ebuild b/dev-ada/gpr/gpr-23.0.0-r6.ebuild
deleted file mode 100644
index d103fba9e4f2..000000000000
--- a/dev-ada/gpr/gpr-23.0.0-r6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit python-any-r1 ada multiprocessing
-
-DESCRIPTION="LibGPR2 - Parser for GPR Project files"
-HOMEPAGE="https://github.com/AdaCore/gpr"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
-"
-
-DEPEND="${RDEPEND}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-ada/langkit[${PYTHON_USEDEP}]
-	')
-	dev-ada/libadalang
-"
-
-python_check_deps() {
-	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	ada_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	emake ENABLE_SHARED=$(usex shared) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	mkdir -p .build/kb || die
-	gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
-		--relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-	.build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
-	emake -C langkit setup DEST="${S}/.build/lkparser" PYTHONEXE=${PYTHON}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		libtype='static'
-	elif use static-pic; then
-		libtype='static-pic'
-	elif use shared; then
-		libtype='relocatable'
-	fi
-
-	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} gpr2-tools.gpr \
-		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		-XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr \
-		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
-			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
-			--build-name=$1 --build-var=LIBRARY_TYPE \
-			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		--build-name=${libtype} --mode=usage gpr2-tools.gpr || die
-	gprinstall -p -f -v -XGPR2_BUILD=release --prefix='${D}/usr' \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		-XLANGKIT_SUPPORT_BUILD=${libtype} --build-name=${libtype} \
-		--mode=usage gpr2-name.gpr || die
-
-	einstalldocs
-
-	rm "${D}"/usr/bin/gprclean || die
-	rm "${D}"/usr/bin/gprconfig || die
-	rm "${D}"/usr/bin/gprinstall || die
-	rm "${D}"/usr/bin/gprls || die
-}
diff --git a/dev-ada/gpr/gpr-24.0.0-r1.ebuild b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
index a79a69b27ec9..07b25b79493f 100644
--- a/dev-ada/gpr/gpr-24.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ REQUIRED_USE="|| ( shared static-libs static-pic )
 RDEPEND="${ADA_DEPS}
 	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
 "
 
 DEPEND="${RDEPEND}
diff --git a/dev-ada/gpr/gpr-25.0.0.ebuild b/dev-ada/gpr/gpr-25.0.0.ebuild
new file mode 100644
index 000000000000..c0d84d4ddf85
--- /dev/null
+++ b/dev-ada/gpr/gpr-25.0.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+
+inherit ada multiprocessing
+
+DESCRIPTION="LibGPR2 - Parser for GPR Project files"
+HOMEPAGE="https://github.com/AdaCore/gpr"
+SRC_URI="https://github.com/AdaCore/${PN}/releases/download/v${PV}/gpr2-with-gprconfig_kb-$(ver_cut 1-2).tgz"
+
+S="${WORKDIR}"/${PN}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	>=dev-ada/gnatcoll-core-25[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
+"
+
+DEPEND="${RDEPEND}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_prepare() {
+	default
+	cd testsuite/tests
+	rm -r \
+		autoconf callgraph-install c-closure check-has-value \
+		check-shared-lib-import configuration-file-error-handling \
+		custom_attr_no_pack disable_warnings display-version \
+		extending-add-body extending-interface-in-extended-project \
+		externals-in-configuration-project installed_asm_object \
+		invalid-project-2 kb-validation invalid-trace-file library-interfaces \
+		multi-unit-3 nested-case nested-externals no-naming-package-in-config \
+		parent-var-visible runtime-user-project self-project-attribute \
+		source_subdirs subdirs types-import unknown-var-config view_builder \
+		build_db_dag/actions_signature tooling/source_dirs || die
+	rm -r ali_parser/dependencies || die
+	cd tools
+	rm -r gprls/closure/base || die
+	rm -r gprls/closure/sal || dir
+	rm -r gprls/closure/short-subunit-names || die
+	rm -r gprls/closure/subunits || die
+	rm -r gprclean/remove-empty-build-directories || die
+	rm -r gprclean/no_build_dir_recursive || die
+	rm -r gprclean/output-dir-not-found-warnings-not-printed || die
+	rm -r gprinspect/text || die
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || 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
+	if use static-libs; then
+		libtype='static'
+	elif use static-pic; then
+		libtype='static-pic'
+	elif use shared; then
+		libtype='relocatable'
+	fi
+
+	gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} tools/gpr2-tools.gpr \
+		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
+}
+
+src_test() {
+	cd testsuite
+	./testsuite.py |& grep -w FAIL && die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
+			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	gprinstall -p -f -v -aP . -XGPR2_BUILD=release --prefix="${D}/usr" \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		--build-name=${libtype} --mode=usage tools/gpr2-tools.gpr || die
+
+	einstalldocs
+
+	rm "${D}"/usr/bin/gprconfig || die
+	rm -r "${D}"/usr/share/gpr/manifests
+}