[gentoo-commits] repo/gentoo:master commit in: dev-ada/ada_language_server/, dev-ada/spawn/

[gentoo-commits] repo/gentoo:master commit in: dev-ada/ada_language_server/, dev-ada/spawn/

[Alfredo Tupone]

commit:     c90933cbfdf07ac78b85740ab85de2aa6163e7c3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 20:21:20 2025 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat May 10 21:01:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90933cb

dev-ada/spawn: support gcc:15

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../ada_language_server-25.0.20241014-r2.ebuild    |  2 +-
 dev-ada/spawn/metadata.xml                         |  1 -
 ...awn-25.0.0-r1.ebuild => spawn-25.0.0-r2.ebuild} | 39 ++++++----------------
 3 files changed, 11 insertions(+), 31 deletions(-)

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 62a4915abf05..f0f859ca771c 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
@@ -31,7 +31,7 @@ RDEPEND="${ADA_DEPS}
 	>=dev-ada/libadalang-tools-23:=[${ADA_USEDEP}]
 	dev-ada/libgpr:=[${ADA_USEDEP}]
 	dev-ada/prettier-ada:=[${ADA_USEDEP}]
-	dev-ada/spawn:=[${ADA_USEDEP},shared]
+	dev-ada/spawn:=[${ADA_USEDEP}]
 	dev-ada/templates-parser:=[${ADA_USEDEP},shared(+)]
 	>=dev-ada/VSS-25.0.0:=[${ADA_USEDEP},shared]
 	dev-ada/xmlada:=[${ADA_USEDEP},shared]

diff --git a/dev-ada/spawn/metadata.xml b/dev-ada/spawn/metadata.xml
index 7ff3ada41924..1567756f4cf4 100644
--- a/dev-ada/spawn/metadata.xml
+++ b/dev-ada/spawn/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>
 	<longdescription lang="en">

diff --git a/dev-ada/spawn/spawn-25.0.0-r1.ebuild b/dev-ada/spawn/spawn-25.0.0-r2.ebuild
similarity index 71%
rename from dev-ada/spawn/spawn-25.0.0-r1.ebuild
rename to dev-ada/spawn/spawn-25.0.0-r2.ebuild
index 3e068be9b3c2..c4bc1ce93db5 100644
--- a/dev-ada/spawn/spawn-25.0.0-r1.ebuild
+++ b/dev-ada/spawn/spawn-25.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+ADA_COMPAT=( gcc_{12..15} )
 inherit ada multiprocessing
 
 DESCRIPTION="Simple API to spawn processes"
@@ -14,9 +14,8 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.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}"
+IUSE="static-libs static-pic"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}"
@@ -28,15 +27,9 @@ src_compile() {
 			-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
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
 }
 
 src_test() {
@@ -47,13 +40,7 @@ src_test() {
 			-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
+	build relocatable
 	.obj/spawn_test/spawn_test || die
 	.obj/spawn_test/spawn_unexpected || die
 	.obj/spawn_test/wait_all || die
@@ -71,13 +58,7 @@ src_install() {
 			--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
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
 }