gentoo auto-resync : 15:04:2023 - 23:49:14

5 files changed, 62 insertions, 41 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 99363fff1b6f..086120f4cbf8 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gpr-unit-provider/Manifest b/dev-ada/gpr-unit-provider/Manifest
index 63024ae4bb47..3986f9d50ccc 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-r1.ebuild 843 BLAKE2B 3f5cc7f04ab9f10a1c0c94e69d78e25db374bab894a55295336a53f1216977fc26831f1b9d09710f87f8fb7096683c292c1ffb5bd76429804305f610950e6aea SHA512 e6a9afb2cc274ac0a59401f562cd3310c3879f557c056cf1d8647abbf8c6ce9298217fbe6ae767705e49a050e1b284733c5524e388124bea20f933127e91df29
-MISC metadata.xml 371 BLAKE2B 156ea654503bd3b01575f362111c4d6c14bdc5f5cccf9e50fcebf8506bf868cf4a4affd08714eab0a944393aa0c11ed3a2f0fe37fc313f9c50a47878238fd894 SHA512 9feb31be18599c694567a2f0912cf7e87e84309c65e3dc1bab32a84f70bbd15a22ab2e518ca24ae8eb55b944e4c6f4edc0543cb65ff5dfd408df97a44226ab83
+EBUILD gpr-unit-provider-23.0.0-r2.ebuild 1306 BLAKE2B 3282b9b93acef2c25f901c43679c398b73abef31934c355d65c84eeb983711cee13a8818310c8b6d9e48639afec322e340f5a7b2b751328c84b89675bafef563 SHA512 752d30a1e264308faadf68792362c9ebee04c34ffa6f8b345ac5115f244f54c0398b2d9c45a0d19519700d681a4342cdd74e751d089a8adec56fc01219ecfc55
+MISC metadata.xml 439 BLAKE2B 191b42cabbc540251ad99a291f5f4d75f26fcdb8ef4cb8a17918c274f6f70ddbf18a9c92682d281cd4dac1d90b48d4aa32ff89a7af45b1015c6244ee6b261834 SHA512 3b7a06a8027d700155055aa16bb07c713332a211c36e18c04663c0e5e589f406ff96d6ddc7ac9f2c3a4a598eec1dadb94b3b5728cff51046a9ac391d4e6b8f86
diff --git a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r1.ebuild b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r1.ebuild
deleted file mode 100644
index 4219750d6ce5..000000000000
--- a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-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"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/gpr[${ADA_USEDEP},shared?]
-	dev-ada/libadalang[${ADA_USEDEP},static-libs]
-	shared? ( dev-ada/libadalang[static-pic] )"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-IUSE="+shared"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		ENABLE_SHARED=$(usex shared) \
-		GPRBUILD_OPTIONS=-v
-}
-
-src_install() {
-	emake ENABLE_SHARED=$(usex shared) \
-		prefix="${D}"/usr \
-		install
-	einstalldocs
-}
diff --git a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r2.ebuild b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r2.ebuild
new file mode 100644
index 000000000000..2e1af4e2ac0d
--- /dev/null
+++ b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 )
+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() {
+	if use static-libs; then
+		emake PROCESSORS=$(makeopts_jobs) \
+			GPRBUILD_OPTIONS=-v \
+			build-static
+	fi
+	if use shared; then
+		emake PROCESSORS=$(makeopts_jobs) \
+			GPRBUILD_OPTIONS=-v \
+			build-relocatable
+	fi
+	if use static-pic; then
+		emake PROCESSORS=$(makeopts_jobs) \
+			GPRBUILD_OPTIONS=-v \
+			build-static-pic
+	fi
+}
+
+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/metadata.xml b/dev-ada/gpr-unit-provider/metadata.xml
index 650d892ed260..cc5ba27bd909 100644
--- a/dev-ada/gpr-unit-provider/metadata.xml
+++ b/dev-ada/gpr-unit-provider/metadata.xml
@@ -6,6 +6,7 @@
 	</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/gpr-unit-provider</remote-id>