gentoo auto-resync : 03:01:2025 - 06:31:16

2 files changed, 13 insertions, 38 deletions

diff --git a/dev-ada/spawn/Manifest b/dev-ada/spawn/Manifest
index 7fff09ececb5..88b9b5eba45d 100644
--- a/dev-ada/spawn/Manifest
+++ b/dev-ada/spawn/Manifest
@@ -1,5 +1,5 @@
-DIST spawn-23.0.0.tar.gz 43449 BLAKE2B b4a025784d7fb1248696081c128d415101cffca59f03edae3e3ca05c286390ca93a34c1284d1e4b23f8e57bfff274b87d977e5b7840c74049f6f66be89c9b9ac SHA512 440f8b8a45b7a322a5715a195f7e37e6f2641af8190166229e89a11ce6ab60511eb058432f4c3ffcdd670ec71b2509d5e23a80ac2e8dd6b7960bc42385bab86e
 DIST spawn-24.0.0.tar.gz 66727 BLAKE2B 12da7485b27ff75ce75efbbe4e9c71542faf2c283f843cc903530b9e8829f86e3ea1aff73f8f9efb80fd9924c695039456f3b63ff6d635161ed8b33daeb2da88 SHA512 948bcaa7963d79f7a42fe05c80586bce669b7ff01bb756c087f237b35892956d2ababc274e594e9bda82a8c70fbb62c9ca199161176c87ed3ff42f9e7bc78ea9
-EBUILD spawn-23.0.0-r3.ebuild 2703 BLAKE2B f3f6d9d82d80ff8aba19f64b537239aa7379cbc0de6ffe89cd5daf455d362504d426457495037fc1e6886ae5549cc38920e70948c538cf6200bcb43c768d9a28 SHA512 c69e452e433647f6d9f065e3eeeb43431c636f85abc6e16e2b2968bb86b0bd38a3ba8be358b98ed24c7cdcffa512642a7f8d09a9841ca610cf59ae965126140b
+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 1973 BLAKE2B 19e4bb90fcb488061144a68a660cd87a358471eef614276b25451ec849714dbf976f8d64ac4efde0ea879af46df7e00278fbbe9eb52dddd352543f2790afe2d6 SHA512 28b8606e0642ae852507e4f14d7b4572fa75bb81097a4fce67e981958d58c9ce2d804216928363f53e5944782e59f0c7c3a2177c63085fc51b7bce894b58cc38
 MISC metadata.xml 757 BLAKE2B ab129603cda705c21f84a789cd100d39186e06885589089320dfcfc0726cc913ad73784fd35e541ee0773c93e89bbd42965897b9bd921008cdc0fbdaffdaf64f SHA512 6124d3eecafe758ca841715bcead3b8d35d9af7bafeea8a967910156043c30b1902a521e7cf37c0a61283859797dc364580f2b84f6b597adeb81c25c98f3f9d2
diff --git a/dev-ada/spawn/spawn-23.0.0-r3.ebuild b/dev-ada/spawn/spawn-25.0.0.ebuild
index deeae8222886..023d363a4087 100644
--- a/dev-ada/spawn/spawn-23.0.0-r3.ebuild
+++ b/dev-ada/spawn/spawn-25.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,15 +14,11 @@ 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 ~x86"
-IUSE="glib +shared static-libs static-pic"
+IUSE="+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
-)"
+RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
 
@@ -31,12 +27,6 @@ src_compile() {
 		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
@@ -51,16 +41,11 @@ src_compile() {
 
 src_test() {
 	build () {
+		GPR_PROJECT_PATH=gnat \
 		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 \
-			gnat/spawn_tests.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+			-XLIBRARY_TYPE=$1 gnat/tests/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
@@ -71,30 +56,20 @@ src_test() {
 	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
-	if use glib; then
-		.obj/spawn_test/spawn_glib_test || die
-		.obj/spawn_test/spawn_glib_args_test.exe || die
-	fi
+	.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/lib/spawn \
+			--lib-subdir="${D}"/usr/$(get_libdir)/spawn \
 			--project-subdir="${D}"/usr/share/gpr \
-			--link-lib-subdir="${D}"/usr/lib/ -p \
+			--link-lib-subdir="${D}"/usr/$(get_libdir)/ -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