gentoo auto-resync : 19:03:2024 - 00:49:58

5 files changed, 90 insertions, 45 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 695c6ba19229..84eb2efdae6a 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
index 4070116cfafa..7c00549721d6 100644
--- a/dev-ada/VSS/Manifest
+++ b/dev-ada/VSS/Manifest
@@ -3,5 +3,5 @@ DIST VSS-23.0.0.tar.gz 481748 BLAKE2B eb84e1b84b2d3a463a0e19a3cdd8b6e1e0dd666f72
 DIST VSS-24.0.0.tar.gz 1116669 BLAKE2B 5f703b4bf5234b38485a3104bd4e32ce0b2666fa00e2808b9a03df5c28c11ca0ac95c655f5490dbd04f113ef2894b45f2795f87cbf297ffa07f85f5a4e7d4710 SHA512 2b77646a299c073535ab0a315a9950e2fc6d43375fa62e0cb2e93ed4094ee42994ad74747c8a3d16ade5473c5520926edd59e4422321398c5deb17c6aedb66ee
 EBUILD VSS-22.0.0-r2.ebuild 921 BLAKE2B 35c243f6c3b3db2dca87cdfcc7249c4ce56ae8e9ad6429f80b804b982e6335932ec06d121395ec90cb325aa937f1302bb0b6ddc303ce63cfb74e9537fde943d9 SHA512 7ca05726673e52c775ee8988525ae8d46fa99a7f36ec5ff539c2ff06f0a1a0facd690ba5aab1d86d00782d82a6133de7d08c009f6f249a6a39c67266c5993d68
 EBUILD VSS-23.0.0-r2.ebuild 1034 BLAKE2B ba594d0c05f51c56c642505cb260d5449af71b820cf38a29a8166651eaede9b0847e228289c251b3d887cdb45d6a664cee7c0a79d5f1aac71b33bf5d382047be SHA512 29fb68c4f4fa8b72521a7ea767c1aaca276a47ced9ab23ec9049dc808424c250f2114722868b844d835cff87d48da414055dce74a45e74354404cf88a632036e
-EBUILD VSS-24.0.0.ebuild 989 BLAKE2B f6d15cf0ce536ef3f7a25b73fb90a08fbe464b585fa9d55c3ce7cae4524b78f604b26ccb87b77cf617407c47b99d72253e8bb3547cba59ca054625ced571f613 SHA512 1e1f4a429be91fe8e02abf2ab8b96f3f7b79eaf9aaf51d639f79678b55dba8026188f6ad3a20549cb0bf23d51c3a18a1d87535bf272994af649238a07553e9ce
-MISC metadata.xml 292 BLAKE2B 5a618f9fd5bd6c227fb9c7a5c40c47ed72a314d5dbf2d5f93cb97a7c34236064ed43c4f874561e5e48b385c10eebb9d8a75f9916a722e5f460091738cf6e4679 SHA512 9440e2195e1500bb2edbb5cf4b800d211f6637749a2b5833d341409cfb11a854b0d18cb997e8ff4bfd1afbfb8d49b6f23957cf9b93bcaffd9bc0a60e7e8d8079
+EBUILD VSS-24.0.0-r1.ebuild 2231 BLAKE2B 3ae0236a43e8d1128e5b7fd6b196cea94f37cb4ffc07723dfa28c4d864dd0edf24e8af4f2acae289f17b5621948359c1224e43dd68a35976c4c3f1cfe2d8133b SHA512 6673685692707cfac1dd3da6aa6d344a67dc45a355684d63dff4787785bb4b57efffc6f03a7880783a5b8d99f93975319c85d7fdf867863c48c2e2970523d3f9
+MISC metadata.xml 425 BLAKE2B e23422badd5f393a4dd2829ce9372e6393523896ab5199e2a9c339aabb8eca12c45d0bd8becf9c23ca47929d7f1f37982d86c104855169b17816d37e9dbd43a5 SHA512 5fed9ed285d559f2424060a9f88d3174e99b5e1ab3623da0d060f8a8a6da03a07f5eafe1ca6cf6934c52f3d22cdd32cb2720ee51e0a1fd33a4848e085b99bc08
diff --git a/dev-ada/VSS/VSS-24.0.0-r1.ebuild b/dev-ada/VSS/VSS-24.0.0-r1.ebuild
new file mode 100644
index 000000000000..5837246d67bc
--- /dev/null
+++ b/dev-ada/VSS/VSS-24.0.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2021-2024 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 high level string and text processing library"
+HOMEPAGE="https://github.com/AdaCore/VSS"
+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="+shared static-libs static-pic test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+	test? (
+		app-i18n/unicode-data
+	)"
+
+src_prepare() {
+	ln -sf /usr/share/unicode-data data/ucd || die
+	default
+}
+
+src_compile() {
+	build () {
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_gnat.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_text.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_json.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_regexp.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_xml.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -p -j$(makeopts_jobs) -v \
+			gnat/vss_xml_templates.gpr \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -XVSS_LIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 -p \
+			-j$(makeopts_jobs) -v gnat/vss_xml_xmlada.gpr \
+			-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() {
+	emake -j1 GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v" build_tests
+	# To run all the test need to follow data/README.md
+	emake check_html
+}
+
+src_install() {
+	build () {
+		emake -j1 DESTDIR="${D}" install-libs-$1
+	}
+	use shared && build relocatable
+	use static-libs && build static
+	use static-pic && build static-pic
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/VSS/VSS-24.0.0.ebuild b/dev-ada/VSS/VSS-24.0.0.ebuild
deleted file mode 100644
index c313680fa3e5..000000000000
--- a/dev-ada/VSS/VSS-24.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 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 high level string and text processing library"
-HOMEPAGE="https://github.com/AdaCore/VSS"
-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="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
-	test? (
-		app-i18n/unicode-data
-	)"
-
-src_prepare() {
-	mkdir data
-	ln -sf /usr/share/unicode-data data/ucd || die
-	default
-}
-
-src_compile() {
-	emake GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v"
-}
-
-src_test() {
-	emake -j1 GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v" build_tests
-	# To run all the test need to follow data/README.md
-	emake check_html
-}
diff --git a/dev-ada/VSS/metadata.xml b/dev-ada/VSS/metadata.xml
index 640859a7d0d5..6c54f03b5a01 100644
--- a/dev-ada/VSS/metadata.xml
+++ b/dev-ada/VSS/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<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>
 		<remote-id type="github">AdaCore/VSS</remote-id>
 	</upstream>