gentoo resync : 31.05.2021

3 files changed, 81 insertions, 6 deletions

diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index df8c3f856a17..601111f861c9 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,4 +1,5 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
-EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B d7593e3a7c2ac7a5abbed1ad802872029f6cb374cb12ec5d04bd42c8d2efb5fb91a72b37b70d79a28f81e5f859e07ea273917ac5a317aef741e696fc7ed41339 SHA512 05f9861d9177680df0a5ad5994346e3c7890c45ca4f8ca2d4adc027281f3952a0929b4a8d782d10c2e4d5bf7c5b94a218dc74debe15851bce426cc385a8591bc
+EBUILD gnatcoll-core-2020-r1.ebuild 1593 BLAKE2B da80c0c82eff855c4e23ca065060f8091945975c4c8f870d9e28cadb6bc55ee5e29734e266e09e63e3d1b74fd4dbaacc8cdc79d6901796cf5c511299205e1330 SHA512 902bfb478ace279361a6cf5fd26e54bcb970e7a3423e78ce76f556ad154dd24b2848b37afe9216c41c7eeee224d2f92ed2102df1a8f0b506332d119f4bb82ad0
+EBUILD gnatcoll-core-2020.ebuild 1581 BLAKE2B aad248cbaa6d35738712d5e1e6d41570ead7f105bce57a7e0f46e7c3cf46b3c0211e473f6e8c7c54e0a43c7150133fd67786cb42f2c615bb8df5ab47cac8104d SHA512 af18eea52f77537b4e59e62b11752b47400675cb422024c61d9e528640e99e73e5246b044566a3b35d014d55f70d48613f1172d38862598bb91b8a4b4e9223e2
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
new file mode 100644
index 000000000000..625f0692fdc0
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
+inherit ada multiprocessing
+
+MYP=${P}-20200429-19B7C
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=${MYP}-src.tar.gz
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="
+	>=dev-ada/libgpr-2020[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		build static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake prefix="${D}"/usr install-relocatable
+	fi
+	if use static-pic; then
+		emake prefix="${D}"/usr install-static-pic
+	fi
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index 40b7c90fb6f8..142bfee53528 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_configure() {
-	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
+	emake setup
 }
 
 src_compile() {
@@ -61,13 +61,13 @@ src_compile() {
 
 src_install() {
 	if use shared; then
-		emake install-relocatable
+		emake prefix="${D}"/usr install-relocatable
 	fi
 	if use static-pic; then
-		emake install-static-pic
+		emake prefix="${D}"/usr install-static-pic
 	fi
 	if use static-libs; then
-		emake install-static
+		emake prefix="${D}"/usr install-static
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs