gentoo resync : 05.12.2021

3 files changed, 15 insertions, 89 deletions

diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 094b2e397b38..f37b11b9d802 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,6 @@
 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
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
-EBUILD gnatcoll-core-2020-r1.ebuild 1585 BLAKE2B 835b0e6f2dae3a73e4d18554a606c40c088810346df1a5116155c8da39afeb6ffb7ab3815d7223a919e90e34a7ffe9b0557adf9cf13ed36e4dfc4d0916da4f62 SHA512 77a55cb51bd96e189e6abbd9ccc90d1d9dfb0301083539a71969525da9d056e7043a3c36573a8292abf552e625d6c7a08b33789a615fad965c4580ef35a2f44b
-EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B 4e2332ec87600073b8aa9b513d4e1534cd00af5dff7315b845d5b28dc9bc1bd142c7a482a916760ed7848746990f3e03d404327821202bd0aec3c91c541efcdd SHA512 9c5d122937bb63179482f61c0c2dd53e657316506ebd6eaedc4ecbc4122e015af944461957b127eba25ae21f91881b1d217792e36edbbb4e72ea7d2cdf979b6c
+DIST gnatcoll-core-22.0.0.tar.gz 722642 BLAKE2B e9bc6b322866b086f080096457936f66925cb954533acc04265b1e4c7081fe65d420fbc841b9ad5f4932eb43848803c1bf78a37a6fc47c1ac9d30bbb8eb2e0c9 SHA512 ce3aaa90b339a57eedc070e6451ea8782a87d07ece09823c57179a5e44762349458564bf8d007427a7aba795bc05d744056e3defd6b44698bcc0a8af0c5285e9
 EBUILD gnatcoll-core-2021-r1.ebuild 1704 BLAKE2B 97467428c37b61dc0546b8dd9885156492ad404cd7c4b7fc63fd25403174f0bae37103da809bddcdc3fa796deb9bbb363587a486f7353c09bc2a331ed5daa680 SHA512 78e5b08df25c8bfd8c60e8dcbdc7c13f0e6b2f00ba21731723678d28ff1bd5b4488ac24350f5a9efe17341ea2d7b388551b022d7cc6fb77cc068bb175f54d85a
+EBUILD gnatcoll-core-22.0.0.ebuild 1635 BLAKE2B 32321a3423dd622e7661847a11765f2432fdef469c5dd3a2b0c3c35add9ba54ee3863dbb197ab87ee4eaa571bf3a41c82a28dfadcd80d4dc3b382e982471f241 SHA512 5ab6a31c1160eb1f129c2d2ca3792ee9961582113df6b733d386e833770591acf76fd4bdcfe2ad469b1a6cc8fe5d1ad575701f8da2f9e337bc66e4e7165dda23
 MISC metadata.xml 1096 BLAKE2B 138ba19dde84f957c6494fc1971672c8adc96feb4af484296aae720aa860132b0b709a9e5fc8ae8d391604dd8fd0c8d3f34fb11e836629a837463d311c68f677 SHA512 3bfb17c3531f6c3f66047534316bbb906214067208695b2e61594649f51842de82e6f2340d59acb2da9d8ac401cfcf95f8e9326b5ab07db5f794a4fe7a4898a7
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
deleted file mode 100644
index 6599a50b8f7b..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ADA_COMPAT=( gnat_2019 )
-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-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
index 11d0ca89579c..58f464be487e 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
@@ -2,31 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_2019 gnat_2020 )
+ADA_COMPAT=( gnat_202{0..1} )
 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"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
-	>=dev-ada/libgpr-2020[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	|| (
+		>=dev-ada/libgpr-2021
+		~dev-ada/libgpr-22.0.0
+	)
+	dev-ada/libgpr:=[${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() {
@@ -60,14 +60,15 @@ src_compile() {
 }
 
 src_install() {
+	local GNATCOLL_VERSION=${PV}
 	if use shared; then
-		emake prefix="${D}"/usr install-relocatable
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-relocatable
 	fi
 	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static-pic
 	fi
 	if use static-libs; then
-		emake prefix="${D}"/usr install-static
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs