gentoo resync : 15.06.2021

4 files changed, 81 insertions, 4 deletions

diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 601111f861c9..3b06ee72952c 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,5 +1,7 @@
 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-r1.ebuild 1593 BLAKE2B da80c0c82eff855c4e23ca065060f8091945975c4c8f870d9e28cadb6bc55ee5e29734e266e09e63e3d1b74fd4dbaacc8cdc79d6901796cf5c511299205e1330 SHA512 902bfb478ace279361a6cf5fd26e54bcb970e7a3423e78ce76f556ad154dd24b2848b37afe9216c41c7eeee224d2f92ed2102df1a8f0b506332d119f4bb82ad0
-EBUILD gnatcoll-core-2020.ebuild 1581 BLAKE2B aad248cbaa6d35738712d5e1e6d41570ead7f105bce57a7e0f46e7c3cf46b3c0211e473f6e8c7c54e0a43c7150133fd67786cb42f2c615bb8df5ab47cac8104d SHA512 af18eea52f77537b4e59e62b11752b47400675cb422024c61d9e528640e99e73e5246b044566a3b35d014d55f70d48613f1172d38862598bb91b8a4b4e9223e2
+DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
+EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B d91ea0e079e7c1d2d8c200a8c96bef3b3d157e6e8408b3f51e8c7a546389a186762939e3d5a9cb90c501441929fd50a2554774b30dfc3639aaa2ab19f1a70873 SHA512 b2b4c5df7f7eb3ca474963e1fb2ae793cf0a26b111e53c6fbf5a20df74f6d5c407e1742d6aecb66c8884f9f16a3b5c9c33b191df10b47de491d159243139b031
+EBUILD gnatcoll-core-2020.ebuild 1578 BLAKE2B 5481ee650d75cc3f963c0c8992c46133e5b9db29d95a850f915ae7183ee0c877e48e2247ab9e7a27cf80ad181557b64eadc3c71d3e4f1fd66005b90b61312f95 SHA512 310d4563b3f16f60a893ecfd4cf28cb2425b7d0c33c1b9402308c76876cd6f2dc0016cb4e1a3b74ec062ac7ad723ce4ff119dc9c16011dc2bd0469c4a294a7ee
+EBUILD gnatcoll-core-2021.ebuild 1612 BLAKE2B 430cd6214796df035571b64d1d8bab34b793f5bec0c4644cfcbb57c21f5d1d47b8ce6f8ef4c38f81b38b174a77cbe348c2e331bd82c5e6e9ce6f677887ba3265 SHA512 9676bb49b5734d1f4cfb8f03fd36dda97d27a3c8643d55e4ff2dbd706aded38ac5e8a645591c04c08bb99607d9a60308a88fa6577f91e8392e8385a18b67bc0f
 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
index 625f0692fdc0..1d815b25b355 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
+ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index 142bfee53528..da03ee877522 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
new file mode 100644
index 000000000000..37e4d267930d
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
@@ -0,0 +1,75 @@
+# 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
+
+MYP=${P}-${PV}0518-19ADF
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=425b044d5cb112f096c7ac5ebbafb0d8e5297913
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADAMIRROR}/${ID}?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-2021[${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
+}