From 67dbd3ba144944fbf4b466be1b5fa0569b774e6f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 25 Feb 2025 19:25:33 +0000
Subject: gentoo auto-resync : 25:02:2025 - 19:25:33

---
 dev-ada/Manifest.gz                                | Bin 5408 -> 5418 bytes
 dev-ada/ada_language_server/Manifest               |   4 +-
 .../ada_language_server-24.0.1-r2.ebuild           |  81 --------------
 .../ada_language_server-24.0.1-r3.ebuild           |  81 ++++++++++++++
 .../ada_language_server-25.0.20241014-r2.ebuild    |  74 +++++++++++++
 .../ada_language_server-25.0.20241014.ebuild       |  74 -------------
 dev-ada/aunit/Manifest                             |   4 +-
 dev-ada/aunit/aunit-24.0.0-r3.ebuild               |  55 ----------
 dev-ada/aunit/aunit-24.0.0-r4.ebuild               |  55 ++++++++++
 dev-ada/aunit/aunit-25.0.0-r1.ebuild               |  65 ------------
 dev-ada/aunit/aunit-25.0.0-r2.ebuild               |  65 ++++++++++++
 dev-ada/gnatcoll-bindings/Manifest                 |   2 +-
 .../gnatcoll-bindings-24.0.0-r1.ebuild             |  98 -----------------
 .../gnatcoll-bindings-24.0.0-r2.ebuild             |  98 +++++++++++++++++
 dev-ada/gnatcoll-core/Manifest                     |   2 +-
 .../gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild   |  85 ---------------
 .../gnatcoll-core/gnatcoll-core-24.0.0-r4.ebuild   |  85 +++++++++++++++
 dev-ada/gnatcoll-db/Manifest                       |   2 +-
 dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r1.ebuild   | 118 ---------------------
 dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r2.ebuild   | 118 +++++++++++++++++++++
 dev-ada/gnatdoc/Manifest                           |   2 +-
 dev-ada/gnatdoc/gnatdoc-24.0.0-r1.ebuild           |  46 --------
 dev-ada/gnatdoc/gnatdoc-24.0.0-r2.ebuild           |  46 ++++++++
 dev-ada/gnatmem/Manifest                           |   2 +-
 dev-ada/gnatmem/gnatmem-2021-r3.ebuild             |  49 ---------
 dev-ada/gnatmem/gnatmem-2021-r4.ebuild             |  49 +++++++++
 dev-ada/gnatsymbolize/Manifest                     |   2 +-
 dev-ada/gnatsymbolize/gnatsymbolize-2021-r3.ebuild |  32 ------
 dev-ada/gnatsymbolize/gnatsymbolize-2021-r4.ebuild |  32 ++++++
 dev-ada/gpr-unit-provider/Manifest                 |   2 +-
 .../gpr-unit-provider-23.0.0-r5.ebuild             |  54 ----------
 .../gpr-unit-provider-23.0.0-r6.ebuild             |  54 ++++++++++
 dev-ada/gpr/Manifest                               |   2 +-
 dev-ada/gpr/gpr-24.0.0-r1.ebuild                   |  88 ---------------
 dev-ada/gpr/gpr-24.0.0-r2.ebuild                   |  88 +++++++++++++++
 dev-ada/gprbuild/Manifest                          |   4 +-
 dev-ada/gprbuild/gprbuild-24.0.0-r3.ebuild         |  87 ---------------
 dev-ada/gprbuild/gprbuild-24.0.0-r4.ebuild         |  87 +++++++++++++++
 dev-ada/gprbuild/gprbuild-25.0.0-r3.ebuild         |  95 -----------------
 dev-ada/gprbuild/gprbuild-25.0.0-r4.ebuild         |  95 +++++++++++++++++
 dev-ada/gprconfig_kb/Manifest                      |   4 +-
 dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r1.ebuild |  38 -------
 dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild |  38 +++++++
 dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild |  38 -------
 dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r2.ebuild |  38 +++++++
 dev-ada/gtkada/Manifest                            |   4 +-
 dev-ada/gtkada/gtkada-24.0.0-r1.ebuild             |  54 ++++++++++
 dev-ada/gtkada/gtkada-24.0.0.ebuild                |  54 ----------
 dev-ada/gtkada/gtkada-25.0.1-r1.ebuild             |  54 ++++++++++
 dev-ada/gtkada/gtkada-25.0.1.ebuild                |  54 ----------
 dev-ada/lal-refactor/Manifest                      |   2 +-
 .../lal-refactor-0_p20231027-r1.ebuild             |  96 +++++++++++++++++
 .../lal-refactor/lal-refactor-0_p20231027.ebuild   |  96 -----------------
 dev-ada/libadalang-tools/Manifest                  |   2 +-
 .../libadalang-tools-24.0.0-r1.ebuild              |  71 -------------
 .../libadalang-tools-24.0.0-r2.ebuild              |  71 +++++++++++++
 dev-ada/libadalang/Manifest                        |   2 +-
 dev-ada/libadalang/libadalang-24.0.0-r2.ebuild     | 111 -------------------
 dev-ada/libadalang/libadalang-24.0.0-r3.ebuild     | 111 +++++++++++++++++++
 dev-ada/libgpr/Manifest                            |   4 +-
 dev-ada/libgpr/libgpr-24.0.0-r1.ebuild             |  69 ++++++++++++
 dev-ada/libgpr/libgpr-24.0.0.ebuild                |  69 ------------
 dev-ada/libgpr/libgpr-25.0.0-r1.ebuild             |  68 ++++++++++++
 dev-ada/libgpr/libgpr-25.0.0.ebuild                |  68 ------------
 dev-ada/spawn/Manifest                             |   6 +-
 dev-ada/spawn/metadata.xml                         |   3 -
 dev-ada/spawn/spawn-24.0.0.ebuild                  | 108 -------------------
 dev-ada/spawn/spawn-25.0.0-r1.ebuild               |  83 +++++++++++++++
 dev-ada/spawn/spawn-25.0.0.ebuild                  |  83 ---------------
 dev-ada/templates-parser/Manifest                  |   2 +-
 .../templates-parser-24.0.0-r1.ebuild              |  45 ++++++++
 .../templates-parser-24.0.0.ebuild                 |  45 --------
 dev-ada/xmlada/Manifest                            |   4 +-
 dev-ada/xmlada/xmlada-24.0.0-r3.ebuild             | 106 ------------------
 dev-ada/xmlada/xmlada-24.0.0-r4.ebuild             | 106 ++++++++++++++++++
 dev-ada/xmlada/xmlada-25.0.0-r2.ebuild             | 112 -------------------
 dev-ada/xmlada/xmlada-25.0.0-r3.ebuild             | 112 +++++++++++++++++++
 77 files changed, 2000 insertions(+), 2113 deletions(-)
 delete mode 100644 dev-ada/ada_language_server/ada_language_server-24.0.1-r2.ebuild
 create mode 100644 dev-ada/ada_language_server/ada_language_server-24.0.1-r3.ebuild
 create mode 100644 dev-ada/ada_language_server/ada_language_server-25.0.20241014-r2.ebuild
 delete mode 100644 dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
 delete mode 100644 dev-ada/aunit/aunit-24.0.0-r3.ebuild
 create mode 100644 dev-ada/aunit/aunit-24.0.0-r4.ebuild
 delete mode 100644 dev-ada/aunit/aunit-25.0.0-r1.ebuild
 create mode 100644 dev-ada/aunit/aunit-25.0.0-r2.ebuild
 delete mode 100644 dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r1.ebuild
 create mode 100644 dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild
 create mode 100644 dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r4.ebuild
 delete mode 100644 dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r1.ebuild
 create mode 100644 dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/gnatdoc/gnatdoc-24.0.0-r1.ebuild
 create mode 100644 dev-ada/gnatdoc/gnatdoc-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/gnatmem/gnatmem-2021-r3.ebuild
 create mode 100644 dev-ada/gnatmem/gnatmem-2021-r4.ebuild
 delete mode 100644 dev-ada/gnatsymbolize/gnatsymbolize-2021-r3.ebuild
 create mode 100644 dev-ada/gnatsymbolize/gnatsymbolize-2021-r4.ebuild
 delete mode 100644 dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r5.ebuild
 create mode 100644 dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r6.ebuild
 delete mode 100644 dev-ada/gpr/gpr-24.0.0-r1.ebuild
 create mode 100644 dev-ada/gpr/gpr-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/gprbuild/gprbuild-24.0.0-r3.ebuild
 create mode 100644 dev-ada/gprbuild/gprbuild-24.0.0-r4.ebuild
 delete mode 100644 dev-ada/gprbuild/gprbuild-25.0.0-r3.ebuild
 create mode 100644 dev-ada/gprbuild/gprbuild-25.0.0-r4.ebuild
 delete mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r1.ebuild
 create mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild
 create mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r2.ebuild
 create mode 100644 dev-ada/gtkada/gtkada-24.0.0-r1.ebuild
 delete mode 100644 dev-ada/gtkada/gtkada-24.0.0.ebuild
 create mode 100644 dev-ada/gtkada/gtkada-25.0.1-r1.ebuild
 delete mode 100644 dev-ada/gtkada/gtkada-25.0.1.ebuild
 create mode 100644 dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild
 delete mode 100644 dev-ada/lal-refactor/lal-refactor-0_p20231027.ebuild
 delete mode 100644 dev-ada/libadalang-tools/libadalang-tools-24.0.0-r1.ebuild
 create mode 100644 dev-ada/libadalang-tools/libadalang-tools-24.0.0-r2.ebuild
 delete mode 100644 dev-ada/libadalang/libadalang-24.0.0-r2.ebuild
 create mode 100644 dev-ada/libadalang/libadalang-24.0.0-r3.ebuild
 create mode 100644 dev-ada/libgpr/libgpr-24.0.0-r1.ebuild
 delete mode 100644 dev-ada/libgpr/libgpr-24.0.0.ebuild
 create mode 100644 dev-ada/libgpr/libgpr-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/libgpr/libgpr-25.0.0.ebuild
 delete mode 100644 dev-ada/spawn/spawn-24.0.0.ebuild
 create mode 100644 dev-ada/spawn/spawn-25.0.0-r1.ebuild
 delete mode 100644 dev-ada/spawn/spawn-25.0.0.ebuild
 create mode 100644 dev-ada/templates-parser/templates-parser-24.0.0-r1.ebuild
 delete mode 100644 dev-ada/templates-parser/templates-parser-24.0.0.ebuild
 delete mode 100644 dev-ada/xmlada/xmlada-24.0.0-r3.ebuild
 create mode 100644 dev-ada/xmlada/xmlada-24.0.0-r4.ebuild
 delete mode 100644 dev-ada/xmlada/xmlada-25.0.0-r2.ebuild
 create mode 100644 dev-ada/xmlada/xmlada-25.0.0-r3.ebuild

(limited to 'dev-ada')

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 2e4d5f252e82..690daed359ee 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 2794136366ff..68b32cc6c127 100644
--- a/dev-ada/ada_language_server/Manifest
+++ b/dev-ada/ada_language_server/Manifest
@@ -1,5 +1,5 @@
 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-24.0.1-r2.ebuild 2654 BLAKE2B 1277e5e8c424dc22a34ae56ddefe12b9a01469aec82d6f06ae5fa1ad5b1d545ce90f527c4d8eecf26a96b119f92b87aeae60f83ff3d3918a17de3f4efa0b9673 SHA512 7ab5e6ddafbfdcb68a73085764f76cb2a312ef9875b9b630a9d9cadbaf247488077381bede76f30b09d3198ae7af56b91a163673cf8fc80a608190b5cf56ed3e
-EBUILD ada_language_server-25.0.20241014.ebuild 2735 BLAKE2B 2041598e57e21c0e00334465c81c7d34ea5118134c12bc36544844822444e81ef1b0adf67f394327b2c22e88d32c02c4e925aa8e681e9f99ccc7b078c811ad13 SHA512 6c65427f50af6614003484074d8863210bc6bcbcdf3fb977ce6411af5ff31ce531a6b6d02c93689cb71bd0ccac903e7ad9ce060674ebb475c13fc37f0c06df52
+EBUILD ada_language_server-24.0.1-r3.ebuild 2646 BLAKE2B a688c839b4c73d62862a18a9da585d2bbfae37c453720a6293bd96e993e7e1edf42ec60dc4b83f816a6e312307b406e5f9b9f7e3ee6bfc26a0294e54db5e2204 SHA512 fb8ac605f2b6c6a631c4bf4a8cf78ec50bd72a53a28cf983a1e109552f10f144a70c6ef7fd9d423bc7bdd94909f03db0d29197670c55e5e738b4b594d4fb9fbc
+EBUILD ada_language_server-25.0.20241014-r2.ebuild 2727 BLAKE2B b7ef691ac483af3ead9bcd7b26425e8e22b4d815b73ed0d6f81d49b3ccb795fa44445f896675d99f1b7362eec849db83fd1fda7f50205138b8b9f873e3c60290 SHA512 616c7f195ebf1f1f918fbe0692fa6dc704201fb790a536cf41ab4a8824f60048699bc67e5496a869f3ac265eec0484da98c4d246553ab775f58834ae4fa0424e
 MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-24.0.1-r2.ebuild b/dev-ada/ada_language_server/ada_language_server-24.0.1-r2.ebuild
deleted file mode 100644
index d59714543faa..000000000000
--- a/dev-ada/ada_language_server/ada_language_server-24.0.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( 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-r3.ebuild b/dev-ada/ada_language_server/ada_language_server-24.0.1-r3.ebuild
new file mode 100644
index 000000000000..6705d1f3a599
--- /dev/null
+++ b/dev-ada/ada_language_server/ada_language_server-24.0.1-r3.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=( 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]
+	>=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-25.0.20241014-r2.ebuild b/dev-ada/ada_language_server/ada_language_server-25.0.20241014-r2.ebuild
new file mode 100644
index 000000000000..3b1f50258bda
--- /dev/null
+++ b/dev-ada/ada_language_server/ada_language_server-25.0.20241014-r2.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]
+	dev-ada/templates-parser:=[${ADA_USEDEP},shared]
+	>=dev-ada/VSS-25.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/ada_language_server/ada_language_server-25.0.20241014.ebuild b/dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
deleted file mode 100644
index 65eef988c23d..000000000000
--- a/dev-ada/ada_language_server/ada_language_server-25.0.20241014.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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/aunit/Manifest b/dev-ada/aunit/Manifest
index b6d98a05b406..a86425e380b0 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,6 @@
 AUX aunit-24.0.0-gentoo.patch 1347 BLAKE2B a11543913de0b0f698814ae2d3897beacf54c8dc87c643b2064bf8511343fd32c1054e6f3060c232c80bc92cf9584ba324b4e8556d0bac4f5e0438e131211a7c SHA512 8382f2497984977d0344beccf77782fb34313a532bd9148ca10f32464dfe9e3292c52a9dfc96f2ccbb77348100685cb62bcda475e610edeb86b4cc30049cdfcf
 DIST aunit-24.0.0.tar.gz 131699 BLAKE2B e43e7a94b278597475767d93f28a95a586abeaf45d141ea7035df9cb45d1be67c189a5be3d0364943b4649270f8f96d7cfd20fcba7a28917b14266c9e9424815 SHA512 25b973d1eb35e9e15ed24abe9c4ad7165d684c0e72abe619dcb9bec04cef8b28c78c1994e96e4bc29fd3b06567e15360f47ac87f49e1fa9888f55675defc226f
 DIST aunit-25.0.0.tar.gz 137452 BLAKE2B 91672bbdd86cc502456b681e9418f04dfc7dfc380ed9f9f69af36afb5e3b5ce22852a4fa92049ee5d9fade1439a6a4508e3d6f63b1005ae6f0e1d5cbfaa70118 SHA512 080d61c1c3b0707c291dce476573e05a247c198c2bea4ae311677dcae826e7bf34571700711b28ac46bd021e93c252492bafcb4892b24b45c7396d6b7e7b5f2d
-EBUILD aunit-24.0.0-r3.ebuild 1085 BLAKE2B 72b191c6cbe58720591bb2bd34095750bcb7d6124a5cfbc5ae97d8976f0bf90e28cda53b8779c027f2a69dc7dcaa1a3813409653a507e68ec89340e66c713e6a SHA512 c5ba47446cf76fdd8682734e31f1b786323ef0b56758200bdcd9907d0af69d02eee827dc755b6a45e807d6c0fdfe83ca97eae461e2f373c1dd600d1b398b4385
-EBUILD aunit-25.0.0-r1.ebuild 1486 BLAKE2B 0579d7aef3dacf4a1387793389d5bbaef43746069916763183bbe6967f552aea532eeb15eacb3946fc54810751395ed78bc5c6fbbd77403bc9d2ceff00a2025e SHA512 ae0706605b648bd0690d4d1e4cff6fda09bd88d4315e797bf955032cf3278403dcb4b84377cc14060d05bba22c6716a2112ae5896a8092cbfba393bc3c1e64b7
+EBUILD aunit-24.0.0-r4.ebuild 1075 BLAKE2B cf7aa317c3d07647d55024476052c0fabe12146770b70091842a203ccae2c6f86a14f9d7686b871782f139b9e99665d6359f207ad7c09ee52ee24bfb913a29b9 SHA512 45cedc3b1d91d3371c5172dadc5e5e6a8db11cb19b9a204b5866adeb547feca165d843e22964049f7a2ee79720771368a363db7b623308b1f1ccc67bbe3ce310
+EBUILD aunit-25.0.0-r2.ebuild 1476 BLAKE2B c5d1a36215ff7801f8f9aae4e620092b5c0384601f2725b6dc4126ffa0b40ae4fcd6cfbcec427130a6ae802fc6d21a2d02bd9e0ddd2227073e2df2a7cae868f2 SHA512 be9a5347db44d0de8df218bce86942bc5b74bd1054f648c248918599e08a338452215bd35b92382fb71b69b98e45fce5ef8a35890170ee9e447b5e3bd129c48a
 MISC metadata.xml 843 BLAKE2B 3f8a899e8d22a411596aae79b739e3cf47b7b867bedede255761146d65e70adfd810544528018212b8a3f36a59f2d886682146a6370ab33c976f676d331b9390 SHA512 2ae746ded1a937362aad360ccd273143b495e43e71aeffb23dbcc71f93154bcc2fce6fcf6fa99d2a7ab1140ffb52ece0b08d1a010a627c0d10ee80e7984fdc92
diff --git a/dev-ada/aunit/aunit-24.0.0-r3.ebuild b/dev-ada/aunit/aunit-24.0.0-r3.ebuild
deleted file mode 100644
index a1487b880238..000000000000
--- a/dev-ada/aunit/aunit-24.0.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-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
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-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="doc"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	dev-python/sphinx
-	dev-python/sphinx-rtd-theme
-)"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		lib/gnat/aunit.gpr \
-		|| die
-}
-
-src_compile() {
-	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
-	if use doc; then
-		emake -C doc html-all
-		emake -C doc txt-all
-	fi
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	einstalldocs
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-24.0.0-r4.ebuild b/dev-ada/aunit/aunit-24.0.0-r4.ebuild
new file mode 100644
index 000000000000..d01f8a0930ab
--- /dev/null
+++ b/dev-ada/aunit/aunit-24.0.0-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada multiprocessing
+
+DESCRIPTION="Ada unit testing framework"
+HOMEPAGE="http://libre.adacore.com/tools/aunit/"
+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="doc"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	dev-python/sphinx
+	dev-python/sphinx-rtd-theme
+)"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		lib/gnat/aunit.gpr \
+		|| die
+}
+
+src_compile() {
+	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
+	if use doc; then
+		emake -C doc html-all
+		emake -C doc txt-all
+	fi
+}
+
+src_install() {
+	emake INSTALL="${D}"/usr install
+	einstalldocs
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
+
+src_test() {
+	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
+}
diff --git a/dev-ada/aunit/aunit-25.0.0-r1.ebuild b/dev-ada/aunit/aunit-25.0.0-r1.ebuild
deleted file mode 100644
index b65aa93e36db..000000000000
--- a/dev-ada/aunit/aunit-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-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 )
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-inherit ada python-any-r1 multiprocessing
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="https://github.com/AdaCore/aunit"
-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"
-IUSE="doc"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	')
-)"
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		lib/gnat/aunit.gpr \
-		|| die
-}
-
-src_compile() {
-	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
-	use doc && emake -C doc aunit_cb.html
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	DOCS="README"
-	use doc && HTML_DOCS="doc/build/aunit_cb/html/*"
-	einstalldocs
-	mv "${D}"/usr/share/examples "${D}"/usr/share/doc/${PF}/
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-25.0.0-r2.ebuild b/dev-ada/aunit/aunit-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..374e3885a565
--- /dev/null
+++ b/dev-ada/aunit/aunit-25.0.0-r2.ebuild
@@ -0,0 +1,65 @@
+# 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 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="Ada unit testing framework"
+HOMEPAGE="https://github.com/AdaCore/aunit"
+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"
+IUSE="doc"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	')
+)"
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		lib/gnat/aunit.gpr \
+		|| die
+}
+
+src_compile() {
+	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
+	use doc && emake -C doc aunit_cb.html
+}
+
+src_install() {
+	emake INSTALL="${D}"/usr install
+	DOCS="README"
+	use doc && HTML_DOCS="doc/build/aunit_cb/html/*"
+	einstalldocs
+	mv "${D}"/usr/share/examples "${D}"/usr/share/doc/${PF}/
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
+
+src_test() {
+	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
+}
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 5f18cb342cd8..1fe5f3502e6e 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,6 @@
 AUX gnatcoll-bindings-23.0.0-py_3_11.patch 412 BLAKE2B 3d327f02b5305a7e0aa5414ec83be80ae62b6a2b93581846acf6306a3ab364c8ae07137bdffea1fce69a51c6bfa707daa0555ae49b7e69db0301c227896836ff SHA512 2539d5d96ec00cccef5b42fe5795d5cedffc528bb9e4d328007718f5189c61657cc77daf80a5f7da0a157c482e7146116ab6da8a9dd10afe68e1a3f30e3c548d
 DIST gnatcoll-bindings-24.0.0.tar.gz 253286 BLAKE2B 6f9ee60a298f98921df3f8bfd3c6e21a3b54412dfea3d67cb6fe0e85d7ba90f17f83d564d9853e989cd60b0d9d9052694a14a70d10a4f70d161878501edd036b SHA512 d82f593cd0a2822d0007ba768a05e9870aa80b47232154008ea91af4ec758df1b23b92eb5264a58f2b4bedf775d143ce7119046a9ba8f7d5496ed89f3a4a2118
 DIST gnatcoll-bindings-25.0.0.tar.gz 299443 BLAKE2B 8feee477728f036d32b4957ffde309d529eb5ccead784dd1bfaf7a3b945046672467ed3eac49336369bda473f317d30ce73f2d6a8afcbb289da4a4f7496f523a SHA512 0cc5b4a1e966b6e05dcfa15e60cb3960894ffe73b9348f0642a972f4d517e535c617893a4080d33095ee62779b14aeb6cdd8a8f0a8b5a6c8e81c94df132420b2
-EBUILD gnatcoll-bindings-24.0.0-r1.ebuild 2541 BLAKE2B 2a587b7ae8927ea1b91cc9f82eab6ebb64a8ad805f90c4bb4df92819f3464e8a6aea3691b22b9415926c32c27b165cdff2535796af884220a37553b8307f1e74 SHA512 192a094f1c38421675900ae114cb59a16e976f8178ed8227abe2e432bc2ed319cdc2f8d6c889b807f6d1648163fd6d19438bde2f8bab5ffaca1912b830c13661
+EBUILD gnatcoll-bindings-24.0.0-r2.ebuild 2531 BLAKE2B f1f2c492d457163a7e830a6b002a302fd42bc1eb1616dff4413f56255e39a1ef923bffa42174ec23444aadc70af49006f6c22c5540e0fa9a1acd9b9ab74b0434 SHA512 7a8e8b79f768daf0f3875cb4488e911a6970654023945944f56ca3269fb6a143f82bc23916785ebb2e57dc7d321d1b56dd85c7893759d2eb64920af259262db4
 EBUILD gnatcoll-bindings-25.0.0.ebuild 2984 BLAKE2B d3b4643b1df3f712f48651be278dc3ea311626725c3f052f9d2ea7881f10d7caa4fd62ddae261d42f5566a39dc4a357f065e58418c8a77ec32f4b4d057794a37 SHA512 fbbe14214c0ddf9d68bc34e2d1a93ab2805deaf15109bdcc677be0a814576ab7c8b4d7fde8176a2fa3475b5a6f139c60bf2ffcd75c03709062511251335c744b
 MISC metadata.xml 1172 BLAKE2B 23758b9a71c24a6e635488947a6491713dd69750c62715b1fe0eb12db380d1ecc80ebb4941a00a9ae01ce2009316849e802560bc52402fed64b671547951cf89 SHA512 1ea356da231ee9b42df8733e0ca6c3cbb5e3a2f0eb143bc894a8961e82b69f2e05b0f5d8dba309dc6b0556c4340bb51175fe9aa5a272aae006eed4a2cf449098
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r1.ebuild
deleted file mode 100644
index a087879f9ba7..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-inherit ada multiprocessing python-single-r1
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-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="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	|| ( gmp iconv lzma openmp python readline syslog )
-	${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )
-	lzma? ( app-arch/xz-utils )
-	openmp? ( dev-lang/gnat-gpl:=[openmp] )
-	"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
-
-PATCHES=( "${FILESDIR}"/${PN}-23.0.0-py_3_11.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	rm -r python || die
-	mv python3 python || die
-	default
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_VERSION=${PV} \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..72c324ec188c
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-24.0.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-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 multiprocessing python-single-r1
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+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="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	|| ( gmp iconv lzma openmp python readline syslog )
+	${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	${ADA_DEPS}
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )
+	lzma? ( app-arch/xz-utils )
+	openmp? ( dev-lang/gnat-gpl:=[openmp] )
+	"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
+
+PATCHES=( "${FILESDIR}"/${PN}-23.0.0-py_3_11.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -r python || die
+	mv python3 python || die
+	default
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_VERSION=${PV} \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv lzma python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+			if use openmp; then
+				build omp $lib
+			fi
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv lzma python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+			if use openmp; then
+				build omp $lib
+			fi
+		fi
+	done
+	rm -rf "${D}"/usr/share/gpr/manifests
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 0e4dc45ea9b9..370e500623e7 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -3,6 +3,6 @@ AUX gnatcoll-core-24.0.0-gentoo.patch 607 BLAKE2B 9138e65de3403760b3a56a622c002e
 AUX gnatcoll-core-25.0.0-gentoo.patch 559 BLAKE2B 4df9019ef026ee7ac367ed2dd01bb0dcb9553963cf25918309d09bda68bc5cc6302b34dc3a9b8d13da7d7f08be6ebe04f46984563d14edd04f3af06095748b45 SHA512 c029fe6a6c1ac21037b025a980d59d08b27b6eaef949357ff8f2c18583fe37a73ae83e74231e43fd170f33cd62c3273fefc8e399a65c6dead9a6abd6b0b6092f
 DIST gnatcoll-core-24.0.0.tar.gz 764526 BLAKE2B f96b24dcac2af84802244ed93570f0a922ab0901ecf871fa4995f4c24607cdbd8d91fc760acf35024fe41a066fb307442396cb8c125c74363e0c9276d114ab5a SHA512 1f1d470e7b74f238682f0938efe04c303c6bfca5a6b723eb789f5cb4bd33a199a9f2323626b8887758f01709ab1ba4d8045c56ce45f02e535babca4025662d9f
 DIST gnatcoll-core-25.0.0.tar.gz 7492612 BLAKE2B 6c9653b74d575b24a5433dc56214f9fd55d8dfce65921d2f3172521d3f2c542e34e09df99c224634bf87da6068cffd4f47fdf6ed68f2b913d355a9f6ebff1624 SHA512 efa19b9760bd16b402445d4932dfd28f087f9a09b91ec688c6976b7b83fe5986580b1871378ac024e9a712df8ee75963e5dc88629a72ee1ce76f1d1403b8e122
-EBUILD gnatcoll-core-24.0.0-r3.ebuild 1881 BLAKE2B 11df5593012394df1a96aee6758988f137e593a38c63cc703947610518abcc0e2f2b26cb1ec5070d0aa175cdbd0deaaa96054a22603b4053885c8e94b7117daa SHA512 c7abea82ff78f49874455dc4872f24147cfce35898527e83c2cd4367d6736a738662a7ad4035bdd69d69d7dac3d6497047e9eb18be82b0711b29b77d436a30fe
+EBUILD gnatcoll-core-24.0.0-r4.ebuild 1871 BLAKE2B 42486c1752fe122e2369fda74a0f189d03c1df8713d14ea04ff9119439aa19696712c72a86a5ecb16830b1ff7caadb142ac6542433d1e842ec48f4351eb106de SHA512 729ea977f00814430ad10c98ae270ad3e1693a980da47aa33947e37136c6f764ae3876927adb7620452374be82587b942a522eb7a5f887d4d1072cbb22029ccc
 EBUILD gnatcoll-core-25.0.0.ebuild 2995 BLAKE2B 88cfcda02cb966b5a30edb5a744f0e24420b525821df32a799c177ae772716c06a796b7f8a2a908d7303f7490b508d5b237f178bb8def8d7c9ea85387717f798 SHA512 89129739b46350b96ceaa62b69c2a4688eed5f773a9401a76a78176d01911404c9300fe00e2c4781f544b91bc24d86cb92a15df990a589955a668b0c38a41da6
 MISC metadata.xml 1237 BLAKE2B 06a5984592bbeb2fa8f663b61eeecded49363cebf58d5b51d70768bebc485035e5c718ba671c4d9e178ca13be82dc56bbac9a0eb39b8dd1c992f019d45affa7c SHA512 6762bd7b0ec30cefbfc94a6e0572ddbeedc89161ae1cdc291c0dd35405be20439bb2bd585b74cbe20db50a3522405f449b5507d592771704a95b0d1f3775b9ea
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild
deleted file mode 100644
index e66ad050b55c..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 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
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-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="doc +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="
-	~dev-ada/libgpr-${PV}:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-"
-BDEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	doc? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-	sed -i \
-		-e "s:@PF@:${PF}:g" \
-		gnatcoll.gpr \
-		|| die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
-	use doc && emake -C docs latexpdf
-}
-
-src_install() {
-	local GNATCOLL_VERSION=${PV}
-	if use shared; then
-		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-relocatable
-	fi
-	if use static-pic; then
-		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static-pic
-	fi
-	if use static-libs; then
-		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r4.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r4.ebuild
new file mode 100644
index 000000000000..773e769f93a2
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-24.0.0-r4.ebuild
@@ -0,0 +1,85 @@
+# 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="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+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="doc +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="
+	~dev-ada/libgpr-${PV}:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+"
+BDEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2018-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+	sed -i \
+		-e "s:@PF@:${PF}:g" \
+		gnatcoll.gpr \
+		|| die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
+	use doc && emake -C docs latexpdf
+}
+
+src_install() {
+	local GNATCOLL_VERSION=${PV}
+	if use shared; then
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-relocatable
+	fi
+	if use static-pic; then
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static-pic
+	fi
+	if use static-libs; then
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index c0c050831015..b14af61f33c3 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-db-24.0.0.tar.gz 2651067 BLAKE2B 27c35c44c9be149cd1691ce02b0f30969606816f5e926782ae1eb1d4b2a052f434e0406bf865a729b927586a413f55b9970decdb128462a9fad638645aa80855 SHA512 9c775de99044d803096bad8f68661674e9e82cb026ab458dda6fdd880419264f9f9bfde79c9fada20dba764e5a554a272c5bfe4fc15d6272fd6721969bd824e4
 DIST gnatcoll-db-25.0.0.tar.gz 2688678 BLAKE2B 14e9d48c98e1b4c435f78a31ecea6ce70b0c147a6bedf6477adc791d1eb8cd3e256a5b807461c55d984c43a0d0fcaeb53941dc4f5856b7105cd40c268bccefe1 SHA512 7cd37d33650a16fd72796adda375a62a6368c11b369209686194fe96ad72a8e49094076679824266f88aeb7b1bc592ac1be678fcfaad10b59c7e05f7dd512cf3
-EBUILD gnatcoll-db-24.0.0-r1.ebuild 2869 BLAKE2B 76413b5147f34b86605dee88997dfdad59d135126c8caa8d04f3d2030ff5b280e46a002cb0f158618d6531e33fe8c8561d2ad74639650262374bfa4b7778f996 SHA512 c08890b04d848d8493cf9430fbdd4190a061880afb61fec679103918334710c3be503c723112e52d7aa155b16b187d8949ff903df1184ece0fdb4eb12b525c04
+EBUILD gnatcoll-db-24.0.0-r2.ebuild 2859 BLAKE2B df519332ffaa37e0195ca4a851ab75d788c329099c16af2eb80d92550810d71a1342a87d3590cb5170ab3d0307ccf05504eb1a67303f5bcdcdead81c2f98b500 SHA512 596694ab4851c38c7de1bebdd1e579b5874cab18d7edbb644dbfe8273fe441f026e2fe445d6ef4f8db183e7d66e1b208d06ac9d14af9a976d441ab087d905aad
 EBUILD gnatcoll-db-25.0.0-r1.ebuild 3109 BLAKE2B 144cff0578c7e22fb70627d9a531377127dfa24474258e2bfa4bdfb8d3f301397ae1d46310488c5150521e3011f7304575ba26a372d7dd2c909983a24aa3b4ba SHA512 5bc7602577affc91731a45d554d4f3f288dc9566acaa8d5b9bb3828a3e666c7f577a20a0dfd83205557d9ccf5f1053a22406a0b3c81c977dcc47053fc2d5516d
 MISC metadata.xml 1359 BLAKE2B fe1a09201ec968c79fad5171c9f1e5ff51fa5be137113729bdfe204345f627b256b2bf15053511421a62bc011fbed510b433d442561d09076b996102c4ff1480 SHA512 299f489c8fb90e944f4186d7f495f61c62bd950a4414ccbf4cbe2daecf49d744b90009f60c1733edf5fc92d12d10f2eb6b3067189d01876af89056e11c47b902
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r1.ebuild
deleted file mode 100644
index c463f4c36f84..000000000000
--- a/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-
-inherit ada multiprocessing python-single-r1
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="db2ada gnatinspect postgres +shared +sql sqlite static-libs static-pic xref"
-
-RDEPEND="dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	sqlite? ( dev-db/sqlite:3 )
-	postgres? ( dev-db/postgresql:* )
-	xref? (
-		dev-ada/gnatcoll-bindings:${SLOT}[${ADA_USEDEP},iconv,shared?,static-libs?,static-pic?]
-	)
-	${ADA_DEPS}
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="gnatinspect? ( xref )
-	xref? ( sqlite )
-	sqlite? ( sql )
-	db2ada? ( sql )
-	postgres? ( sql )
-	|| ( shared static-libs static-pic )
-	|| ( sql sqlite xref postgres gnatinspect db2ada )
-	${ADA_REQUIRED_USE}
-	${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_setup
-}
-
-src_compile() {
-	build () {
-		GPR_PROJECT_PATH="${S}"/sql:"${S}"/sqlite:"${S}"/xref \
-			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
-			-XGNATCOLL_VERSION=${PV} \
-			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
-			-P $1/$3.gpr \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	local lib
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	if use shared; then
-		lib=relocatable
-	elif use static-libs; then
-		lib=static
-	else
-		lib=static-pic
-	fi
-	if use gnatinspect; then
-		build gnatinspect ${lib} gnatinspect
-	fi
-	if use db2ada; then
-		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
-	fi
-}
-
-src_install() {
-	build () {
-		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
-			-XBUILD=PROD -XGNATCOLL_VERSION=${PV} \
-			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
-			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
-			-P $1/$3.gpr
-	}
-	local lib
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	if use shared; then
-		lib=relocatable
-	elif use static-libs; then
-		lib=static
-	else
-		lib=static-pic
-	fi
-	if use gnatinspect; then
-		build gnatinspect ${lib} gnatinspect
-	fi
-	if use db2ada; then
-		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r2.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..2549a3635a52
--- /dev/null
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-24.0.0-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-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 )
+
+inherit ada multiprocessing python-single-r1
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="db2ada gnatinspect postgres +shared +sql sqlite static-libs static-pic xref"
+
+RDEPEND="dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	xref? (
+		dev-ada/gnatcoll-bindings:${SLOT}[${ADA_USEDEP},iconv,shared?,static-libs?,static-pic?]
+	)
+	${ADA_DEPS}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="gnatinspect? ( xref )
+	xref? ( sqlite )
+	sqlite? ( sql )
+	db2ada? ( sql )
+	postgres? ( sql )
+	|| ( shared static-libs static-pic )
+	|| ( sql sqlite xref postgres gnatinspect db2ada )
+	${ADA_REQUIRED_USE}
+	${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_setup
+}
+
+src_compile() {
+	build () {
+		GPR_PROJECT_PATH="${S}"/sql:"${S}"/sqlite:"${S}"/xref \
+			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
+			-XGNATCOLL_VERSION=${PV} \
+			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
+			-P $1/$3.gpr \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	local lib
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	if use gnatinspect; then
+		build gnatinspect ${lib} gnatinspect
+	fi
+	if use db2ada; then
+		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
+	fi
+}
+
+src_install() {
+	build () {
+		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
+			-XBUILD=PROD -XGNATCOLL_VERSION=${PV} \
+			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
+			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
+			-P $1/$3.gpr
+	}
+	local lib
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	if use gnatinspect; then
+		build gnatinspect ${lib} gnatinspect
+	fi
+	if use db2ada; then
+		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatdoc/Manifest b/dev-ada/gnatdoc/Manifest
index 62c3c2cca008..084e3ff962f9 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-24.0.0-r2.ebuild 1509 BLAKE2B 5dd119964689fcd3041909508905ff013b55740fbc2da1d81a2195204f5e492fcaf469feba36f5b281ed3f3c82f1ac22e1bcc21b3eb610739918b8a3a113eab9 SHA512 5979c345e2eadc3551b157973709039734b7a92a0a3dde388065b9bd3755454506e266d57f000515bad07e38bcf48c4b6d387a387410197eef0c66646be3ca96
 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-24.0.0-r1.ebuild b/dev-ada/gnatdoc/gnatdoc-24.0.0-r1.ebuild
deleted file mode 100644
index ac707b0fd08d..000000000000
--- a/dev-ada/gnatdoc/gnatdoc-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022-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
-
-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 ~x86"
-RESTRICT="test"
-
-RDEPEND="${ADA_DEPS}
-	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/gpr[${ADA_USEDEP},shared(+),static-libs]
-	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared,static-libs]
-	dev-ada/langkit[${ADA_USEDEP},shared(+),static-libs,static-pic]
-	dev-ada/libadalang[${ADA_USEDEP},static-libs,static-pic]
-	dev-ada/libgpr[${ADA_USEDEP},shared,static-libs,static-pic]
-	dev-ada/markdown[${ADA_USEDEP}]
-	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},static-libs]
-	dev-ada/xmlada[${ADA_USEDEP},shared,static-libs,static-pic]"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_compile() {
-	gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable || die
-	gprbuild -v -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=static || die
-}
-
-src_install() {
-	gprinstall -v -p -P gnat/libgnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
-	gprinstall -v -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
-}
diff --git a/dev-ada/gnatdoc/gnatdoc-24.0.0-r2.ebuild b/dev-ada/gnatdoc/gnatdoc-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..11b920a04dbe
--- /dev/null
+++ b/dev-ada/gnatdoc/gnatdoc-24.0.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada 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 ~x86"
+RESTRICT="test"
+
+RDEPEND="${ADA_DEPS}
+	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/gpr[${ADA_USEDEP},shared(+),static-libs]
+	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared,static-libs]
+	dev-ada/langkit[${ADA_USEDEP},shared(+),static-libs,static-pic]
+	dev-ada/libadalang[${ADA_USEDEP},static-libs,static-pic]
+	dev-ada/libgpr[${ADA_USEDEP},shared,static-libs,static-pic]
+	dev-ada/markdown[${ADA_USEDEP}]
+	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},static-libs]
+	dev-ada/xmlada[${ADA_USEDEP},shared,static-libs,static-pic]"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_compile() {
+	gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable || die
+	gprbuild -v -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=static || die
+}
+
+src_install() {
+	gprinstall -v -p -P gnat/libgnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
+	gprinstall -v -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
+}
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index a513b23c46c2..ab2f07c37099 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,4 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2021-r3.ebuild 1034 BLAKE2B 8724159104c3a59cac245e4e180097ade6cb85ad587d78c2c2abdac0a0e4adfefa4ba95b942e98fccd25ab9c745c04a0e8f1ac42bbe42e191f36f716e7368734 SHA512 3d11a007f9dfffa2f972357b901074d4aaf669afbd091dbf463d6e6d32f0711c8689365358ef78d499ab1bde50663c5e318b3f8a61492c655aa9cccf07a2ca1f
+EBUILD gnatmem-2021-r4.ebuild 1024 BLAKE2B 8b195e3014121d6bb209f35ee8495c07f0ba9490d6e12f86efeea090a200feb7d1a9a75e017f30c3afbb4f669a6fce908270968ffba9d7682d79472e181a0546 SHA512 bd7ab572d9470def35d6b7515f37148ab8f9d30f3dbbcfc2d3bf0189dfbaf1425d5ed9905b53a1d34ce6cca018e6d3d903d6c0fd5e38c2d6d686fe67c37c29a7
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/gnatmem-2021-r3.ebuild b/dev-ada/gnatmem/gnatmem-2021-r3.ebuild
deleted file mode 100644
index ea3255deeec0..000000000000
--- a/dev-ada/gnatmem/gnatmem-2021-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-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 autotools
-
-MYP=${P}-${PV}0518-19F7B-src
-ID=3ddb98c0c8854dc7631bebd673ac7bc53038d4b7
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	sys-libs/binutils-libs:="
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -p -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2021-r4.ebuild b/dev-ada/gnatmem/gnatmem-2021-r4.ebuild
new file mode 100644
index 000000000000..3cbe28a136f8
--- /dev/null
+++ b/dev-ada/gnatmem/gnatmem-2021-r4.ebuild
@@ -0,0 +1,49 @@
+# 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 autotools
+
+MYP=${P}-${PV}0518-19F7B-src
+ID=3ddb98c0c8854dc7631bebd673ac7bc53038d4b7
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+	sys-libs/binutils-libs:="
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2018-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_compile() {
+	gprbuild -v -p -Pgnatmem.gpr -j$(makeopts_jobs) \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs ${LDFLAGS} \
+		|| die
+}
+
+src_install() {
+	dobin obj/gnatmem
+}
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index a4c01fccdbce..2088f97301cb 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,3 +1,3 @@
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2021-r3.ebuild 770 BLAKE2B 7fb422254579ed708630071f4f7dd2171a0efb9092da9d741c634efca266e2dfc0c1ddf65991ed27b92f652b7ae7fdd5960f48ba305ca450a8eb0d5f4f11fe41 SHA512 bb056860e2a43f32ebce75d4c7cf0f5b6a0c3be8282fbaf50eb8e7d7433279167ea7b0fb38a6fa7eb7a68733265f10a2c2cc00d6cc375ef9787596cc6540ba41
+EBUILD gnatsymbolize-2021-r4.ebuild 760 BLAKE2B 2a47c8b1acb8d6ad7ed6c0ff745e2e46f589c2fd4c2f31886a78a22a3a3290da196b2e3c3cd1a42b2b8e2ac8e678e83f61140761180fb3b3833c9caf541e1df6 SHA512 64eded105daea13954695c9fa320c1d1ba02567f97801148c3529e352ba78d44e8d58849bf74b6643d8b54a367e40c1e0625578f5aba6b552afa8d9a14a55ed2
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r3.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r3.ebuild
deleted file mode 100644
index 617b06832b27..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-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
-
-MYP=${P}-${PV}0518-19D3B-src
-ID=884f3b229457c995ddebb46a16a7cc50ed837c90
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_compile() {
-	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} -largs ${LDFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r4.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r4.ebuild
new file mode 100644
index 000000000000..2621f1fd2228
--- /dev/null
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r4.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+MYP=${P}-${PV}0518-19D3B-src
+ID=884f3b229457c995ddebb46a16a7cc50ed837c90
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Translates addresses into filename, line number, and function names"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_compile() {
+	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} -largs ${LDFLAGS} || die
+}
+
+src_install() {
+	dobin gnatsymbolize
+}
diff --git a/dev-ada/gpr-unit-provider/Manifest b/dev-ada/gpr-unit-provider/Manifest
index 1216719b0da8..647b287a96b3 100644
--- a/dev-ada/gpr-unit-provider/Manifest
+++ b/dev-ada/gpr-unit-provider/Manifest
@@ -1,3 +1,3 @@
 DIST gpr-unit-provider-23.0.0.tar.gz 29171 BLAKE2B 11e6311cde8ef12174a90e2ba3063734903e367bd027c6b3edb5f43f5d498e90ba97c89634a9b1f176f15e4ed97f5962f1b786d7f86f9afaa19a4d5688194649 SHA512 b67f922e8460be69357da046d8c74bf580efa05498d4aee190d0a0ac1f69a5d111e85ca2f52562fbdd27c7a343d2cac777d86fb8b38b3fbd627e3b42afca36f9
-EBUILD gpr-unit-provider-23.0.0-r5.ebuild 1324 BLAKE2B b32a1a0d5f38c93ab5b1f7bff8140686005fd35f439ad23de5b655e5d80fd49fb4af43f159050e6260a4fe41a3a387ee44becc9114e087f907f9f1d7e95f9bcb SHA512 e8bf08929a9d0ebb9d9da7c552a2f70361a3e0f8de40f2c4859f1f5a3bb6cc567a8bd07b4cc39fcd6e4be123618d220a4f8928c19d36299ee72d4a80ec43e532
+EBUILD gpr-unit-provider-23.0.0-r6.ebuild 1317 BLAKE2B 7e1c7240ac141ee0e8d9e0c2ac39bd67493b9f355e86e5b61d143cfb0efdcdce9ec664e6f50b22772af503d5a75808f7dc1db4b4f79a14d115c9ef247ed888d2 SHA512 6cfa4d7296958f3608da5568aa89296b23aabc174c51eb7346bb595a6b4a10ed77a41fdd64f959ad65b2fab155da60b963927f38ced80f9f21eb856050cdaeb1
 MISC metadata.xml 439 BLAKE2B 191b42cabbc540251ad99a291f5f4d75f26fcdb8ef4cb8a17918c274f6f70ddbf18a9c92682d281cd4dac1d90b48d4aa32ff89a7af45b1015c6244ee6b261834 SHA512 3b7a06a8027d700155055aa16bb07c713332a211c36e18c04663c0e5e589f406ff96d6ddc7ac9f2c3a4a598eec1dadb94b3b5728cff51046a9ac391d4e6b8f86
diff --git a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r5.ebuild b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r5.ebuild
deleted file mode 100644
index 720fe23875a7..000000000000
--- a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2023-2024 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
-
-DESCRIPTION="GPR Unit Provider"
-HOMEPAGE="https://github.com/AdaCore/gpr-unit-provider"
-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"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/gpr:=[${ADA_USEDEP},shared?]
-	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-		-XGPR_UNIT_PROVIDER_BUILD=release -XXMLADA_BUILD=$1 \
-		-P gpr_unit_provider.gpr \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	use static-libs && build static
-	use shared && build relocatable
-	use static-pic && build static-pic
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr \
-			install-static
-	fi
-	if use shared; then
-		emake prefix="${D}"/usr \
-			install-relocatable
-	fi
-	if use static-pic; then
-		emake prefix="${D}"/usr \
-			install-static-pic
-	fi
-	einstalldocs
-}
diff --git a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r6.ebuild b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r6.ebuild
new file mode 100644
index 000000000000..3dce8041d4c6
--- /dev/null
+++ b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2023-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="GPR Unit Provider"
+HOMEPAGE="https://github.com/AdaCore/gpr-unit-provider"
+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"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/gpr:=[${ADA_USEDEP},shared(+)?]
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+		-XGPR_UNIT_PROVIDER_BUILD=release -XXMLADA_BUILD=$1 \
+		-P gpr_unit_provider.gpr \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	use static-libs && build static
+	use shared && build relocatable
+	use static-pic && build static-pic
+}
+
+src_install() {
+	if use static-libs; then
+		emake prefix="${D}"/usr \
+			install-static
+	fi
+	if use shared; then
+		emake prefix="${D}"/usr \
+			install-relocatable
+	fi
+	if use static-pic; then
+		emake prefix="${D}"/usr \
+			install-static-pic
+	fi
+	einstalldocs
+}
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index 9d0de6f613b8..182e2ca532ea 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1,7 +1,7 @@
 DIST gpr-24.2.0-next.tar.gz 1524692 BLAKE2B 0e395f7d913b5b6344bb2d89d7471971ea7fb382bcba8123bcbd3703371b145493ed17560f0b7602f8fa5e89fbbd1a5e24d93763fcf493832a332b9463e96e16 SHA512 4d824a2eddd74fca5b2f51336bc2b8e3a35fac4901ff41ac0d7704aa81474357e0733b96da0fe9d3a09a4b21885812bf29bdeb330025ae466089c9dbefcd8d51
 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.0.0-r2.ebuild 2316 BLAKE2B 6b50f0d50631618a87608a70e9f4e45aef57b140332c780c99a804618077e9367b9d369aec7c1a05df341008bfe28ac73f12a4ced2db40f2141e4a3870524093 SHA512 0e24e80871053302bf5d33e442589a9e0601701856ceb2902615cc3d3963f6bb1a6655dd561c2e8b170b2521e509f6a5647e0f32a95b6ae0e0c55fae14c1f8c1
 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.0.0-r1.ebuild b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
deleted file mode 100644
index 07b25b79493f..000000000000
--- a/dev-ada/gpr/gpr-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2022-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
-
-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-lkparser-$(ver_cut 1-2).tgz"
-
-S="${WORKDIR}"/${PN}
-
-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}]"
-
-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_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/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-r2.ebuild b/dev-ada/gpr/gpr-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..35594f17cf59
--- /dev/null
+++ b/dev-ada/gpr/gpr-24.0.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022-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="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-lkparser-$(ver_cut 1-2).tgz"
+
+S="${WORKDIR}"/${PN}
+
+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}]"
+
+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_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/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/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 8760194aa193..c48e7d17df0b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -3,6 +3,6 @@ DIST gprbuild-24.0.0.tar.gz 959615 BLAKE2B c432b1f13a1aecb8f664aeb06694d86123268
 DIST gprbuild-25.0.0.tar.gz 940774 BLAKE2B b2a2895db767b55e459351ea6fbeb91a771b6e39672217d53fb2b4aeea4f42aa093760448da715ffb0b7da54c50b4b55f0034910ebfdfc52a8cde7dad7533ef0 SHA512 eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
 DIST xmlada-24.0.0.tar.gz 1053363 BLAKE2B 628a1d3645c58cc3f8f5140c7cfb16adef02f6ccc72b8e9410819eaf67e0160bdcf81a8e33065ec52f54cb12309d857a3d82e532990a0fd17c249c04334ab10f SHA512 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
 DIST xmlada-25.0.0.tar.gz 1082553 BLAKE2B daddd7b1d6cd8c38ff3e9ecdc1d0864e1eca88128121635e8d1a8133f73285ced08478e732a0b7bb02cc00e240887d20a1a16048991450025290fd96ad5cb09f SHA512 c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
-EBUILD gprbuild-24.0.0-r3.ebuild 2108 BLAKE2B d159ee3219cf8892f1506f24b03a0610ecd1a665f8479c2c6ace46fe5bc4d7f0128d68b64eef8df4e10366c8f8336e4201bbe733e3a687e22841f51af37e3377 SHA512 556b42c1732729f52ce6ab43903904cc6290ed8b81ff9c514f1359b53ebaf456d98053e733e0063ecd3853a381f99a087fa75d6580f71aa74adf3062dca04748
-EBUILD gprbuild-25.0.0-r3.ebuild 2306 BLAKE2B 5053507273bbc43fcca1325a639408db67f863d2e4f1ec85399141847fbac3d4a5fb4934a43636eaf74efc57c95953575d9a24d4d17d7aeb654191951cd1376f SHA512 942bc88143d093b9dc92c3e1d92e4ec912c29cc18ccf3a6c8ec9797a69c4979a83f0e3b8b99fcf7f49d790516878e9653c8d378ccf08d7e6a7ae9d0292a919b4
+EBUILD gprbuild-24.0.0-r4.ebuild 2098 BLAKE2B fcc8e052e48a1d27c4fbfb07620105231bd732b5323a02f8b2d82fa5f8e2448bf51454ddac52c720b34f83eff929ff9f915749e1c09d51a121e89d787c7d7d3e SHA512 7b4c30999c70e4e85f7bd58c0afcc4379ef355edf6b56d174105e53f142983f8bcb35bf20dc2c068188f46163da9e065625892d43a046272a343ef67800596aa
+EBUILD gprbuild-25.0.0-r4.ebuild 2296 BLAKE2B 0e9d83fd71f5b5c1f2f704762f2d006822cc9b4e866a3f21e5fcd07b8dddcb236b4a41c185fb30f429eafa67c9cc4435f78a2925f2eef3799b850cb4920e9dab SHA512 f8239d76fc864cc444899d9b7930d51998c20bd332bc924e91de2675b08dfb98f561fd413acd4b3cca72392dab5d7c10704f4fa0f0bfc78ec3872fec7b755681
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/gprbuild-24.0.0-r3.ebuild b/dev-ada/gprbuild/gprbuild-24.0.0-r3.ebuild
deleted file mode 100644
index ccf43c9a6a3a..000000000000
--- a/dev-ada/gprbuild/gprbuild-24.0.0-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-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
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="${ADA_DEPS}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( dev-python/sphinx )"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	sed -i \
-		-e "s:18.0w:$(ver_cut 1-2):" \
-		-e "/Build_Type :/s:Gnatpro:FSF:" \
-		gpr/src/gpr-version.ads \
-		|| die
-	cd gpr/src || die
-	ln -s gpr-util-put_resource_usage__unix.adb \
-		gpr-util-put_resource_usage.adb
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../${XMLADA}"
-	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-	if use doc; then
-		emake -C doc txt
-		emake -C doc info
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	local HTML_DOCS=
-	local DOCS=README.md
-	if use doc; then
-		DOCS+=" examples doc/txt/gprbuild_ug.txt"
-		HTML_DOCS+="doc/html/*"
-		doinfo doc/info/gprbuild_ug.info
-	fi
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-24.0.0-r4.ebuild b/dev-ada/gprbuild/gprbuild-24.0.0-r4.ebuild
new file mode 100644
index 000000000000..8cb43d924a74
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-24.0.0-r4.ebuild
@@ -0,0 +1,87 @@
+# 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
+
+XMLADA=xmlada-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="${ADA_DEPS}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( dev-python/sphinx )"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+	sed -i \
+		-e "s:18.0w:$(ver_cut 1-2):" \
+		-e "/Build_Type :/s:Gnatpro:FSF:" \
+		gpr/src/gpr-version.ads \
+		|| die
+	cd gpr/src || die
+	ln -s gpr-util-put_resource_usage__unix.adb \
+		gpr-util-put_resource_usage.adb
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
+			-largs ${LDFLAGS} gpr_imports.o || die
+	done
+	if use doc; then
+		emake -C doc txt
+		emake -C doc info
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	local HTML_DOCS=
+	local DOCS=README.md
+	if use doc; then
+		DOCS+=" examples doc/txt/gprbuild_ug.txt"
+		HTML_DOCS+="doc/html/*"
+		doinfo doc/info/gprbuild_ug.info
+	fi
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r3.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r3.ebuild
deleted file mode 100644
index 21151fa50d5f..000000000000
--- a/dev-ada/gprbuild/gprbuild-25.0.0-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-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 )
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-inherit ada python-any-r1 multiprocessing
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="https://github.com/AdaCore/gprbuild"
-SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-DEPEND="${ADA_DEPS}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-)"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	sed -i \
-		-e "s|\"gnatbind\"|\"gnatbind-${GCC_PV}\"|" \
-		src/gprbind.adb \
-		|| die
-	sed -i \
-		-e "s:18.0w:$(ver_cut 1-2):" \
-		-e "/Build_Type :/s:Gnatpro:FSF:" \
-		gpr/src/gpr-version.ads \
-		|| die
-	cd gpr/src || die
-	ln -s gpr-util-put_resource_usage__unix.adb \
-		gpr-util-put_resource_usage.adb
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../${XMLADA}"
-	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-	use doc && emake -C doc html
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	local DOCS=README.md
-	use doc && HTML_DOCS="doc/html/*"
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r4.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r4.ebuild
new file mode 100644
index 000000000000..97cc3c2862ec
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-25.0.0-r4.ebuild
@@ -0,0 +1,95 @@
+# 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 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+XMLADA=xmlada-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="https://github.com/AdaCore/gprbuild"
+SRC_URI="
+	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="${ADA_DEPS}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+)"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+	sed -i \
+		-e "s|\"gnatbind\"|\"gnatbind-${GCC_PV}\"|" \
+		src/gprbind.adb \
+		|| die
+	sed -i \
+		-e "s:18.0w:$(ver_cut 1-2):" \
+		-e "/Build_Type :/s:Gnatpro:FSF:" \
+		gpr/src/gpr-version.ads \
+		|| die
+	cd gpr/src || die
+	ln -s gpr-util-put_resource_usage__unix.adb \
+		gpr-util-put_resource_usage.adb
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
+			-largs ${LDFLAGS} gpr_imports.o || die
+	done
+	use doc && emake -C doc html
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	local DOCS=README.md
+	use doc && HTML_DOCS="doc/html/*"
+	einstalldocs
+}
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index 11c07503e6f0..9fe5e63a3ca4 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -2,6 +2,6 @@ AUX gprconfig_kb-24.0.0-gentoo.patch 5724 BLAKE2B d48884538f67554db7d48d185a18f1
 AUX gprconfig_kb-25.0.0-gentoo.patch 7978 BLAKE2B bc9a9b9451eb6453b37369b0ac0f830fd42fb64ebcbe265c9ea579eb2a3351207a75c7e013b55054969c8fcab04357574a872a060eaa85957a8b905211bc92fa SHA512 d50e42dabc1a86b682d19df67a6037caba681fa8c4160687fda3f1adab22270a48c1419bebb44d8561aafc1d37784307c887af91d9288ba9cca82a1825eaa985
 DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
 DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16 SHA512 afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
-EBUILD gprconfig_kb-24.0.0-r1.ebuild 712 BLAKE2B 5b60c6cc7ee837939777ffe47f783001f6dcc6544855b9fb3cbc9de5283a951a954798a85adfc3da1533bb769b9fe777488014d49a6880082fba55ee743e7c95 SHA512 c4bf1ca35a25f383284da4cec2c92c16d79deccec879dfc2878242fb97d368b9efe544d85d6729ac9d194ab89f7ebc1c346c2e8b64f052fb41c8bbfc4c27915c
-EBUILD gprconfig_kb-25.0.0-r1.ebuild 721 BLAKE2B eb72331ace347d30d18681683233dff1148bd56fa82bd0058687a4c0b9946c3a24238f5af164b234f17580473befd137d7100a2b2905b111da7010efcab63cbf SHA512 61e7689ac6d049ef6747589a76354470f1c64b430dba90a9425c2fc8875ee83fc8d3ee16233974d0eca1e2f92eb91caf622f328f8c4da73cfc78889a02d5aee0
+EBUILD gprconfig_kb-24.0.0-r2.ebuild 702 BLAKE2B 5908f7b7e465d4f62d7e400d7acb443834b0eff775345846f5cc83c54131ccb3805929e331dd663199588c4adcb316e9a5b9180e906f75df2308230e640f8529 SHA512 f943ce6d67e9522ab6a31aa550637faf4caaaa80213d3fe30c8f0fc00ab05b36fbcb5d3d72112bdcd4812bdfd5d6f21ea76fd72f4a1dfab7070246c60c307343
+EBUILD gprconfig_kb-25.0.0-r2.ebuild 711 BLAKE2B 5285aca87ee99c32004a6983e1aa497f294ab89e149d5f1562dba02157699e8061f0c7d56dde456c3463074953a676c98cca61db789ce3a44a2e476267e28091 SHA512 1def6bf608cef30462fb738c9249235974fe5d10bb74306d4c5ac8392adb7881c4a255140652d4d568909af47d80054153f600d8eb6fdba0b76321080fa76d07
 MISC metadata.xml 455 BLAKE2B 9c952304874ab4f01943eae8096d48825d36079409d713c929f58a0bf11cb835b43a0d255ac0b6d37614deafceec111b914b73b15fa4deba70e5e14153897dc5 SHA512 9de3eb46353e61f14f4f2dab8f7048b8dea48ceb3861383a74c3c4463aa93eefacf4952d4977d00f76fd8f99b7c79712b5098b9aa6261185ce666827d05afcc1
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r1.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r1.ebuild
deleted file mode 100644
index 4f0a2d532674..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 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
-
-DESCRIPTION="GPR configuration knowledge base"
-HOMEPAGE="https://www.adacore.com/"
-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"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@VER@:${GCCPV}:g" \
-		db/compilers.xml \
-		db/gnat.xml \
-		db/c.xml \
-		db/linker.xml \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/gprconfig
-	doins db/*.xml
-	doins db/*.ent
-	einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..a40f529179e4
--- /dev/null
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="GPR configuration knowledge base"
+HOMEPAGE="https://www.adacore.com/"
+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"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:@VER@:${GCCPV}:g" \
+		db/compilers.xml \
+		db/gnat.xml \
+		db/c.xml \
+		db/linker.xml \
+		|| die
+}
+
+src_install() {
+	insinto /usr/share/gprconfig
+	doins db/*.xml
+	doins db/*.ent
+	einstalldocs
+}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild
deleted file mode 100644
index a7e89934ab37..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-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
-
-DESCRIPTION="GPR configuration knowledge base"
-HOMEPAGE="https://www.adacore.com/"
-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="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@VER@:${GCCPV}:g" \
-		db/compilers.xml \
-		db/gnat.xml \
-		db/c.xml \
-		db/linker.xml \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/gprconfig
-	doins db/*.xml
-	doins db/*.ent
-	einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r2.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..aa88b38f7805
--- /dev/null
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r2.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="GPR configuration knowledge base"
+HOMEPAGE="https://www.adacore.com/"
+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="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:@VER@:${GCCPV}:g" \
+		db/compilers.xml \
+		db/gnat.xml \
+		db/c.xml \
+		db/linker.xml \
+		|| die
+}
+
+src_install() {
+	insinto /usr/share/gprconfig
+	doins db/*.xml
+	doins db/*.ent
+	einstalldocs
+}
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index d3624cab2a6e..c47868b36253 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,6 +1,6 @@
 AUX gtkada-23.0.0-gentoo.patch 2408 BLAKE2B 658863cebee256a7dc59f66cb852a5ab322291393e4a7a97b194d4724e0ae8dc01e048c7cd5ee375ea812d4b144216d2ab0487e278b32935aa772aa45e43d3df SHA512 8e84c77b45b97db1b60b830afb151bcdb76bac32585a5ba2131beb9f9252fba3b41b7b2fb03eb6c7e7714c5307faa189cee6c16529470780e66117f4d95682e8
 DIST gtkada-24.0.0.tar.gz 6046333 BLAKE2B 38db0d87c978bd608344a3e7eda5642bb9d2e73e0a201f65910c96baa4ede410071713190597ce5190ddc49b9ee7b44cc83e64e73cd34ceec00dc2613e24bc33 SHA512 b1c2cd9fe2d7fa6e39b007d64edebdc725132af892442454a0950e5533bf19a0d53e195d56282086f0d6cec1047d54109b933daf6a16f795aca613a01ee9ee61
 DIST gtkada-25.0.1.tar.gz 6078738 BLAKE2B 31c833aa2c28848d6a515aabab8c37657377b3777850c51cbfab781334caece770f9232fbcee39ed6305d3f5cadb4e962d2aef43af63e740efe79d632b7321b9 SHA512 9af4be3e3ba2fe4cfdd28b9e965d8ffa3760e8e9ea0e1e3018cf5b8d63ef6b80b73b73e803c06c692afa0b0bb72371d33e8602905b410764289fb6b732265883
-EBUILD gtkada-24.0.0.ebuild 1086 BLAKE2B fdf332eb739521baf60e344b6d597471e4b44ccd66632af76b416f9cbd260b66aa5f3b2bcc5ae932b7c768562b7c679b3061148591a364c5a3c0d1b8013de301 SHA512 734087419122c8b0696ff250f16949b1591392b218d13f6fb4a9d3351b136dc701a87a81a1b07417940a7c86f837942f5c68face4263f04e38358a796087ee2d
-EBUILD gtkada-25.0.1.ebuild 1102 BLAKE2B 7782bdffc14414bd454cd54f0a85fc75165da53957ad43e57502d541a89cdc74a73a7a0824c52c63fa5b47a982bb67d2a179e3f28c1e1358ea00476f6b3218be SHA512 f64a36381cfbaea2fafad345e8714d3573e2f53d36aeb91ee55fc7fc30386087a7bf6645e352eb4d89887d46a7d7a63f4a88fda3475708b1ff669ca9f49464b4
+EBUILD gtkada-24.0.0-r1.ebuild 1076 BLAKE2B 9343ef01a5be57ce7b80c7d2e89c46f0fbef5f56b3b87332d904cded8859c5626df716ceee092b40f584cbb3aca9b2bed7615389977e23176d0ae7a18096c5c8 SHA512 1baa209c62b0ecb2c3da97c68c07ceff600119c138c1c243ac9fa4a470224dd7aabd0aa1a238afe3fabe5525744185ca49b455cafb846b9c0464cc193a783920
+EBUILD gtkada-25.0.1-r1.ebuild 1092 BLAKE2B 2f60b13a3b886fa1bfb1f23dd23f9735228bd809c47916601c18e2640ea59781bd822a1cf8cdc001b5ad36a64a7b5192a3b9b2cf527c42056a7227944c0c7c9d SHA512 fba70a85a5584bef9d86874cfa1ff4f2f4eded26b9a5ce2c487b4451e01c22413e4984f1207384cd34f302eca770467a947f340b73e8e68c81fea3bb00831a3e
 MISC metadata.xml 688 BLAKE2B d3ea42354ba10dd872affbaeb5a14833cc2254bed85f10e15871c8131a46d3f996948b2fffb9d9aa795c914e4e9dc5d3f34e86666a2526c566d4b03fa14bf121 SHA512 ce18831b728277d125cf4cd86522a238ec17f4cab007958212c95f3ee97fedbdb827749549e0ea4eff93dc74022d61515d116f3fe606db34496e9045b8c23778
diff --git a/dev-ada/gtkada/gtkada-24.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-24.0.0-r1.ebuild
new file mode 100644
index 000000000000..0e19bd5d1f40
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-24.0.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada autotools multiprocessing
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+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"
+
+RDEPEND="${ADA_DEPS}
+	app-accessibility/at-spi2-core
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/${PN}-23.0.0-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable shared) \
+		$(use_enable static-pic)
+}
+
+src_compile() {
+	emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/dev-ada/gtkada/gtkada-24.0.0.ebuild b/dev-ada/gtkada/gtkada-24.0.0.ebuild
deleted file mode 100644
index f6c648db79ef..000000000000
--- a/dev-ada/gtkada/gtkada-24.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-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 autotools multiprocessing
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-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"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}"/${PN}-23.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		$(use_enable static-pic)
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-25.0.1-r1.ebuild b/dev-ada/gtkada/gtkada-25.0.1-r1.ebuild
new file mode 100644
index 000000000000..ed0cf54ad03c
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-25.0.1-r1.ebuild
@@ -0,0 +1,54 @@
+# 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 autotools multiprocessing
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+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"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="${ADA_DEPS}
+	app-accessibility/at-spi2-core
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/${PN}-23.0.0-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable shared) \
+		$(use_enable static-pic)
+}
+
+src_compile() {
+	emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/dev-ada/gtkada/gtkada-25.0.1.ebuild b/dev-ada/gtkada/gtkada-25.0.1.ebuild
deleted file mode 100644
index 5c4a2b1e5cd5..000000000000
--- a/dev-ada/gtkada/gtkada-25.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-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 autotools multiprocessing
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-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"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}"/${PN}-23.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		$(use_enable static-pic)
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/lal-refactor/Manifest b/dev-ada/lal-refactor/Manifest
index eba593ded13c..c41099c8226b 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-0_p20231027-r1.ebuild 2207 BLAKE2B ae886c9284fcf06406aa55104691a762a4f89230e16b5c13da574f4a5c5bbfea98d27814450a871c2dd4859f82fb4b607f310cb209ba288aa96181e67f201e69 SHA512 8feda77a8ef20fc938b05b8185f6830af4bdb0bd87d5dfb524f98e64c6cedab977cea8be6fc0b26391f4e335430c1b77b32155d40c3fa343003192b1f11275b3
 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-0_p20231027-r1.ebuild b/dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild
new file mode 100644
index 000000000000..bd24629f477a
--- /dev/null
+++ b/dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+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/${commitId}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${commitId}
+
+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="${ADADEPS}
+	dev-ada/libadalang-tools[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -j$(makeopts_jobs) -p \
+			-XLAL_REFACTOR_LIBRARY_TYPE=$1 \
+			-XLAL_REFACTOR_BUILD_MODE=prod \
+			-P gnat/lal_refactor.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || 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
+
+	if use static-libs; then
+		libtype='static'
+	elif use static-pic; then
+		libtype='static-pic'
+	elif use shared; then
+		libtype='relocatable'
+	fi
+	gprbuild -v -k -XLIBRARY_TYPE=${libtype} -j$(makeopts_jobs) -p \
+		-XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \
+		-XLAL_REFACTOR_BUILD_MODE=prod \
+		-Pgnat/lal_refactor_driver.gpr \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die
+}
+
+src_install() {
+	build () {
+		gprinstall \
+			-XLAL_REFACTOR_LIBRARY_TYPE=$1 \
+			-XLIBRARY_TYPE=$1 \
+			-XLAL_REFACTOR_BUILD_MODE=prod \
+			--prefix="${D}"/usr \
+			--sources-subdir=include/lal-refactor \
+			--build-name=$1 \
+			--build-var=LIBRARY_TYPE \
+			-P gnat/lal_refactor.gpr -p -f || 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 \
+		-XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \
+		-XLIBRARY_TYPE=${libtype} \
+		-XBUILD_MODE=prod \
+		--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-0_p20231027.ebuild b/dev-ada/lal-refactor/lal-refactor-0_p20231027.ebuild
deleted file mode 100644
index 1d6dcc7aec8f..000000000000
--- a/dev-ada/lal-refactor/lal-refactor-0_p20231027.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 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
-
-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/${commitId}.tar.gz
-	-> ${P}.tar.gz"
-
-S="${WORKDIR}"/${PN}-${commitId}
-
-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="${ADADEPS}
-	dev-ada/libadalang-tools[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	build () {
-		gprbuild -v -k -XLIBRARY_TYPE=$1 -j$(makeopts_jobs) -p \
-			-XLAL_REFACTOR_LIBRARY_TYPE=$1 \
-			-XLAL_REFACTOR_BUILD_MODE=prod \
-			-P gnat/lal_refactor.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || 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
-
-	if use static-libs; then
-		libtype='static'
-	elif use static-pic; then
-		libtype='static-pic'
-	elif use shared; then
-		libtype='relocatable'
-	fi
-	gprbuild -v -k -XLIBRARY_TYPE=${libtype} -j$(makeopts_jobs) -p \
-		-XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \
-		-XLAL_REFACTOR_BUILD_MODE=prod \
-		-Pgnat/lal_refactor_driver.gpr \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	build () {
-		gprinstall \
-			-XLAL_REFACTOR_LIBRARY_TYPE=$1 \
-			-XLIBRARY_TYPE=$1 \
-			-XLAL_REFACTOR_BUILD_MODE=prod \
-			--prefix="${D}"/usr \
-			--sources-subdir=include/lal-refactor \
-			--build-name=$1 \
-			--build-var=LIBRARY_TYPE \
-			-P gnat/lal_refactor.gpr -p -f || 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 \
-		-XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \
-		-XLIBRARY_TYPE=${libtype} \
-		-XBUILD_MODE=prod \
-		--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 b34f799e00dd..6150f0af43fa 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-24.0.0-r2.ebuild 1766 BLAKE2B 0bd48e9cfdd028ea4c076b92a62ce6ac4ddc9975e3b3da50b3202fa60049777d51f6159e7acdf1fe6cfba71fad1cdad1aa8c3c672065f42efdf64c310f4fb3e4 SHA512 20f61e70f7ee4bb5a8c1727e97fcfafccf6010d8a5330cc431c87edaa0ddfdabd5b44fb010b7f9251867e84170f98dac3db0f781f1c789eb78e6f7490d119ea8
 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-24.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-24.0.0-r1.ebuild
deleted file mode 100644
index 0b149c5fc427..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-24.0.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-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
-
-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"
-
-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() {
-	build () {
-		gprbuild -v -k -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
-			-P src/lal_tools.gpr -p -j$(makeopts_jobs) \
-			-cargs:Ada ${ADAFLAGS} || die
-		gprbuild -v -k -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			-XBUILD_MODE=prod -XLALTOOLS_SET=all \
-			-P src/build.gpr -p -j$(makeopts_jobs) \
-			-cargs:Ada ${ADAFLAGS} || 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
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
-			--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
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	dobin bin/gnat{metric,pp,stub,test}
-	einstalldocs
-}
diff --git a/dev-ada/libadalang-tools/libadalang-tools-24.0.0-r2.ebuild b/dev-ada/libadalang-tools/libadalang-tools-24.0.0-r2.ebuild
new file mode 100644
index 000000000000..7b92c039f687
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-24.0.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+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"
+
+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() {
+	build () {
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			-P src/lal_tools.gpr -p -j$(makeopts_jobs) \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			-XBUILD_MODE=prod -XLALTOOLS_SET=all \
+			-P src/build.gpr -p -j$(makeopts_jobs) \
+			-cargs:Ada ${ADAFLAGS} || 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
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			--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
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	dobin bin/gnat{metric,pp,stub,test}
+	einstalldocs
+}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index d4d7f6bb2ce0..f7dd5fb5e4a6 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 2724 BLAKE2B 0b5312f3d6c166bd8c4f78328f542bcc1de1c9d2feebf34629e8be0a84e1ea69912b3c4dd9a18dd50e32628e55903f7cbf3c1ef4fd21ad10bcab4bc685d731e6 SHA512 c545a5cfd0e8d8cb20d4b33557ab5642adff6e70d103cb6c3edc7c9689c8c27f614db4165e3090b5a7b0fa9df4053ba9bc2890b27c335924a7254097ed9709ec
+EBUILD libadalang-24.0.0-r3.ebuild 2714 BLAKE2B e8c7c5360fe8ed7ee1c575417189a8690a194627ff9ace347ba01cbca8ba4060503edb94a24e5fd894dd936cef72b574b27e68e1b8f6e1e8d997c3f10595b124 SHA512 b10e17dc87b319de47e8be2961993202c3461951caa39aa43d386bd1f9fb3ab6ff88060f18de9614f1cb0914918a99ce6c3180fa4bd5808ed1ca0e6255f5b7fc
 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
deleted file mode 100644
index 43c3845f65e5..000000000000
--- a/dev-ada/libadalang/libadalang-24.0.0-r2.ebuild
+++ /dev/null
@@ -1,111 +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=( gnat_2021 gcc_12 gcc_13 )
-
-inherit ada python-single-r1 multiprocessing
-
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-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="test +static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-# Need java
-RESTRICT="test"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv(+)]
-	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
-	${ADA_DEPS}
-	${PYTHON_DEPS}
-	=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}]
-	')"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-"
-BDEPEND="test? (
-		dev-ml/dune
-		dev-ml/zarith
-		dev-ml/camomile
-		dev-ml/ocaml-ctypes
-		dev-ada/e3-testsuite
-		<dev-lang/ocaml-4.14
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-23.0.0-test.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-	libType=''
-	if use static-libs; then
-		libType+=',static'
-	fi
-	if use static-pic; then
-		libType+=',static-pic'
-	fi
-	libType+=',relocatable'
-	libType=${libType:1}
-}
-
-src_prepare() {
-	default
-	rm -r testsuite/tests/misc/copyright || die
-	rm -r testsuite/tests/name_resolution/field_hiding_2 || die
-	rm -r testsuite/tests/ocaml_api/auto_provider || die
-	rm -r testsuite/tests/ocaml_api/project_unit_provider || die
-}
-
-src_configure() {
-	${EPYTHON} manage.py generate -v debug || die
-}
-
-src_compile() {
-	${EPYTHON} manage.py build -v \
-		--build-mode "prod" \
-		-j$(makeopts_jobs) \
-		--disable-java \
-		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS}" \
-		--library-types=${libType} || die
-	GPR_PROJECT_PATH="${S}"/build \
-		gprbuild -P contrib/highlight/highlight.gpr \
-		-j$(makeopts_jobs) -v \
-		-XBUILD_MODE=prod \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_test() {
-	BUILD_MODE=prod \
-	${EPYTHON} manage.py test \
-		--build-mode "prod" \
-		--restricted-env -j 1 \
-		|& tee libadalang.testOut
-	grep -qw FAIL libadalang.testOut && die
-}
-
-src_install() {
-	${EPYTHON} manage.py \
-		install "${D}"/usr \
-		--build-mode "prod" \
-		--library-types=${libType} || die
-	rm -r "${D}"/usr/python || die
-	python_domodule build/python/libadalang
-	rm -r "${D}"/usr/ocaml || die
-	rm -r "${D}"/usr/java || die
-}
diff --git a/dev-ada/libadalang/libadalang-24.0.0-r3.ebuild b/dev-ada/libadalang/libadalang-24.0.0-r3.ebuild
new file mode 100644
index 000000000000..fd5cc53329f4
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-24.0.0-r3.ebuild
@@ -0,0 +1,111 @@
+# 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 )
+
+inherit ada python-single-r1 multiprocessing
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+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="test +static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+# Need java
+RESTRICT="test"
+
+RDEPEND="dev-python/pyyaml
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv(+)]
+	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
+	${ADA_DEPS}
+	${PYTHON_DEPS}
+	=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}]
+	')"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+"
+BDEPEND="test? (
+		dev-ml/dune
+		dev-ml/zarith
+		dev-ml/camomile
+		dev-ml/ocaml-ctypes
+		dev-ada/e3-testsuite
+		<dev-lang/ocaml-4.14
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-23.0.0-test.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+	libType=''
+	if use static-libs; then
+		libType+=',static'
+	fi
+	if use static-pic; then
+		libType+=',static-pic'
+	fi
+	libType+=',relocatable'
+	libType=${libType:1}
+}
+
+src_prepare() {
+	default
+	rm -r testsuite/tests/misc/copyright || die
+	rm -r testsuite/tests/name_resolution/field_hiding_2 || die
+	rm -r testsuite/tests/ocaml_api/auto_provider || die
+	rm -r testsuite/tests/ocaml_api/project_unit_provider || die
+}
+
+src_configure() {
+	${EPYTHON} manage.py generate -v debug || die
+}
+
+src_compile() {
+	${EPYTHON} manage.py build -v \
+		--build-mode "prod" \
+		-j$(makeopts_jobs) \
+		--disable-java \
+		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS}" \
+		--library-types=${libType} || die
+	GPR_PROJECT_PATH="${S}"/build \
+		gprbuild -P contrib/highlight/highlight.gpr \
+		-j$(makeopts_jobs) -v \
+		-XBUILD_MODE=prod \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs ${LDFLAGS} \
+		|| die
+}
+
+src_test() {
+	BUILD_MODE=prod \
+	${EPYTHON} manage.py test \
+		--build-mode "prod" \
+		--restricted-env -j 1 \
+		|& tee libadalang.testOut
+	grep -qw FAIL libadalang.testOut && die
+}
+
+src_install() {
+	${EPYTHON} manage.py \
+		install "${D}"/usr \
+		--build-mode "prod" \
+		--library-types=${libType} || die
+	rm -r "${D}"/usr/python || die
+	python_domodule build/python/libadalang
+	rm -r "${D}"/usr/ocaml || die
+	rm -r "${D}"/usr/java || die
+}
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index ed896a74299f..2c7bd67bc0b6 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,6 +1,6 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 DIST gprbuild-24.0.0.tar.gz 959615 BLAKE2B c432b1f13a1aecb8f664aeb06694d86123268f29b43a50f5c7a48d7428c0b1c16f397e5a84c097aba04c7ee34011df119b154fd546ce156c999a54d159a84afb SHA512 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03
 DIST gprbuild-25.0.0.tar.gz 940774 BLAKE2B b2a2895db767b55e459351ea6fbeb91a771b6e39672217d53fb2b4aeea4f42aa093760448da715ffb0b7da54c50b4b55f0034910ebfdfc52a8cde7dad7533ef0 SHA512 eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
-EBUILD libgpr-24.0.0.ebuild 1508 BLAKE2B 4a1b7176d35349cf51c1eaf918e5c8a2517d6b00acba2cedbef84c856c84b1a131cbb21d849aec057c9c105513b3a586962c6192af0bd6476ab2b325c9201bb5 SHA512 21335fa502e776134b985051b29dc6b1e9473eceaf8864e280d2f089a0ab19bc7bc10bf9da1546d929cb95e5599a9a7b87ec89c9219e55794fd4e34a2354e62d
-EBUILD libgpr-25.0.0.ebuild 1520 BLAKE2B 927569cab1fe31fa292d03094c9d697ed765d621f8c750f4472cb5422b69958fbb2d362a552cacf897e506e7fed73c35889766c8bd07e5be6acb28af210b9ba3 SHA512 1d167b083701b9a063832da3479436357e94333f7c18fac761a9404824492bf307cd14c98ec734c7bb870ed08c21a004a3a258cf56937a7e246c58e40de7f929
+EBUILD libgpr-24.0.0-r1.ebuild 1498 BLAKE2B a98152df2201929310eaa70dcb55c67ea181cb6309d75a1c6f7ded86c18ec2726d36f26c2afa2446371350538e902ce568193d225b80fa63dea7ebb8d6a532b5 SHA512 dc1a49fe5c57887e0543dd8359b2a6706f052a6f5ff14925f5da5cfd30950eeefd889acdf4e6225925aa3c9ab47e33a3d24535b1f352b37adae7abf0470981d6
+EBUILD libgpr-25.0.0-r1.ebuild 1510 BLAKE2B 397201aa001e9aeda5929097a3d738617ef1c3c28c08fd9e0ff427a1490aa56fe4fbd5fa0f39cdf72d1c394302e88b721f78be9b522a484f7bbece91ce35e112 SHA512 e5882f4f836c7a1b18f5411a0642a1490e9d91e6f3c701d5cdd0c398ed552f0261d4685c05b6e8086cb1f82d7fd5cbedf0ab5aa5b177116aeea60d933a487e0d
 MISC metadata.xml 1021 BLAKE2B 448e77605bee95104afac31b48193217ee6c38af0b4e63cdee2c5d8e420a7f9b9a13c1302cfe49a109ab5c878808582a6f4a3ca3315e41b256f529d202bc1b4b SHA512 71427b65c100cba3e66d889124f27f1e378ad72559e7165ec93a4ffc68b7efe12db81ee5ec83aa92939b922d3efcfb3a5641c46db772a25bae21ce51acec5f47
diff --git a/dev-ada/libgpr/libgpr-24.0.0-r1.ebuild b/dev-ada/libgpr/libgpr-24.0.0-r1.ebuild
new file mode 100644
index 000000000000..eaad3a495a06
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-24.0.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada multiprocessing
+
+MYPN=gprbuild
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
+}
+
+src_install() {
+	if use static-libs; then
+		emake prefix="${D}"/usr libgpr.install.static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake prefix="${D}"/usr libgpr.install.${kind}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/libgpr/libgpr-24.0.0.ebuild b/dev-ada/libgpr/libgpr-24.0.0.ebuild
deleted file mode 100644
index f279207f3207..000000000000
--- a/dev-ada/libgpr/libgpr-24.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-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
-
-MYPN=gprbuild
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${MYP}.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/libgpr-25.0.0-r1.ebuild b/dev-ada/libgpr/libgpr-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..d4f705741465
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-25.0.0-r1.ebuild
@@ -0,0 +1,68 @@
+# 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
+
+MYPN=gprbuild
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="https://github.com/AdaCore/gprbuild"
+SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
+}
+
+src_install() {
+	if use static-libs; then
+		emake prefix="${D}"/usr libgpr.install.static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake prefix="${D}"/usr libgpr.install.${kind}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
diff --git a/dev-ada/libgpr/libgpr-25.0.0.ebuild b/dev-ada/libgpr/libgpr-25.0.0.ebuild
deleted file mode 100644
index d9cd45761682..000000000000
--- a/dev-ada/libgpr/libgpr-25.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-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
-
-MYPN=gprbuild
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="https://github.com/AdaCore/gprbuild"
-SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${MYP}.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
diff --git a/dev-ada/spawn/Manifest b/dev-ada/spawn/Manifest
index 6eff17977dcc..e27e84a28932 100644
--- a/dev-ada/spawn/Manifest
+++ b/dev-ada/spawn/Manifest
@@ -1,5 +1,3 @@
-DIST spawn-24.0.0.tar.gz 66727 BLAKE2B 12da7485b27ff75ce75efbbe4e9c71542faf2c283f843cc903530b9e8829f86e3ea1aff73f8f9efb80fd9924c695039456f3b63ff6d635161ed8b33daeb2da88 SHA512 948bcaa7963d79f7a42fe05c80586bce669b7ff01bb756c087f237b35892956d2ababc274e594e9bda82a8c70fbb62c9ca199161176c87ed3ff42f9e7bc78ea9
 DIST spawn-25.0.0.tar.gz 66730 BLAKE2B 45790fcce26594b583eea5cfa123dbd19449d9a38c9fa5f205b549b04f50686ed32609d7b63726815b8ba950e3f61b81f919caaed89d5baa1273e78cff27c1a5 SHA512 429442b1d308b552516bc872508f9d735f0f24acce7c7b705caa54837f3a2eadb7555cad49dbdf01872faf7d838d438b6b542d2196f50f8012ffc8faad4d6f9d
-EBUILD spawn-24.0.0.ebuild 2703 BLAKE2B 3d07ffb6cfe40c0d7336c895b2510abd5e54f1782c1464060fc8fb679bb6c7d7243f3e33f4b829de71990038aa21f7f10d8c351cfd41cd05c0e005bd50564ac1 SHA512 c8b345db28847a3e79183dbd6f76a6a1dfc117c9ca6bb74e3dde1d2bf6b46bf4212b8da0de4d4d5c2ccab51e83004e717551267f88b6f2765e2023a35ef54055
-EBUILD spawn-25.0.0.ebuild 1987 BLAKE2B f28b712485c4367613fbe141f087d2ddb8afc277adf021de064369126b79b38883f5090916f22cdbda68f33743ad6335a9bd6974ee20f0e0e854ba9f753310c7 SHA512 86ec444d73034fff67c9ab3a036e16c5d68221abe1e58456d1ee92d790cb48f578d3a08770cbd94a3af8c40636aa0ff352dd16027a930108b1aff790d1992a9b
-MISC metadata.xml 757 BLAKE2B ab129603cda705c21f84a789cd100d39186e06885589089320dfcfc0726cc913ad73784fd35e541ee0773c93e89bbd42965897b9bd921008cdc0fbdaffdaf64f SHA512 6124d3eecafe758ca841715bcead3b8d35d9af7bafeea8a967910156043c30b1902a521e7cf37c0a61283859797dc364580f2b84f6b597adeb81c25c98f3f9d2
+EBUILD spawn-25.0.0-r1.ebuild 1977 BLAKE2B 1b0beb49c377b52c9e63eb7bfc4066754b39c2dbde80985942f45d309b7a51b0ed117972d55c98c2c24eb28a7bce7150c9f5703a87176612683926f0cfbda56b SHA512 ba0a19d292615c08fc7b78894f988bac991ac4f17f7ef6b9f5ad8cd629f9d6c46078027490e8db3a62b27b8d32ffb9db92676ed51963c188da1f2c087e690d42
+MISC metadata.xml 667 BLAKE2B 5f876b93595ab5bfc97e5043634a6226b414a6e83638fdf9d61f39ca5ffe517042a4e3535b346d4bf0edd8bd84a27005c4d2fc0e0c551dc4baeee9e2e32a2f03 SHA512 beab1459faf09cc5095b5cb04e3f1144bf388c1fc029d7fed8895c99160f40f4c336f2353238c395fa3356a59370ff6bff6ffab76a1162f654e1342892251ced
diff --git a/dev-ada/spawn/metadata.xml b/dev-ada/spawn/metadata.xml
index ce11c27621b4..7ff3ada41924 100644
--- a/dev-ada/spawn/metadata.xml
+++ b/dev-ada/spawn/metadata.xml
@@ -5,9 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="glib">
-			Add support to <pkg>dev-libs/glib</pkg>-based mainloop.
-		</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/spawn/spawn-24.0.0.ebuild b/dev-ada/spawn/spawn-24.0.0.ebuild
deleted file mode 100644
index 7e42f15053ad..000000000000
--- a/dev-ada/spawn/spawn-24.0.0.ebuild
+++ /dev/null
@@ -1,108 +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
-
-DESCRIPTION="Simple API to spawn processes"
-HOMEPAGE="https://github.com/AdaCore/spawn"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="glib +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
-	glib? (
-	dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?,static-pic(-)?]
-	dev-libs/glib
-)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	build () {
-		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 \
-			gnat/spawn.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-		if use glib; then
-			gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-				-XLIBRARY_TYPE=$1 \
-				gnat/spawn_glib.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-				|| die
-		fi
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	build () {
-		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 \
-			gnat/spawn_tests.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-			|| die
-		if use glib; then
-			gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-				-XLIBRARY_TYPE=$1 \
-				gnat/spawn_glib_tests.gpr \
-				-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-		fi
-	}
-	if use shared; then
-		build relocatable
-	elif use static-libs; then
-		build static
-	elif use static-pic; then
-		build static-pic
-	fi
-	.obj/spawn_test/spawn_test || die
-	.obj/spawn_test/spawn_unexpected || die
-	.obj/spawn_test/spawn_kill || die
-	if use glib; then
-		.obj/spawn_test/spawn_glib_test || die
-		.obj/spawn_test/spawn_glib_args_test.exe || die
-	fi
-}
-
-src_install() {
-	build() {
-		gprinstall --prefix=/usr --sources-subdir="${D}"/usr/include/spawn \
-			-XLIBRARY_TYPE=$1 \
-			--lib-subdir="${D}"/usr/lib/spawn \
-			--project-subdir="${D}"/usr/share/gpr \
-			--link-lib-subdir="${D}"/usr/lib/ -p \
-			-P gnat/spawn.gpr || die
-		if use glib; then
-			gprinstall --prefix=/usr \
-				-XLIBRARY_TYPE=$1 \
-				--sources-subdir="${D}"/usr/include/spawn_glib \
-				--lib-subdir="${D}"/usr/lib/spawn_glib \
-				--project-subdir="${D}"/usr/share/gpr \
-				--link-lib-subdir="${D}"/usr/lib/ -p \
-				-P gnat/spawn_glib.gpr || die
-		fi
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
diff --git a/dev-ada/spawn/spawn-25.0.0-r1.ebuild b/dev-ada/spawn/spawn-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..3e068be9b3c2
--- /dev/null
+++ b/dev-ada/spawn/spawn-25.0.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021-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="Simple API to spawn processes"
+HOMEPAGE="https://github.com/AdaCore/spawn"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+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}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 \
+			gnat/spawn.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
+}
+
+src_test() {
+	build () {
+		GPR_PROJECT_PATH=gnat \
+		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 gnat/tests/spawn_tests.gpr \
+			-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+			|| die
+	}
+	if use shared; then
+		build relocatable
+	elif use static-libs; then
+		build static
+	elif use static-pic; then
+		build static-pic
+	fi
+	.obj/spawn_test/spawn_test || die
+	.obj/spawn_test/spawn_unexpected || die
+	.obj/spawn_test/wait_all || die
+	.obj/spawn_test/spawn_bad_exe || die
+	.obj/spawn_test/spawn_kill || die
+	.obj/spawn_test/spawn_stty || die
+}
+
+src_install() {
+	build() {
+		gprinstall --prefix=/usr --sources-subdir="${D}"/usr/include/spawn \
+			-XLIBRARY_TYPE=$1 \
+			--lib-subdir="${D}"/usr/$(get_libdir)/spawn \
+			--project-subdir="${D}"/usr/share/gpr \
+			--link-lib-subdir="${D}"/usr/$(get_libdir)/ -p \
+			-P gnat/spawn.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
+}
diff --git a/dev-ada/spawn/spawn-25.0.0.ebuild b/dev-ada/spawn/spawn-25.0.0.ebuild
deleted file mode 100644
index 2d9d0e516a91..000000000000
--- a/dev-ada/spawn/spawn-25.0.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 gcc_14 )
-inherit ada multiprocessing
-
-DESCRIPTION="Simple API to spawn processes"
-HOMEPAGE="https://github.com/AdaCore/spawn"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-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}"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	build () {
-		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 \
-			gnat/spawn.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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
-}
-
-src_test() {
-	build () {
-		GPR_PROJECT_PATH=gnat \
-		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 gnat/tests/spawn_tests.gpr \
-			-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-			|| die
-	}
-	if use shared; then
-		build relocatable
-	elif use static-libs; then
-		build static
-	elif use static-pic; then
-		build static-pic
-	fi
-	.obj/spawn_test/spawn_test || die
-	.obj/spawn_test/spawn_unexpected || die
-	.obj/spawn_test/wait_all || die
-	.obj/spawn_test/spawn_bad_exe || die
-	.obj/spawn_test/spawn_kill || die
-	.obj/spawn_test/spawn_stty || die
-}
-
-src_install() {
-	build() {
-		gprinstall --prefix=/usr --sources-subdir="${D}"/usr/include/spawn \
-			-XLIBRARY_TYPE=$1 \
-			--lib-subdir="${D}"/usr/$(get_libdir)/spawn \
-			--project-subdir="${D}"/usr/share/gpr \
-			--link-lib-subdir="${D}"/usr/$(get_libdir)/ -p \
-			-P gnat/spawn.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
-}
diff --git a/dev-ada/templates-parser/Manifest b/dev-ada/templates-parser/Manifest
index 9bad6a0664a2..1b333c2b704c 100644
--- a/dev-ada/templates-parser/Manifest
+++ b/dev-ada/templates-parser/Manifest
@@ -1,5 +1,5 @@
 DIST templates-parser-24.0.0.tar.gz 226649 BLAKE2B 6e84721cbe28164e9c5f683906ff0b360a7dca82a2b91a7fe0253546c6d617d82ff2bb385133435e48c1588821daa3171eee86aeb0de27a55f38cad372f858db SHA512 3661ccb4be3bc3a6a81bbf04244f3b943c87655cad25370e857bb09d24b86ee801388a4a71d63f9135d5f069c54bc184cef4a8a25bcc90d0add8a15c67f8c374
 DIST templates-parser-25.0.0.tar.gz 259459 BLAKE2B b0ba2ad87cbd9cb34773cce54160a30e59b566ec72ce773525ba4cbb33be659dd83f23846bcb6d6fd88726c7cfae52e2993c1ced052f078bd589b14cf73cef55 SHA512 902e41f713dd8446e08ba6f180b4c88c35d37da3476d0c925a4b6a05fb5038ff9ec1b0daa0443a55e82f902867b774efb4e28c0b7d8ec59fb15d050ee523ee87
-EBUILD templates-parser-24.0.0.ebuild 1022 BLAKE2B 86edd650de78cc010460baadb67560089457fbcd584cae67ba9fc4b951396f5d776bb520f4960da8f1553ad2d667308e0c8af6b75b72ea2466db07016456f6d7 SHA512 9ff929b285cfd0d5d226cedb7388286d295ff7bc22bdcdfe5e835475614b7846d8cc465cbf4012b40985ad8952e4ba8d4d234670c8e036963063c99d26182d39
+EBUILD templates-parser-24.0.0-r1.ebuild 1012 BLAKE2B b4d14c74de3fb0e493d2b91d3f06a0c036f92ff43c711db7d10befa9edbf8bdbda223c2a2eff03d630f180b1e9660f2c640f6673e071823f8b6bb4e0c360b386 SHA512 dc95cd98687bd0242f1b1c1765fd16eb81362909681b4b1e8baf96b828f7cd022fc7e9f04d57bcac5ef76dc5adc95b6833781b0023b9aa1224bd781a8695e369
 EBUILD templates-parser-25.0.0-r2.ebuild 3868 BLAKE2B 4db537c443ed34ca2f55046024dc36c64adb52ce03b5c24394ba7d7d33f888e28c0f41c5cfbc1f5070944326291855699e9a84aa538795f6ade41dcd00f90326 SHA512 3274e31123d9cca6471ae83b22ee75accb48ceeda3817045639e9f75b89bfb726a60886c60d4a8ead295306e31ea884cbda6c24cd44a168a78e7befa7e7eda25
 MISC metadata.xml 630 BLAKE2B 85fcb405c631c72043010eb82381dc7d2b118f288fdd358f42adbd2113189d38912efa90bd5980626cd648bbbf8549c1dd6feeb9591c605d49d1b40f33744f24 SHA512 f2914f4184cfc534641e8b6ba24690a9be459b153fb3fad9491cbe330ba9dedc524923756d1a371473e757f15dbb345883af9bd14dbbfbbe0cfebf688e5eff4b
diff --git a/dev-ada/templates-parser/templates-parser-24.0.0-r1.ebuild b/dev-ada/templates-parser/templates-parser-24.0.0-r1.ebuild
new file mode 100644
index 000000000000..1075dcd8234a
--- /dev/null
+++ b/dev-ada/templates-parser/templates-parser-24.0.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 )
+inherit ada multiprocessing
+
+DESCRIPTION="A template engine"
+HOMEPAGE="https://github.com/AdaCore/templates-parser"
+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"
+RESTRICT="test"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?]
+	shared? ( dev-ada/xmlada[static-pic] )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="|| ( shared static-libs )
+	${ADA_REQUIRED_USE}"
+
+src_configure() {
+	emake PROCESSORS=$(makeopts_jobs) \
+		DEFAULT_LIBRARY_TYPE=$(usex shared relocatable static) \
+		ENABLE_STATIC=$(usex static-libs true false) \
+		ENABLE_SHARED=$(usex shared true false) \
+		prefix=/usr \
+		setup
+}
+
+src_compile() {
+	emake -j1 GPROPTS=-v
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	einstalldocs
+}
diff --git a/dev-ada/templates-parser/templates-parser-24.0.0.ebuild b/dev-ada/templates-parser/templates-parser-24.0.0.ebuild
deleted file mode 100644
index 9a082eadd8e7..000000000000
--- a/dev-ada/templates-parser/templates-parser-24.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-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
-
-DESCRIPTION="A template engine"
-HOMEPAGE="https://github.com/AdaCore/templates-parser"
-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"
-RESTRICT="test"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?]
-	shared? ( dev-ada/xmlada[static-pic] )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="|| ( shared static-libs )
-	${ADA_REQUIRED_USE}"
-
-src_configure() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		DEFAULT_LIBRARY_TYPE=$(usex shared relocatable static) \
-		ENABLE_STATIC=$(usex static-libs true false) \
-		ENABLE_SHARED=$(usex shared true false) \
-		prefix=/usr \
-		setup
-}
-
-src_compile() {
-	emake -j1 GPROPTS=-v
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index e18ee8a78dc2..c063342f2e72 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -2,6 +2,6 @@ AUX xmlada-23.0.0-gentoo.patch 1070 BLAKE2B 1894bf507add813229dc505c6300d475dfba
 AUX xmlada-24.0.0-gentoo.patch 1255 BLAKE2B 92e437d6d594a0d1527114301a3e77b0466588dc66b6cbb31d9cb0777416dc5cba9d78b1147df7ee23dde63f20aa046f8d797347885d4a7715fae8e902e1c5f7 SHA512 10beb7eec14815b899552dda732368dee8183fc78f9014eb3557c84416892ca46d6df4dfbb567875574bdd74c96bbdf5558f9d17d3dbc310fcb296966ecb1056
 DIST xmlada-24.0.0.tar.gz 1053363 BLAKE2B 628a1d3645c58cc3f8f5140c7cfb16adef02f6ccc72b8e9410819eaf67e0160bdcf81a8e33065ec52f54cb12309d857a3d82e532990a0fd17c249c04334ab10f SHA512 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
 DIST xmlada-25.0.0.tar.gz 1082553 BLAKE2B daddd7b1d6cd8c38ff3e9ecdc1d0864e1eca88128121635e8d1a8133f73285ced08478e732a0b7bb02cc00e240887d20a1a16048991450025290fd96ad5cb09f SHA512 c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
-EBUILD xmlada-24.0.0-r3.ebuild 2492 BLAKE2B 4c3ae705dd48d9bf293c8b1bff2a0fe238596abf315d3043d49c4e2d5d13f862c01ee69c933f06c910ee542f170a15af9daf6ad698f22f3b54708ce22d21c6a6 SHA512 75cb73d7f424c06dd17c07c0312bba95313768c3265c3ef267762ca4c55344793a620b0a60b974a7f5928f2e9a4b3f1b1069d968724f13e7523c3d6a756d8314
-EBUILD xmlada-25.0.0-r2.ebuild 2746 BLAKE2B 4753469b798b04f2d35ef945762b28fbf1cfd42af3a0f541950afd9bf898b03e8417adaa3f099f7629cfb99bdcf06674d49271c65709d98b6d6770d25df89673 SHA512 e571f069ae7f72fe0c4ffcd29ca377093dbd7e07bb7fcce473b69db99b6bc83cbfee8e51841873dd422269e9e23c069efd41332fac044f8e46693a338f3b7011
+EBUILD xmlada-24.0.0-r4.ebuild 2482 BLAKE2B b8290e4af99702330f378924bcdbdff26f943d12d5c3b16818a08ea11b1cbf5db05430fdbdb09f1129fc6209087b2db3bc8d7dafc7a1d63b5b7e46ae3b474440 SHA512 ff5fb838d1392f20d7f0bb9860db7b3b363131eddcd067f27ffdce02c61d69ab0fc6dceae42abe10db8385e915404126c05688675f8f3616fad1900677918ae2
+EBUILD xmlada-25.0.0-r3.ebuild 2736 BLAKE2B 676f043ae3a075cb100572d0be7974d67806e9b7777366067f3264aa9b361242fa985c8760fab121943272da4fa6797be38c966b93f91c6283f03024c9a0e136 SHA512 6d3d55751a205b75bbada09acad2ab8120fd787d2b1089fdc73cb133a4861a8f067d02297882b6b6738a67d6cf276b595d8e949f7b15fd56e8272e3c849ecec8
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/xmlada-24.0.0-r3.ebuild b/dev-ada/xmlada/xmlada-24.0.0-r3.ebuild
deleted file mode 100644
index cba66b5c1628..000000000000
--- a/dev-ada/xmlada/xmlada-24.0.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 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
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-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="doc +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	dev-tex/latexmk
-	dev-python/sphinx
-	dev-python/sphinx-rtd-theme
-	dev-texlive/texlive-latexextra
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		input_sources/xmlada_input.gpr \
-		|| die
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.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 doc; then
-		emake -C docs latexpdf
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-	rm docs/*/b__* || die
-	rm docs/*/*ali || die
-	rm docs/*/*std* || die
-	rm docs/*/*bexch || die
-	rm docs/*/*.o || die
-	rm docs/*/*example || die
-	rm docs/dom/domexample2 || die
-	rm docs/sax/saxexample_main || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall 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
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm -rf "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/xmlada/xmlada-24.0.0-r4.ebuild b/dev-ada/xmlada/xmlada-24.0.0-r4.ebuild
new file mode 100644
index 000000000000..ab067764c2ac
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-24.0.0-r4.ebuild
@@ -0,0 +1,106 @@
+# 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="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="http://libre.adacore.com/"
+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="doc +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	dev-tex/latexmk
+	dev-python/sphinx
+	dev-python/sphinx-rtd-theme
+	dev-texlive/texlive-latexextra
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		input_sources/xmlada_input.gpr \
+		|| die
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.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 doc; then
+		emake -C docs latexpdf
+		emake -C docs html
+	fi
+}
+
+src_test() {
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
+		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+		-XTESTS_ACTIVATED=Only \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	emake --no-print-directory -C tests tests | tee xmlada.testLog
+	grep -q DIFF xmlada.testLog && die
+	rm docs/*/b__* || die
+	rm docs/*/*ali || die
+	rm docs/*/*std* || die
+	rm docs/*/*bexch || die
+	rm docs/*/*.o || die
+	rm docs/*/*example || die
+	rm docs/dom/domexample2 || die
+	rm docs/sax/saxexample_main || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall 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
+
+	einstalldocs
+	dodoc xmlada-roadmap.txt
+	rm -rf "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-ada/xmlada/xmlada-25.0.0-r2.ebuild b/dev-ada/xmlada/xmlada-25.0.0-r2.ebuild
deleted file mode 100644
index 7aae56bdf915..000000000000
--- a/dev-ada/xmlada/xmlada-25.0.0-r2.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
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-inherit ada python-any-r1 multiprocessing
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="https://github.com/AdaCore/xmlada"
-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"
-IUSE="doc +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	')
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
-	"${FILESDIR}"/${PN}-24.0.0-gentoo.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		input_sources/xmlada_input.gpr \
-		|| die
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.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
-	use doc && emake -C docs html
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-	rm docs/*/b__* || die
-	rm docs/*/*ali || die
-	rm docs/*/*std* || die
-	rm docs/*/*bexch || die
-	rm docs/*/*.o || die
-	rm docs/*/*example || die
-	rm docs/dom/domexample2 || die
-	rm docs/sax/saxexample_main || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall 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
-	einstalldocs
-	rm -r "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/xmlada/xmlada-25.0.0-r3.ebuild b/dev-ada/xmlada/xmlada-25.0.0-r3.ebuild
new file mode 100644
index 000000000000..f6c1395d3802
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-25.0.0-r3.ebuild
@@ -0,0 +1,112 @@
+# 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 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="https://github.com/AdaCore/xmlada"
+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"
+IUSE="doc +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	')
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-24.0.0-gentoo.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		input_sources/xmlada_input.gpr \
+		|| die
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.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
+	use doc && emake -C docs html
+}
+
+src_test() {
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
+		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+		-XTESTS_ACTIVATED=Only \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	emake --no-print-directory -C tests tests | tee xmlada.testLog
+	grep -q DIFF xmlada.testLog && die
+	rm docs/*/b__* || die
+	rm docs/*/*ali || die
+	rm docs/*/*std* || die
+	rm docs/*/*bexch || die
+	rm docs/*/*.o || die
+	rm docs/*/*example || die
+	rm docs/dom/domexample2 || die
+	rm docs/sax/saxexample_main || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall 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
+	einstalldocs
+	rm -r "${D}"/usr/share/gpr/manifests
+}
-- 
cgit v1.2.3