From a86a7639c51a5a2f38d0f732b4d24db4c328acd7 Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Fri, 9 May 2025 23:45:19 +0200
Subject: [PATCH] dev-ada/*: support gcc:15

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 ...da_language_server-25.0.20241014-r2.ebuild |  2 +-
 .../lal-refactor-25.0.0-r1.ebuild             |  2 +-
 ...uild => libadalang-tools-25.0.0-r2.ebuild} | 33 ++++++++++++-------
 dev-ada/libadalang-tools/metadata.xml         |  1 -
 4 files changed, 23 insertions(+), 15 deletions(-)
 rename dev-ada/libadalang-tools/{libadalang-tools-25.0.0-r1.ebuild => libadalang-tools-25.0.0-r2.ebuild} (77%)

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
index 4b1a7fa041e97..62a4915abf05d 100644
--- 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
@@ -28,7 +28,7 @@ RDEPEND="${ADA_DEPS}
 	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/libadalang-tools-23:=[${ADA_USEDEP}]
 	dev-ada/libgpr:=[${ADA_USEDEP}]
 	dev-ada/prettier-ada:=[${ADA_USEDEP}]
 	dev-ada/spawn:=[${ADA_USEDEP},shared]
diff --git a/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
index 86fe1a1e4e1fc..cb5274b6a5066 100644
--- a/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
+++ b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="${ADADEPS}
 	dev-ada/libadalang:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]
-	dev-ada/libadalang-tools:${SLOT}[${ADA_USEDEP},shared,static-libs?,static-pic?]"
+	dev-ada/libadalang-tools:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]"
 BDEPEND="
 	dev-ada/gprbuild[${ADA_USEDEP}]
 	test? (
diff --git a/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r2.ebuild
similarity index 77%
rename from dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild
rename to dev-ada/libadalang-tools/libadalang-tools-25.0.0-r2.ebuild
index 8a53f3a76b12c..d34413aeeb6c4 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r1.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-25.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gcc_14 )
+ADA_COMPAT=( gcc_{14..15} )
 inherit ada multiprocessing
 
 DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
@@ -14,20 +14,28 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+shared static-libs static-pic test"
+IUSE="static-libs static-pic test"
 
-# Some test are not working
-RESTRICT="test"
-
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
+REQUIRED_USE="${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/templates-parser[${ADA_USEDEP},shared(+),static-libs?]
+	>=dev-ada/VSS-24.0.0[${ADA_USEDEP},shared,static-libs?,static-pic?]
 	dev-ada/libadalang:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?]"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="
+	dev-ada/gprbuild[${ADA_USEDEP}]
+	test? ( dev-ada/aunit[${ADA_USEDEP}] )
+"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+	rm -r testsuite/tests/metric/agg.RC12-009 || die
+	rm -r testsuite/tests/test/tc_json_dump_with_gen || die
+	rm -r testsuite/tests/pp/agg.P510-022 || die
+	rm -r testsuite/tests/stub/agg.S410-054 || die
+}
 
 src_compile() {
 	gprbuild -v -k -p -j$(makeopts_jobs) -XLIBRARY_TYPE=relocatable \
@@ -65,9 +73,10 @@ src_compile() {
 }
 
 src_test() {
-	GPR_PROJECT_PATH="${S}"/src/tgen/tgen_rts \
+	PATH="${S}/bin:${PATH}" \
+		GPR_PROJECT_PATH="${S}"/src/tgen/tgen_rts \
 		LIBRARY_TYPE=static \
-		testsuite/testsuite.py || die
+		testsuite/testsuite.py --jobs=1 || die
 }
 
 src_install() {
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
index 47a4f14f8778b..2caa1530dfcb0 100644
--- a/dev-ada/libadalang-tools/metadata.xml
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<upstream>