From 575bcb9220287a6f0d2577db1fd9fe55d9d8b745 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 23 Feb 2025 19:24:10 +0000
Subject: gentoo auto-resync : 23:02:2025 - 19:24:09

---
 dev-ada/Manifest.gz                                | Bin 5411 -> 5411 bytes
 dev-ada/ada_language_server/Manifest               |   4 +-
 .../ada_language_server-24.0.1-r1.ebuild           |  81 ++++++++++++++
 .../ada_language_server-24.0.1.ebuild              |  81 --------------
 .../ada_language_server-25.0.20241014.ebuild       |  74 +++++++++++++
 dev-ada/gnatdoc/Manifest                           |   2 +-
 dev-ada/gnatdoc/gnatdoc-25.0.0-r1.ebuild           |  73 -------------
 dev-ada/gnatdoc/gnatdoc-25.0.0-r2.ebuild           |  73 +++++++++++++
 dev-ada/gnatformat/Manifest                        |   2 +-
 dev-ada/gnatformat/gnatformat-25.0.0.ebuild        |   2 +-
 dev-ada/gpr/Manifest                               |   4 +-
 dev-ada/gpr/gpr-24.2.0.ebuild                      |   2 +-
 dev-ada/gpr/gpr-25.0.0-r1.ebuild                   | 117 +++++++++++++++++++++
 dev-ada/gpr/gpr-25.0.0.ebuild                      | 117 ---------------------
 dev-ada/lal-refactor/Manifest                      |   2 +-
 dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild |  58 ++++++++++
 dev-ada/lal-refactor/lal-refactor-25.0.0.ebuild    |  57 ----------
 dev-ada/libadalang-tools/Manifest                  |   2 +-
 .../libadalang-tools-25.0.0-r1.ebuild              |  88 ++++++++++++++++
 .../libadalang-tools-25.0.0.ebuild                 |  88 ----------------
 dev-ada/libadalang/Manifest                        |   4 +-
 dev-ada/libadalang/libadalang-24.0.0-r2.ebuild     |   4 +-
 dev-ada/libadalang/libadalang-25.0.0.ebuild        |  11 +-
 dev-ada/prettier-ada/Manifest                      |   2 +-
 dev-ada/prettier-ada/prettier-ada-25.0.0-r1.ebuild | 106 +++++++++++++++++++
 dev-ada/prettier-ada/prettier-ada-25.0.0.ebuild    | 106 -------------------
 26 files changed, 619 insertions(+), 541 deletions(-)
 create mode 100644 dev-ada/ada_language_server/ada_language_server-24.0.1-r1.ebuild
 delete mode 100644 dev-ada/ada_language_server/ada_language_server-24.0.1.ebuild
 create mode 100644 dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
 delete mode 100644 dev-ada/gnatdoc/gnatdoc-25.0.0-r1.ebuild
 create mode 100644 dev-ada/gnatdoc/gnatdoc-25.0.0-r2.ebuild
 create mode 100644 dev-ada/gpr/gpr-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/gpr/gpr-25.0.0.ebuild
 create mode 100644 dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/lal-refactor/lal-refactor-25.0.0.ebuild
 create mode 100644 dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/libadalang-tools/libadalang-tools-25.0.0.ebuild
 create mode 100644 dev-ada/prettier-ada/prettier-ada-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/prettier-ada/prettier-ada-25.0.0.ebuild

(limited to 'dev-ada')

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index d8cd576a1622..f242f71de397 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/ada_language_server/Manifest b/dev-ada/ada_language_server/Manifest
index 3deaf28d44bb..3d0c66f230d8 100644
--- a/dev-ada/ada_language_server/Manifest
+++ b/dev-ada/ada_language_server/Manifest
@@ -1,5 +1,7 @@
 DIST ada_language_server-23.0.10.tar.gz 1224074 BLAKE2B 100a0d042a6c638b1b3eb7c9c27a638f218a66e3f52a6f9be53fc42e764aff636c4fe7c1f532f2ba7ae6a811bf4cb8a8ce4a416fd1958c460ffb7f715a7166f5 SHA512 bc062d9e4b6c37a9add7a5665a44ee0ad06fd9ef12cb854b49ed52ed060dfe3582b54a47a4764f0f5b305c2ea697d180832ee4ed87dfcde37bcbc83cb2479299
 DIST ada_language_server-24.0.1.tar.gz 1923431 BLAKE2B a2b4383fd12cd2b3a806263a34194cc479de6c9740a520f2e2dc1fb1f0aa3521dd4011042cbcff4dee9efb0957f7d3c1dbc95973321c6cb229b3b054784c8f2d SHA512 3e9e020240ce39061c9fb938eb616f3885ea1df58b143065705a014ac1d9fcb29066b24e69240698327f54c9cae80d9bce543557410cf25a650e7c73af001daf
+DIST ada_language_server-25.0.20241014.tar.gz 2364793 BLAKE2B 3ee87c31d6b455d667e346a1e27bf32456719726004955b5a4cc84a3a4952baa7496eb815b816e3a3e4b23d4642159a675d0dfe8c31ca03df0f9b0acc663dfe7 SHA512 7ac80d53ac73b6a3012dcf0bf99148dfffd745af7f8ab753549efcffc006533aca0b981a856da94ca4b39cf27730d93cc2cdc303f64292bed9acc616a6a1f0a6
 EBUILD ada_language_server-23.0.10-r3.ebuild 2354 BLAKE2B 6291d1b3058fc24bf2e91399967b3407ccbf7b8dd5a3dbd2b7f40b2c196980b06345e7c7b6821db39dbbabfc7445b82326ae22823b31b8c58865909a9ecb355e SHA512 79b6759308804ed0f2bf55aa87862e0a90af2870b8d2c73f5fe69c9895fbb8a912d14575247095b6fb60c0e623a44ea92d88298802a47e8caad27ba8ebc157e0
-EBUILD ada_language_server-24.0.1.ebuild 2665 BLAKE2B 0dae30757ff5b8e4887d8586750367686714a2bb910253796109b90af9720769f3e6b506ed3735213767930097e735feeee610e60394ceadd4408edb171c9e1b SHA512 eef22fef946ec1e03a950e8450cf38f6e88289f26a92dc6087366a61bd3eb879ec5f6834061542abd996b2c2911728acdae1b873740121cda32e3eaf864320f2
+EBUILD ada_language_server-24.0.1-r1.ebuild 2671 BLAKE2B 870b9e38c9da4cfeafd155e3962114e89bd80703cef0798cc438f35f370f1f2b806bbf6ac2663d70134eba22d7634f4a66737897558e0e8b7cd2bc71aa6ab34d SHA512 cc386bcafa4a87b25e1d42e9df7f125dcb9d26975e6eb95aaf384db81af7016132560b814aacc0162dd8010ceb0c77d7a97bf1ff686cd620421efdc04ea6c001
+EBUILD ada_language_server-25.0.20241014.ebuild 2735 BLAKE2B 2041598e57e21c0e00334465c81c7d34ea5118134c12bc36544844822444e81ef1b0adf67f394327b2c22e88d32c02c4e925aa8e681e9f99ccc7b078c811ad13 SHA512 6c65427f50af6614003484074d8863210bc6bcbcdf3fb977ce6411af5ff31ce531a6b6d02c93689cb71bd0ccac903e7ad9ce060674ebb475c13fc37f0c06df52
 MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-24.0.1-r1.ebuild b/dev-ada/ada_language_server/ada_language_server-24.0.1-r1.ebuild
new file mode 100644
index 000000000000..dc2d827f4817
--- /dev/null
+++ b/dev-ada/ada_language_server/ada_language_server-24.0.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
+inherit ada multiprocessing toolchain-funcs
+
+DESCRIPTION="an implementation of the Microsoft Language Server Protocol for Ada/SPARK"
+HOMEPAGE="https://github.com/AdaCore/ada_language_server"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # Tests do not work
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/ada_libfswatch[${ADA_USEDEP}]
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	dev-ada/gnatdoc[${ADA_USEDEP}]
+	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared]
+	dev-ada/lal-refactor[${ADA_USEDEP},shared(+)]
+	dev-ada/libadalang[${ADA_USEDEP}]
+	>=dev-ada/libadalang-tools-23[${ADA_USEDEP},shared]
+	dev-ada/spawn[${ADA_USEDEP},shared,glib(+)]
+	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},shared]
+	sys-fs/fswatch:="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+	test? ( dev-ada/e3-testsuite )"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_prepare() {
+	sed -i \
+		-e "s:g++:$(tc-getCXX):" \
+		gnat/lsp_server.gpr \
+		|| die
+	default
+}
+
+src_compile() {
+	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_3_17.gpr -p \
+		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		-c lsp-inputs.adb -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_3_17.gpr -p \
+		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/tester.gpr -p \
+		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -d -ws -c -u \
+		-P gnat/lsp_server.gpr -p \
+		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		s-memory.adb -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -d -P gnat/lsp_server.gpr \
+		-p -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		-XVERSION= -XBUILD_DATE= -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -d -P gnat/lsp_client.gpr \
+		-p -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	mkdir -p integration/vscode/ada/x64/linux
+	cp -f .obj/server/ada_language_server integration/vscode/ada/x64/linux || die
+}
+
+src_install() {
+	gprinstall -f -P gnat/lsp_server.gpr -p -r --mode=usage \
+		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		|| die
+	gprinstall -f -P gnat/tester.gpr -p \
+		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		|| die
+	gprinstall -f -P gnat/lsp_client.gpr -p -r --mode=dev \
+		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
+		|| die
+
+	einstalldocs
+}
diff --git a/dev-ada/ada_language_server/ada_language_server-24.0.1.ebuild b/dev-ada/ada_language_server/ada_language_server-24.0.1.ebuild
deleted file mode 100644
index 81c7a9e39f1f..000000000000
--- a/dev-ada/ada_language_server/ada_language_server-24.0.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing toolchain-funcs
-
-DESCRIPTION="an implementation of the Microsoft Language Server Protocol for Ada/SPARK"
-HOMEPAGE="https://github.com/AdaCore/ada_language_server"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Tests do not work
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/ada_libfswatch[${ADA_USEDEP}]
-	sys-fs/fswatch:=
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	dev-ada/gnatdoc[${ADA_USEDEP}]
-	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared]
-	dev-ada/libadalang[${ADA_USEDEP}]
-	dev-ada/lal-refactor[${ADA_USEDEP},shared]
-	>=dev-ada/libadalang-tools-23[${ADA_USEDEP},shared]
-	dev-ada/spawn[${ADA_USEDEP},shared,glib]
-	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},shared]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
-	test? ( dev-ada/e3-testsuite )"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_prepare() {
-	sed -i \
-		-e "s:g++:$(tc-getCXX):" \
-		gnat/lsp_server.gpr \
-		|| die
-	default
-}
-
-src_compile() {
-	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_3_17.gpr -p \
-		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		-c lsp-inputs.adb -cargs:Ada ${ADAFLAGS} || die
-	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_3_17.gpr -p \
-		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		-cargs:Ada ${ADAFLAGS} || die
-	gprbuild -v -j$(makeopts_jobs) -P gnat/tester.gpr -p \
-		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		-cargs:Ada ${ADAFLAGS} || die
-	gprbuild -v -j$(makeopts_jobs) -d -ws -c -u \
-		-P gnat/lsp_server.gpr -p \
-		-XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		s-memory.adb -cargs:Ada ${ADAFLAGS} || die
-	gprbuild -v -j$(makeopts_jobs) -d -P gnat/lsp_server.gpr \
-		-p -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		-XVERSION= -XBUILD_DATE= -cargs:Ada ${ADAFLAGS} || die
-	gprbuild -v -j$(makeopts_jobs) -d -P gnat/lsp_client.gpr \
-		-p -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		-cargs:Ada ${ADAFLAGS} || die
-	mkdir -p integration/vscode/ada/x64/linux
-	cp -f .obj/server/ada_language_server integration/vscode/ada/x64/linux || die
-}
-
-src_install() {
-	gprinstall -f -P gnat/lsp_server.gpr -p -r --mode=usage \
-		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		|| die
-	gprinstall -f -P gnat/tester.gpr -p \
-		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		|| die
-	gprinstall -f -P gnat/lsp_client.gpr -p -r --mode=dev \
-		--prefix="${D}"/usr -XBUILD_MODE=prod -XLIBRARY_TYPE=relocatable \
-		|| die
-
-	einstalldocs
-}
diff --git a/dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild b/dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
new file mode 100644
index 000000000000..65eef988c23d
--- /dev/null
+++ b/dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+inherit ada multiprocessing
+
+DESCRIPTION="a Language Server Protocol for Ada/SPARK"
+HOMEPAGE="https://github.com/AdaCore/ada_language_server"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # Tests do not work
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/ada_libfswatch:=[${ADA_USEDEP}]
+	dev-ada/AdaSAT:=[${ADA_USEDEP}]
+	dev-ada/gnatcoll-bindings:=[${ADA_USEDEP},shared]
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared]
+	dev-ada/gnatdoc:=[${ADA_USEDEP}]
+	dev-ada/gnatformat:=[${ADA_USEDEP}]
+	dev-ada/gpr:=[${ADA_USEDEP}]
+	dev-ada/lal-refactor:=[${ADA_USEDEP},shared(+)]
+	dev-ada/langkit:=[${ADA_USEDEP},shared(+)]
+	dev-ada/libadalang:=[${ADA_USEDEP}]
+	>=dev-ada/libadalang-tools-23:=[${ADA_USEDEP},shared]
+	dev-ada/libgpr:=[${ADA_USEDEP}]
+	dev-ada/prettier-ada:=[${ADA_USEDEP}]
+	dev-ada/spawn:=[${ADA_USEDEP},shared,glib(+)]
+	dev-ada/templates-parser:=[${ADA_USEDEP},shared]
+	>=dev-ada/VSS-24.0.0:=[${ADA_USEDEP},shared]
+	dev-ada/xmlada:=[${ADA_USEDEP},shared]
+	dev-libs/gmp
+	sys-fs/fswatch:="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+	test? ( dev-ada/e3-testsuite )"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_compile() {
+	gprbuild -v -m -j$(makeopts_jobs) -P gnat/lsp_server.gpr -p \
+		-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -m -j$(makeopts_jobs) -P gnat/lsp_3_17.gpr -p \
+		-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -m -j$(makeopts_jobs) -P gnat/tester.gpr -p \
+		-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -m -j$(makeopts_jobs) -P gnat/lsp_client.gpr -p \
+		-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	mkdir -p integration/vscode/ada/x64/linux
+	cp -f .obj/server/ada_language_server integration/vscode/ada/x64/linux || die
+}
+
+src_install() {
+	gprinstall -v -f -P gnat/lsp_server.gpr -p -r --mode=usage \
+		--prefix="${D}"/usr -XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable -XGPR_BUILD=relocatable || die
+	gprinstall -v -f -P gnat/tester.gpr -p --prefix="${D}"/usr \
+		-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
+		-XGPR_BUILD=relocatable || die
+	gprinstall -v -f -P gnat/lsp_client.gpr -p -r --mode=dev \
+		--prefix="${D}"/usr -XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable -XGPR_BUILD=relocatable || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatdoc/Manifest b/dev-ada/gnatdoc/Manifest
index 6a3b4934c9d4..62c3c2cca008 100644
--- a/dev-ada/gnatdoc/Manifest
+++ b/dev-ada/gnatdoc/Manifest
@@ -1,5 +1,5 @@
 DIST gnatdoc-24.0.0.tar.gz 113089 BLAKE2B e26310504863b8b88391c715a1ecbc9657bd03c6bd4f9b6b67b20f2a5d00f8a9ed3dd537409538999eeeb893e407da552bd02ed05b8b6c3f655f57ac55e616b9 SHA512 95b33fc556ba25611faca6b64a5599b98471bf687d13f10727300c62305cd45585d59ea77a7c64d33619e324508951624a0855535464a6b9b5c6dd27d2a56f83
 DIST gnatdoc-25.0.0.tar.gz 179534 BLAKE2B c3441f91eec0cbbf87602a9c4c650cc651982668ef212810e3fc037f9389f939c5e6831ba6d57abdd66e91b3d17fe76916b99dfcd3c91a7a9f7e44fb1ea467fa SHA512 64814a48dfda70c9de7590061fb20960f99e07d9b9eadf4a5d97dd56e68fcb133a4d51f1c9c6d3c1f29d4c5bc2e7565e02305ed16968e4e37a42fd5374466ef3
 EBUILD gnatdoc-24.0.0-r1.ebuild 1519 BLAKE2B 74432e6aca8bcc5be79b055d967203248c9df4d09586d1df38da3f97930d13f76e4e7a8a85e65d32c71bc25a7a7efc63833c00baa9ec99b64c8937e0b48ece17 SHA512 66d4c4d95c29fe24c046083b077ed0b464d00d22573756d6f1a71ef4a64c6929b8bc66a80e4cc791d28a417ddb590050d90cef01e56796475779c6d5795b1f77
-EBUILD gnatdoc-25.0.0-r1.ebuild 1950 BLAKE2B 49f09f90186b84ea0ba0fb20034e2cda09a5975e782f7f75a7a077d72172b80aeca52f2065a82e5176fce8fcd8b39f09996a1602f0f38336985617c6d9060441 SHA512 79ebe5f3f18405d2f37a29301465a566d89fe7cd720cd102b900c1743923126440f06da1010e387bdf56561125e0a8bd46b2a68cb77c1a753d0c843b14e0d81e
+EBUILD gnatdoc-25.0.0-r2.ebuild 1948 BLAKE2B 93c34fb45c605aeff2068a95c0104bd35b7d11aa23d277571a754bb116617210da50aca7ce1f2f7df4cda1a4f17f7b10ed27cd891af47f7fdeb0e81e79b99cdd SHA512 e7df8372c992ee473df6e00059d876ce61837ceaee7013dd3ca363f6ede5583ae58d9cf3a5f08e993d8531ee3e949da295a38de62779e84628abb44116413129
 MISC metadata.xml 379 BLAKE2B 1b1d66704d200e15a48cbbb2be57ec97582b96c73cd531b2319391b8ee62faee5a84d8a2b43f808af84ee520fd499e84a6e0559fc66b45ec082dffe562348bbd SHA512 3d211ccb06695365b74f911bbf48561a999d05d196a198a2e3dc7b840039b6e666cdaa97a32f12d8abf67c23616fb3d29d9b302a73d1724fe86ff518740ff0af
diff --git a/dev-ada/gnatdoc/gnatdoc-25.0.0-r1.ebuild b/dev-ada/gnatdoc/gnatdoc-25.0.0-r1.ebuild
deleted file mode 100644
index 662734ebdaaf..000000000000
--- a/dev-ada/gnatdoc/gnatdoc-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
-
-inherit ada python-single-r1 multiprocessing
-
-DESCRIPTION="GNAT Documentation Generation Tool"
-HOMEPAGE="https://github.com/AdaCore/gnatdoc"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-IUSE="doc static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}
-	${PYTHON_DEPS}
-	dev-ada/gpr:=[${ADA_USEDEP},shared(+),static-libs?]
-	dev-ada/markdown:=[${ADA_USEDEP}]
-	>=dev-ada/VSS-24.0.0:=[${ADA_USEDEP},static-libs?]
-	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]
-	dev-ada/libadalang:=[${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_compile() {
-	build() {
-		gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.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 -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable || die
-	if use doc; then
-		emake -C documentation/users_guide html
-	fi
-}
-
-src_test() {
-	gprbuild -v -j$(makeopts_jobs) -p -P gnat/tests/test_drivers.gpr \
-		-XLIBRARY_TYPE=relocatable || die
-	PATH="${S}/bin:$PATH" \
-		${EPYTHON} testsuite/testsuite.py || die
-}
-
-src_install() {
-	build() {
-		gprinstall -v -p -P gnat/libgnatdoc.gpr \
-			-XLIBRARY_TYPE=$1 --prefix="${D}"/usr || die
-	}
-	build relocatable
-	use static-libs && build static
-	use static-pic  && build static-pic
-	gprinstall -v -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
-	use doc && HTML_DOCS=( documentation/users_guide/_build/html/* )
-	einstalldocs
-}
diff --git a/dev-ada/gnatdoc/gnatdoc-25.0.0-r2.ebuild b/dev-ada/gnatdoc/gnatdoc-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..32957906d4e6
--- /dev/null
+++ b/dev-ada/gnatdoc/gnatdoc-25.0.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+ADA_COMPAT=( gcc_14 )
+
+inherit ada python-single-r1 multiprocessing
+
+DESCRIPTION="GNAT Documentation Generation Tool"
+HOMEPAGE="https://github.com/AdaCore/gnatdoc"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+IUSE="doc static-libs static-pic"
+
+RDEPEND="${ADA_DEPS}
+	${PYTHON_DEPS}
+	dev-ada/gpr:${SLOT}[${ADA_USEDEP},shared(+),static-libs?]
+	dev-ada/markdown:=[${ADA_USEDEP}]
+	>=dev-ada/VSS-24.0.0:=[${ADA_USEDEP},static-libs?]
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]
+	dev-ada/libadalang:=[${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_compile() {
+	build() {
+		gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.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 -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable || die
+	if use doc; then
+		emake -C documentation/users_guide html
+	fi
+}
+
+src_test() {
+	gprbuild -v -j$(makeopts_jobs) -p -P gnat/tests/test_drivers.gpr \
+		-XLIBRARY_TYPE=relocatable || die
+	PATH="${S}/bin:$PATH" \
+		${EPYTHON} testsuite/testsuite.py || die
+}
+
+src_install() {
+	build() {
+		gprinstall -v -p -P gnat/libgnatdoc.gpr \
+			-XLIBRARY_TYPE=$1 --prefix="${D}"/usr || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprinstall -v -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
+	use doc && HTML_DOCS=( documentation/users_guide/_build/html/* )
+	einstalldocs
+}
diff --git a/dev-ada/gnatformat/Manifest b/dev-ada/gnatformat/Manifest
index f7cf034d6b24..3aa2f06ad2ad 100644
--- a/dev-ada/gnatformat/Manifest
+++ b/dev-ada/gnatformat/Manifest
@@ -1,3 +1,3 @@
 DIST gnatformat-25.0.0.tar.gz 114710 BLAKE2B aec30d9c4555092294dfd0be9d1f03fb39f051d0b584453635e053071f3ee8e3aebc48caacb81b59b202a6a0491bd62e5b7adff7e929e1c052d1198c5af4451f SHA512 338fb17c6bfb14791fe9029d5a1cc83f72dab982b602f3a67f03d2a94bd3b2d2b19fb62b39b9c6da5a6f7ebc4eb6470f75722cf110bb6623fb1d5b25e18a29b7
-EBUILD gnatformat-25.0.0.ebuild 2774 BLAKE2B 9d1df3209c92e2e32f8a5e09f6fcbcea71c035a7be1cfbae1b97cc4fe4deba176d5ddc618351b2027430e4a55676ac0626eadc183975982591ef893b3a292a7f SHA512 feef6f7219fa55cb6c21ea79cf29139d4cc15ef02903192676a19f37b1e3a74f6120dd9ce0b77ad3c6f401a109d099878000907a2f86b641e5361b1e5f22127c
+EBUILD gnatformat-25.0.0.ebuild 2779 BLAKE2B da99ffd9ee4ef0444bf9ff464e5e51a064d6d5d6fab01422865973451b78c32ad6ce10c2ff722ca54074cbfe477ba9531c8afe5129d74b3cd6c81df7ec1753a8 SHA512 3c4d8b0b31489044130f9814efa28cc88be9500dd71c8c758885129260ee3430f8ef4e48ef9c24e6f1dbb8336b06a77025757252f5cc0235d05ec4b084a02df7
 MISC metadata.xml 382 BLAKE2B 1fb9ceca04109c460f3e9b80790f8ee26ab76cadb87944887f2679c834e32729b62ba3fbd0a47542c748e612641becde688e1ec3313813bf42e96420ca8a6e76 SHA512 0670bc70afa823a343b69e86749b2cc365a9eba85f36d1941cae04a6b5d9c8087cb2612caf5a75f8cc003ee4856bc706597c2182e463bd5cd70a8d0296ca22af
diff --git a/dev-ada/gnatformat/gnatformat-25.0.0.ebuild b/dev-ada/gnatformat/gnatformat-25.0.0.ebuild
index 12081a49236c..2f44df862709 100644
--- a/dev-ada/gnatformat/gnatformat-25.0.0.ebuild
+++ b/dev-ada/gnatformat/gnatformat-25.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc static-pic static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index 81b945d37ac4..9d0de6f613b8 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -2,6 +2,6 @@ DIST gpr-24.2.0-next.tar.gz 1524692 BLAKE2B 0e395f7d913b5b6344bb2d89d7471971ea7f
 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-24.0.0-r1.ebuild 2326 BLAKE2B 94102422d96b289b3d1b04f243dc7d4a78267111e5ec3d68ea2129b6642ce16e95823cb16c7366e21dd2999014772a56a0cdd5e6fc399e0999c43e65d1b4db5f SHA512 b9813a7de8f82a431a2e743a53e2a9867ac5b33fa9511dddb9490abe823e717b7759e5321b20d23a8c5960688eda33c7b44ce9d45a34d60287cce680b09bab8f
-EBUILD gpr-24.2.0.ebuild 2046 BLAKE2B 0b6d9e6ff238c1d652f14113347a2e9bb1cd3f10a91589d35f7d719310c66e6a75cd8a25fc11b18f8721174a425e6ed8f983565a369f3fc0c67e26dc2402ec54 SHA512 719f981fef67713e028fb55a4011350604037c28c5ae6a5c6f45133203673e44e345f96ccef78025dee0ed4c0a9ca6e984d19f3534d00ba36dccc99e6249842d
-EBUILD gpr-25.0.0.ebuild 3419 BLAKE2B 2286f4a5f845d36548489178d091db3051313caaa83193870b381a7295880839b275530931313f38f7e3cbe6606d71678f4c41231357655f1d7ed5a5d62895bd SHA512 af7d3120d39bf74cda068f549f9bb04483509b3bd86f7d6eb6f639223c9f5b48c6206c4d7efc7cd1add50620eb11cf73bf4d5493cf00765c8fb9b338bc37f16a
+EBUILD gpr-24.2.0.ebuild 2053 BLAKE2B f419336ff25c47222802be212341aba13148b7fade8185720004241e813367264b014f4606ab4b229a4d499899b83d870fe4e76219e1b6785e287b8c9d6ea7ee SHA512 133d21458549afc94da2356fde1f176150cedc28d3554c45da82092729eb4f6b1e5e3200bd46f45572d8bd233c865984e24d5bd8ad20c81faf9fbd41e47833da
+EBUILD gpr-25.0.0-r1.ebuild 3425 BLAKE2B 1025e8b0e350ed1e68049752da0d936843e79388c489f29656cc4c8ccd1a1fb2edd380142b56f36183db56d093a3e901c764ec09bb526a47b58d3e95751f71fc SHA512 e864e9f63af0a51866567f7fe3638dadafca011365dd648d63747bb53100cbb50783a28a0a5908d42a544bf44eeea8d7eac498ee66a6a66bf6d2602d005b7254
 MISC metadata.xml 425 BLAKE2B f43600b21f72ac0a1e54e757848b52c070dafa69d36c142d60d7693cdd17c9f3049948da3b6c069a46a3b1e836bac18d268823a80c037f4e14e08f4822b8e1a3 SHA512 c6df0aded61f6d481d64a331b5db0da30dd6a75c56cc051ad5ba7f90cc7376f17ede0b7c2f94acd110ccc104773c138d961040b272edc7a11f1671d548008e7e
diff --git a/dev-ada/gpr/gpr-24.2.0.ebuild b/dev-ada/gpr/gpr-24.2.0.ebuild
index 1a0d4ca6f327..cc33438f3252 100644
--- a/dev-ada/gpr/gpr-24.2.0.ebuild
+++ b/dev-ada/gpr/gpr-24.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gcc_14 )
+ADA_COMPAT=( gcc_13 gcc_14 )
 
 inherit ada multiprocessing
 
diff --git a/dev-ada/gpr/gpr-25.0.0-r1.ebuild b/dev-ada/gpr/gpr-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..f2410a550e6b
--- /dev/null
+++ b/dev-ada/gpr/gpr-25.0.0-r1.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/${PV}"
+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
+}
diff --git a/dev-ada/gpr/gpr-25.0.0.ebuild b/dev-ada/gpr/gpr-25.0.0.ebuild
deleted file mode 100644
index c0d84d4ddf85..000000000000
--- a/dev-ada/gpr/gpr-25.0.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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
-}
diff --git a/dev-ada/lal-refactor/Manifest b/dev-ada/lal-refactor/Manifest
index 1a78cd6059d2..eba593ded13c 100644
--- a/dev-ada/lal-refactor/Manifest
+++ b/dev-ada/lal-refactor/Manifest
@@ -1,5 +1,5 @@
 DIST lal-refactor-0_p20231027.tar.gz 211389 BLAKE2B 3963a99b785f3559ef176cfda8c289ce9ea2ee79da913392bc4f33f9e5821f3fba28cf1410b299ba717f3433eca101e3574fac18d1f3ad2dd0308153332dd200 SHA512 28388fbecab471a8d5dda1890dbe00f90e1c8dba96f253e97772f699d4953ca46c56db93d69b781b8642562b0c5376e28cbff51f8dd62d90dfafc1d65567d1bd
 DIST lal-refactor-25.0.0.tar.gz 223818 BLAKE2B 6f53a278880b9d65ecd90c779323421e3cd3067ff920fc5fd851c1ded22a9819f50efa3eb6030ceb5f60d74070433d1953fbd0b194cd552733461aca6fbe3008 SHA512 c93136c3c05410bcb72bf9fbde409b371851c5f0e394670d8dd43d09219d756e10fef126911bbf6656a640c31b467fa49f826316e55a71f4f61a50952bb6980c
 EBUILD lal-refactor-0_p20231027.ebuild 2212 BLAKE2B bf12950383d7c7e378dede469ff484370bb672fbe6a9842c95e86f340b564316c4dc52695524f628965d2fc27c42fd3daaee23e69ea6a45e106e1d467fdcafa2 SHA512 7ed622b7266aca22202dafd500c84b022c0c69601c20526303e9f33b609e895b275160491ce97e5b55d63b835333f4a8da65e42e9f57def0274cef4161037aa9
-EBUILD lal-refactor-25.0.0.ebuild 1726 BLAKE2B 5b2f9aba38619455b9cac1e305872f8dfd44b44231d84d33a93f22f9260065c56c9d62450491fb501f759072b444bf077b3fb9d084b50ce27d622c400708a7a2 SHA512 033174f7658015225ea215e9d48422e483d44040e3f150075634daa393117e9e25b780401460a29a0edfd71055ad14c77c386535cf54cd98c93d2087e145dec6
+EBUILD lal-refactor-25.0.0-r1.ebuild 1782 BLAKE2B b0373475c107f7f767c69461e6b8590df7cc4b7235fb6c09c5e86c22cde3d69af0da2a3c56dae1dd51b60f18aa555dd543152d12949c87109d2d215b1fbb4689 SHA512 5a3b7334c7c8a4fc62d82dd82f828fcbf6e007bdcadeb594b7456b80e637ae4d102bc9c9d8198504e7b13ad90d29da7df2be51be17f8415bf4a8117e0715515d
 MISC metadata.xml 434 BLAKE2B ef7b69108973686b5f653d8bee95d6dcf23195e474c5351145ad3831ef006b7ca7cbe5fdc3f85d41d9fb6c4f6701d93242f5464f3edaf44d29f8d8f8d4369cd2 SHA512 e42151651e69b2a3acd58664aad7900bd41dc6692fb08f5e9a1f1eee104634e4d3919cf35063a97711877d72e15d3734e0ede2046d5e7e6e671a713fff4eb6ec
diff --git a/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..cb59900d58e1
--- /dev/null
+++ b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+inherit ada multiprocessing
+
+commitId=a5997083efc0ae97ec089b18931c765d43301072
+
+DESCRIPTION="Refactoring tools for the Ada programming language"
+HOMEPAGE="https://github.com/AdaCore/lal-refactor"
+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 ~x86"
+IUSE="static-libs static-pic"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADADEPS}
+	dev-ada/libadalang:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]
+	dev-ada/libadalang-tools:${SLOT}[${ADA_USEDEP},shared,static-libs?,static-pic?]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=$1 -XLIBRARY_TYPE=$1 \
+			-P gnat/lal_refactor.gpr -p -j$(makeopts_jobs) \
+			-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+
+	gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \
+		-XLIBRARY_TYPE=relocatable -Pgnat/lal_refactor_driver.gpr -p \
+		-j$(makeopts_jobs) -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLAL_REFACTOR_LIBRARY_TYPE=$1 -XLIBRARY_TYPE=$1 \
+			--prefix="${D}"/usr --sources-subdir=include/lal-refactor \
+			--build-name=$1 --build-var=LIBRARY_TYPE -P gnat/lal_refactor.gpr \
+			-p -f || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprinstall -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \
+		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr \
+		-P gnat/lal_refactor_driver.gpr -p -f || die
+
+	einstalldocs
+	rm -rf "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-ada/lal-refactor/lal-refactor-25.0.0.ebuild b/dev-ada/lal-refactor/lal-refactor-25.0.0.ebuild
deleted file mode 100644
index 905272619adf..000000000000
--- a/dev-ada/lal-refactor/lal-refactor-25.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-inherit ada multiprocessing
-
-commitId=a5997083efc0ae97ec089b18931c765d43301072
-
-DESCRIPTION="Refactoring tools for the Ada programming language"
-HOMEPAGE="https://github.com/AdaCore/lal-refactor"
-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="static-libs static-pic"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADADEPS}
-	dev-ada/libadalang-tools:=[${ADA_USEDEP},shared,static-libs?,static-pic?]"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	build () {
-		gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=$1 -XLIBRARY_TYPE=$1 \
-			-P gnat/lal_refactor.gpr -p -j$(makeopts_jobs) \
-			-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-	}
-	build relocatable
-	use static-libs && build static
-	use static-pic  && build static-pic
-
-	gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \
-		-XLIBRARY_TYPE=relocatable -Pgnat/lal_refactor_driver.gpr -p \
-		-j$(makeopts_jobs) -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLAL_REFACTOR_LIBRARY_TYPE=$1 -XLIBRARY_TYPE=$1 \
-			--prefix="${D}"/usr --sources-subdir=include/lal-refactor \
-			--build-name=$1 --build-var=LIBRARY_TYPE -P gnat/lal_refactor.gpr \
-			-p -f || die
-	}
-	build relocatable
-	use static-libs && build static
-	use static-pic  && build static-pic
-	gprinstall -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr \
-		-P gnat/lal_refactor_driver.gpr -p -f || die
-
-	einstalldocs
-	rm -rf "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 7782c8653610..b34f799e00dd 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,5 +1,5 @@
 DIST libadalang-tools-24.0.0.tar.gz 1083580 BLAKE2B e3d7cb94500afaebb00ba3f727b903cfd6ea57b02efccbf0dc61ef0d625dd06364b67a94c236c4cc8e4eee955e1767b0eb73122895a8f3edfb05c5fea57e18d8 SHA512 982fefa454108a604a67a0ec0d33fc420ccbbc4c03f01eb1cfbfe57cb51ca3bf13eef465775dab0843b5573663150e6d185b3a3887cc1cbcc5a353214842f223
 DIST libadalang-tools-25.0.0.tar.gz 1141724 BLAKE2B b3555f18f38dcd4f907745465d1c4d11dcf3d532350c91cf8dbecb1e568691ea3ae72042aa073ed198718cabf6b0e3798f396f7344de8b3afa915e01de49d16d SHA512 f546b02879daaea4ad0fea7b3e3ee8be2f9b435223dacade7bf79b7c106f6b2b956683b3ecd028193bf095530df11bb5224596cedd2e091eca2181aa3828859a
 EBUILD libadalang-tools-24.0.0-r1.ebuild 1776 BLAKE2B 6a8129578ec5d2cebcabe4e5a888822db9f7cbb004fc26a4e6243817f91f4060a33117df5a0799fe97c6f3c2e7d0eae189a170be5c1c474de700d120524e6927 SHA512 038a6e5f32a638db1cbd73c61093e88dbbe5d9d9a8e33795536c46b4184ad478fb66f2d4f45e22ddd3c0a4e5e2f1659f067ec31dc45576e0918fba519ab82ef8
-EBUILD libadalang-tools-25.0.0.ebuild 2818 BLAKE2B 9d0fd2e460fb6bc8daea0e1905cead625123ded6020517d88d59250c143d0b7bde955430b5e6e30d93a506ce8d259672f598864ab94824ea876ea4ca0b71b017 SHA512 f75ab421f84eaf3bbfd2159dc7e5ac225016af284149137d422f9757075d946176d40e3140a2dd4d75239b00fdc280ffe93033904d04a17e91137e9b735d82ac
+EBUILD libadalang-tools-25.0.0-r1.ebuild 2816 BLAKE2B 4a84b2b9cc31cca3eb13dbc6b15ae351760b17ed51bfefa7350c16c5a1f7264814189b74e4df81eaeb199551484c78399675e8a56c3d7e7bccd587e2f04cf325 SHA512 8b8d53bb5dad24f8d729b721ec5bff6f01831431e72d1387356e3364c012ec588f99ded0a34d6bf64d46f67484a31a79d0d625dd47fd3268bad3164c7cc8e553
 MISC metadata.xml 438 BLAKE2B f0d65575ba5329888a28fa4b9c2c68365db7e3e30c892889a30e7d0fa94e4de08ceab1c3ba61d8e4c6c39888304d5a674c15095fb223df11529abd1c8468aa86 SHA512 d32995545a62f04f3504f54868c58e8449d19e62bb06b7b63ce14596ed9ee78c5028111ea2111433c200068f69bac0bb3e37989a004e43e7e3f60d115ac498d5
diff --git a/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..0be5887c9c76
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+inherit ada multiprocessing
+
+DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic test"
+
+# Some test are not working
+RESTRICT="test"
+
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/templates-parser[${ADA_USEDEP},shared?,static-libs?]
+	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/libadalang:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all -P src/build.gpr \
+		-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+	build () {
+		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=$1 \
+			-XXMLADA_BUILD=$1 -XLALTOOLS_SET=all -P src/lal_tools.gpr \
+			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	if use test; then
+		cd testsuite/ada_drivers
+		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
+			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
+			-P gen_marshalling_lib/tgen_marshalling.gpr \
+			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
+			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
+			-P indent/indent.gpr \
+			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
+			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
+			-P outgoing_calls/outgoing_calls.gpr \
+			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
+			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
+			-P partial_gnatpp/partial_gnatpp.gpr \
+			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
+		cd ../..
+	fi
+}
+
+src_test() {
+	GPR_PROJECT_PATH="${S}"/src/tgen/tgen_rts \
+		LIBRARY_TYPE=static \
+		testsuite/testsuite.py || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 --prefix="${D}"/usr \
+			--sources-subdir=include/lal_tools \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=LAL_TOOLS_BUILD \
+			-P src/lal_tools.gpr -p -f || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	dobin bin/gnat*
+	insinto /usr/share/tgen
+	doins -r src/tgen/tgen_rts
+	doins -r share/tgen/templates
+	einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/libadalang-tools-25.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-25.0.0.ebuild
deleted file mode 100644
index a792086d4ced..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-25.0.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
-inherit ada multiprocessing
-
-DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic test"
-
-# Some test are not working
-RESTRICT="test"
-
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/templates-parser[${ADA_USEDEP},shared?,static-libs?]
-	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all -P src/build.gpr \
-		-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-	build () {
-		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=$1 \
-			-XXMLADA_BUILD=$1 -XLALTOOLS_SET=all -P src/lal_tools.gpr \
-			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-	}
-	build relocatable
-	use static-libs && build static
-	use static-pic  && build static-pic
-	if use test; then
-		cd testsuite/ada_drivers
-		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
-			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
-			-P gen_marshalling_lib/tgen_marshalling.gpr \
-			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
-			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
-			-P indent/indent.gpr \
-			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
-			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
-			-P outgoing_calls/outgoing_calls.gpr \
-			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-		gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
-			-XXMLADA_BUILD=relocatable -XLALTOOLS_SET=all \
-			-P partial_gnatpp/partial_gnatpp.gpr \
-			-cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS} || die
-		cd ../..
-	fi
-}
-
-src_test() {
-	GPR_PROJECT_PATH="${S}"/src/tgen/tgen_rts \
-		LIBRARY_TYPE=static \
-		testsuite/testsuite.py || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 --prefix="${D}"/usr \
-			--sources-subdir=include/lal_tools \
-			--build-name=$1 --build-var=LIBRARY_TYPE \
-			--build-var=LAL_TOOLS_BUILD \
-			-P src/lal_tools.gpr -p -f || die
-	}
-	build relocatable
-	use static-libs && build static
-	use static-pic  && build static-pic
-	dobin bin/gnat*
-	insinto /usr/share/tgen
-	doins -r src/tgen/tgen_rts
-	doins -r share/tgen/templates
-	einstalldocs
-}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index d78bfa91fc65..d4d7f6bb2ce0 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,6 +1,6 @@
 AUX libadalang-23.0.0-test.patch 554 BLAKE2B 3f9dd2b8bba0defd745e18e00162116c56cef11395ebea09730337a844824e0b3c231ed650dd2510fca431c12c5d1991bbcf9b772899f85d5f9af90a3acb51b1 SHA512 0f53b76eb2dbdf8c4fdea5d1e582e2402fae31367d48f95e9fb15726af5b32d8a26bb4295c4c60a68fd4e3bf600dd82cbfa4b8b28cadcd626c6c9f652dccb175
 DIST libadalang-24.0.0.tar.gz 2783238 BLAKE2B 6d3b3df1dbb645ea8cba8f8088c7cdd40e9114ce2a5100bf93fefe8089d944f185fe343f5fefc35e17f64f5bf4f3dde358a398614db7d1a1b62dd136efdbb334 SHA512 fb2ed8aee075ef5dd66527a099acb5eef9103a8bf244ed437ff9fa38360d7de1712e6375ed98b691a745fa27ef841eb5daa6651641c552c5146986c5ed977131
 DIST libadalang-25.0.0.tar.gz 3056796 BLAKE2B 63719c23716d529398c68ccd203ecb3229e72dd5991a23334e1fd6fa5655acdf2a7e0a997d7b91e449d1a21935256c2c3209ab60cc532e1e5264577215c4c7ae SHA512 c625cc0018e4683bf1de18e066a806d9ed834c5e3d976904c3ad2cecc729afeb83fe9a9e00ce830dedab068e75516ac0901602c46fac33d22991bc614ab2f6aa
-EBUILD libadalang-24.0.0-r2.ebuild 2730 BLAKE2B cc3d6169c740ac87230c1d2f2c4c3de9291c1d11a239ee9089eb25d95badb98a7f6f063f894c445f8bb1d340811fd75a8b96f090a13f6b4f0f828decb9bd6d60 SHA512 5c7a738fa33f3ae9b1ab6ff030c9a945497260894e343a080cda480be817f975926b12f30a3c3df727a495d82f853c8b8ee295cbc3f399951cc459fa24f63d59
-EBUILD libadalang-25.0.0.ebuild 3487 BLAKE2B 04d74db62aa143bd55bf5eeb9947df88cb6a46e2e9c2df7291c90becaee15f5cf1db34b5f12377558711bbc79a8283dfc83b56fdf39d6524fbe23c267c475899 SHA512 8e8410f82ac50e21488ac982996afe07896ccf4e2a39f0a4bd368a03703c9153d1ccc01d0a10d2608f1dad0c160812f73d008d6dcf1763a16e034e8a5a01e16b
+EBUILD libadalang-24.0.0-r2.ebuild 2724 BLAKE2B 0b5312f3d6c166bd8c4f78328f542bcc1de1c9d2feebf34629e8be0a84e1ea69912b3c4dd9a18dd50e32628e55903f7cbf3c1ef4fd21ad10bcab4bc685d731e6 SHA512 c545a5cfd0e8d8cb20d4b33557ab5642adff6e70d103cb6c3edc7c9689c8c27f614db4165e3090b5a7b0fa9df4053ba9bc2890b27c335924a7254097ed9709ec
+EBUILD libadalang-25.0.0.ebuild 3509 BLAKE2B 1a617cd61f92b8f2c2beabf4ec57b24907ccd0d86f66a1381bb0062384e70568ae81caa97372f746fec28b275c1b33ca35774ad8c002ef5b01aa026c6b07f29f SHA512 202931a1d339895a44497a0096e68878f05dbfeb71686eeef1c5a3bb35bdf223c891f037a1c440cb1a781d8296500ad8a00170da2485cb010803255a76ad3709
 MISC metadata.xml 676 BLAKE2B 085445f4e10891044b544d0885a3887a5f8b2d0188ead82eee9e3a351042b171cd3cbfe5ac5910a008e723f74c1f9e96cec5239b91567af28f10c136d5372d6f SHA512 7165db10f2d58592cdf3197778ed42a99d6fa05730ab89ed9faa05146e6d54e3888f7f2841f129c5d2ef5897910348058de4303b105e1ba50ff08e2cbc7831ce
diff --git a/dev-ada/libadalang/libadalang-24.0.0-r2.ebuild b/dev-ada/libadalang/libadalang-24.0.0-r2.ebuild
index e50477fb41e4..43c3845f65e5 100644
--- a/dev-ada/libadalang/libadalang-24.0.0-r2.ebuild
+++ b/dev-ada/libadalang/libadalang-24.0.0-r2.ebuild
@@ -27,8 +27,8 @@ RDEPEND="dev-python/pyyaml
 	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
 	${ADA_DEPS}
 	${PYTHON_DEPS}
-	>=dev-ada/gpr-24.0.0[${ADA_USEDEP},shared,static-libs?,static-pic?]
-	>=dev-ada/langkit-24.0.0[${ADA_USEDEP},shared(+),static-libs?,static-pic?]
+	=dev-ada/gpr-24.0*[${ADA_USEDEP},shared,static-libs?,static-pic?]
+	=dev-ada/langkit-24*[${ADA_USEDEP},shared(+),static-libs?,static-pic?]
 	$(python_gen_cond_dep '
 		dev-ada/langkit[${PYTHON_USEDEP}]
 	')"
diff --git a/dev-ada/libadalang/libadalang-25.0.0.ebuild b/dev-ada/libadalang/libadalang-25.0.0.ebuild
index 766e210dbd14..c5b28effe7cc 100644
--- a/dev-ada/libadalang/libadalang-25.0.0.ebuild
+++ b/dev-ada/libadalang/libadalang-25.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+ADA_COMPAT=( gcc_14 )
 
 inherit ada python-single-r1 multiprocessing
 
@@ -30,12 +30,13 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-ada/gprbuild[${ADA_USEDEP}]
-	doc? (
-		$(python_gen_cond_dep '
+	$(python_gen_cond_dep '
+		dev-ada/e3-core[${PYTHON_USEDEP}]
+		doc? (
 			dev-python/sphinx[${PYTHON_USEDEP}]
 			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
+		)
+	')
 	test? ( dev-ada/e3-testsuite )"
 
 PATCHES=( "${FILESDIR}"/${PN}-23.0.0-test.patch )
diff --git a/dev-ada/prettier-ada/Manifest b/dev-ada/prettier-ada/Manifest
index f6afe3eabd0a..7bbed23c62bc 100644
--- a/dev-ada/prettier-ada/Manifest
+++ b/dev-ada/prettier-ada/Manifest
@@ -1,3 +1,3 @@
 DIST prettier-ada-25.0.0.tar.gz 60082 BLAKE2B 7fa18f3557b0f4e031d24421b7e5876477ed9468886e8d74165c7eae3f4ecdba8dfa7efa6ac298b3065b23eff5f531c4194107be6d36aa4153670350f19f3fc0 SHA512 5e31bedf76f6051a1e40a298953d9aa269f24d374b619fba1de934d4b85efc358532d9d695084b41607ae7d8d87bf91f27a151760c1f010782b2af3f64783c6a
-EBUILD prettier-ada-25.0.0.ebuild 2411 BLAKE2B 42f79168abbbd63532c6492af00c8ade75004fa7a3506ccb57282acdeb73430b085398d82119e7eaf5d9ba5fccefdca5a3ce55f7dba8c76c280f3ffb37ddcd59 SHA512 17e7385d0ad2b8c8d6fce80e5918d7f88f5f6a6a1f18c22497c105749efbc20349dd74a68484adff8c966aa71da5e7b5e8b72573abba258e9853c478e1fd16ad
+EBUILD prettier-ada-25.0.0-r1.ebuild 2404 BLAKE2B ff2c768a5ebb7b496d801fdb796727634efebdcee9489c2731455d59046274aa91c69cb261978cd04b6b70a3f28e44fb235a56d2c2524723777f44b4bb50c144 SHA512 de768b59b5dfafb0b282b10adde9f9e822ba64c8f64dcdf4a46d18778e7a38fe04a91f7bf07181fdda52db7e958aa369492e5699e11f259fff7f82cc64ff67c4
 MISC metadata.xml 878 BLAKE2B 49c20a3a14f92c984d6ab5ec4829b24dfa92be98b2d1335950492781fdcceae3f1b25ee78ddd61b69a8a1ddd83e53e4e5b97fab3f79ee79720c7b4045f03fbb8 SHA512 e24b9b8e1ce2bc85b01ad87fca592c5010156c0f33be25bfff594e3000e9baa86e5df9a87967a1d98986ca257864a91a989573fe8248f735e3b0900b5d166de8
diff --git a/dev-ada/prettier-ada/prettier-ada-25.0.0-r1.ebuild b/dev-ada/prettier-ada/prettier-ada-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..b861b3b80706
--- /dev/null
+++ b/dev-ada/prettier-ada/prettier-ada-25.0.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+ADA_COMPAT=( gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="Port of the Prettier formatter to the Ada programming language"
+HOMEPAGE="https://github.com/AdaCore/prettier-ada"
+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 test"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/VSS:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="test? (
+	$(python_gen_any_dep '
+		dev-ada/e3-testsuite[${PYTHON_USEDEP}]
+	')
+)"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )
+	test? ( static-libs )"
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_compile() {
+	build() {
+		gprbuild \
+			-v \
+			-k \
+			-XLIBRARY_TYPE=$1 \
+			-XPRETTIER_ADA_LIBRARY_TYPE=$1 \
+			-P prettier_ada.gpr \
+			-p \
+			-j$(makeopts_jobs) \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} \
+			|| die "gprbuild failed"
+	}
+	use shared && build relocatable
+	use static-libs && build static
+	use static-pic && build static-pic
+}
+
+src_install() {
+	build() {
+		gprinstall \
+			-XPRETTIER_ADA_LIBRARY_TYPE=$1 \
+			-XLIBRARY_TYPE=$1 \
+			--prefix="${D}"/usr \
+			--install-name=prettier_ada \
+			--build-name=$1 \
+			--build-var=LIBRARY_TYPE \
+			-P prettier_ada.gpr -p -f \
+			|| die "gprinstall failed"
+
+	}
+	use shared && build relocatable
+	use static-libs && build static
+	use static-pic && build static-pic
+	einstalldocs
+}
+
+src_test() {
+	gprbuild \
+		-v \
+		-k \
+		-XLIBRARY_TYPE=static \
+		-XPRETTIER_ADA_LIBRARY_TYPE=static \
+		-P testsuite/test_programs/test_programs.gpr \
+		-p \
+		-j$(makeopts_jobs) \
+		|| die
+	gprinstall \
+		-XLIBRARY_TYPE=static \
+		-XPRETTIER_ADA_LIBRARY_TYPE=static \
+		--prefix="${TMP}"/usr \
+		--install-name=test_programs \
+		--mode=usage \
+		-P testsuite/test_programs/test_programs.gpr \
+		-p \
+		-f \
+		|| die
+	PATH=${PATH}:"${TMP}"/usr/bin \
+	${EPYTHON} testsuite/testsuite.py || die
+}
diff --git a/dev-ada/prettier-ada/prettier-ada-25.0.0.ebuild b/dev-ada/prettier-ada/prettier-ada-25.0.0.ebuild
deleted file mode 100644
index c7e8ca1b7c29..000000000000
--- a/dev-ada/prettier-ada/prettier-ada-25.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit ada python-any-r1 multiprocessing
-
-DESCRIPTION="Port of the Prettier formatter to the Ada programming language"
-HOMEPAGE="https://github.com/AdaCore/prettier-ada"
-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 test"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/VSS:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="test? (
-	$(python_gen_any_dep '
-		dev-ada/e3-testsuite[${PYTHON_USEDEP}]
-	')
-)"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )
-	test? ( static-libs )"
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_compile() {
-	build() {
-		gprbuild \
-			-v \
-			-k \
-			-XLIBRARY_TYPE=$1 \
-			-XPRETTIER_ADA_LIBRARY_TYPE=$1 \
-			-P prettier_ada.gpr \
-			-p \
-			-j$(makeopts_jobs) \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} \
-			|| die "gprbuild failed"
-	}
-	use shared && build relocatable
-	use static-libs && build static
-	use static-pic && build static-pic
-}
-
-src_install() {
-	build() {
-		gprinstall \
-			-XPRETTIER_ADA_LIBRARY_TYPE=$1 \
-			-XLIBRARY_TYPE=$1 \
-			--prefix="${D}"/usr \
-			--install-name=prettier_ada \
-			--build-name=$1 \
-			--build-var=LIBRARY_TYPE \
-			-P prettier_ada.gpr -p -f \
-			|| die "gprinstall failed"
-
-	}
-	use shared && build relocatable
-	use static-libs && build static
-	use static-pic && build static-pic
-	einstalldocs
-}
-
-src_test() {
-	gprbuild \
-		-v \
-		-k \
-		-XLIBRARY_TYPE=static \
-		-XPRETTIER_ADA_LIBRARY_TYPE=static \
-		-P testsuite/test_programs/test_programs.gpr \
-		-p \
-		-j$(makeopts_jobs) \
-		|| die
-	gprinstall \
-		-XLIBRARY_TYPE=static \
-		-XPRETTIER_ADA_LIBRARY_TYPE=static \
-		--prefix="${TMP}"/usr \
-		--install-name=test_programs \
-		--mode=usage \
-		-P testsuite/test_programs/test_programs.gpr \
-		-p \
-		-f \
-		|| die
-	PATH=${PATH}:"${TMP}"/usr/bin \
-	${EPYTHON} testsuite/testsuite.py || die
-}
-- 
cgit v1.2.3