gentoo resync : 04.01.2022

4 files changed, 75 insertions, 37 deletions

diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 75714f352d5b..1ddfb125a94e 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-tools-22.0.0.tar.gz 892619 BLAKE2B 5ba3cc91c0cd251ade396eda1d8de4244712905ef33ec9bb68a76ab20908d4034b78989dc051b2e47a2fd37e41ae49bf46b1459a74742205750c8a60697e27cc SHA512 c9028428379e68644dee140b76c6806b15561484bdc77a8c85c88c1ae4de512b6252f41b415fe767c5c7ae533fba1583e075620bd222a7be240d6cd1130d25bd
-EBUILD libadalang-tools-22.0.0.ebuild 819 BLAKE2B c8d6e1c8b5537468d1563e4d5e2ab83dfe0fdc29a618c3550f1357007565a49b6816bff54482eb11a37d00c692080c566e48b894fa64d88fb2f19ce002c6d155 SHA512 8bb1ab34b636c7aff693792efae32224fb19287cd90438d1310a7024c5ae5b0e972bc10688e877b21572910e96241bfefd2d215f2a8b8bd3b03ea4cc16dcdba5
-MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
+EBUILD libadalang-tools-22.0.0-r1.ebuild 1625 BLAKE2B ba195a9c92b03cfa2d0aad2b71f59399550b88103eabbd446076cd86be95ba7bf5158fa1c90249e57bf3bb3ecb837e83c71f23b36bc9649f6505ada9d588d444 SHA512 55d8187f205cc138b1d296a497970e1208b2bba732e32fc6423c0c296d973dc39239fafb1733ad02a8acb42465630d0f438f3238968a1cc6e6ce8981e1d81974
+MISC metadata.xml 348 BLAKE2B f7aa3a675cad33da94cc50308e9da7d9fc9735869d57897647174432aaa9001eec032fc69b1c658407811b447e2f744d3e96d063ab38e23a966910e168a08277 SHA512 8e81b66facb594ad30379533d8a2151483ef7890db64bb3235bb21577af188aa05cd413930b086d4f2b9fc2f3aeeffea70f887a145aed020733f59176e1c746d
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
new file mode 100644
index 000000000000..2b008feb5445
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+inherit ada multiprocessing
+
+DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+shared static-libs static-pic"
+
+RESTRICT="test"
+
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			-P src/lal_tools.gpr -p -j$(makeopts_jobs) \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			-XBUILD_MODE=prod -XLALTOOLS_SET=all \
+			-P src/build.gpr -p -j$(makeopts_jobs) \
+			-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_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			--prefix="${D}"/usr --sources-subdir=include/lal_tools \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=LAL_TOOLS_BUILD \
+			-P src/lal_tools.gpr -p -f || 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
+	dobin bin/gnat{metric,pp,stub,test}
+	einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
deleted file mode 100644
index 9f4a7cad4a24..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_202{0,1} )
-inherit ada multiprocessing
-
-DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/libadalang:=[${ADA_USEDEP},static-libs]"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	gprbuild -v -k -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
-		-XBUILD_MODE=dev -XLALTOOLS_SET=all -P src/build.gpr -p \
-		-j$(makeopts_jobs) || die
-}
-
-src_install() {
-	dobin bin/gnat{metric,pp,stub,test}
-	einstalldocs
-}
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
index d2615c1b0e0a..5d5e0fd45371 100644
--- a/dev-ada/libadalang-tools/metadata.xml
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -4,4 +4,8 @@
 	<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>
 </pkgmetadata>