gentoo resync : 05.12.2021

4 files changed, 40 insertions, 99 deletions

diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 3c29a4d2e0c9..14b16375253a 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,5 @@
-DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
-EBUILD gnatcoll-bindings-2020-r1.ebuild 1927 BLAKE2B a51c29508961f0d088352e5e873f09db02049e9918bf98ada681bcf2ca70c23bf936120c2c603f63194ad9803d308e6f13948d446983f525f91b6dda71e290a8 SHA512 cbd7bd02d2489450f1d92315f6d514c5ed31df442b54603055694095e55977fbe4c4433574efcf748c904443ab6fd9769a419e0e2a873c067cf80ee319f6f82b
-EBUILD gnatcoll-bindings-2020-r2.ebuild 1944 BLAKE2B 9dba24ec94b42ae34d4170b37d6b08de7da200cbb1e37ff29de0fe8f3947f265485a861cbf9e9a684128da4064907ece4bb7aedceaccac8dd52d60719ce611d2 SHA512 dbed3391c529efb37cd321a7d97cec5f01af7708ab6595c4c28e47143af493cacfc2e48b5525dca31f27a2b5fc0a2d6fadadb11c7a7b614b6a326dae8f632033
-EBUILD gnatcoll-bindings-2021.ebuild 2378 BLAKE2B 2bb0f2e36a966a0c9976602318e6f232cbf50395adeaad7b192284572a9bda179de4389c86f120c7073167f07bbc33ea58d1daed47149163b0bb366998c593fa SHA512 554d34fc258f86960cf79d173bedd3280876d21957b3f1df5d39159f04ab8c852f7f9f58bb7246cb2c572e4f3f75f64da3fe03f265b0f623342a3bdc2867f813
+DIST gnatcoll-bindings-22.0.0.tar.gz 243040 BLAKE2B f6577e6d31362b59ac2bdb8c70772e6783d88f192f63e335082140d143d17be15bb62143174217b2e823e6183e5148725c1d12e4b00c3cc0abfacf3a279d30df SHA512 b8f4184f0992057ea33350e30e007859c5ef3e028d7604c47ae160f3c2ffcc828187ed9c9c3de7c6d2b7b16274714822460dc09d687386035d2773df45e90bf2
+EBUILD gnatcoll-bindings-2021.ebuild 2368 BLAKE2B 06fca9537d21a032cd28fd9ff720443ee57c7d6dfb90180b5b03ca36f95e98e9cd8b8b5a65bfd32304878ba75bfa6aa3449f6043fa84dc2ce65658205798e798 SHA512 51a7f1b86302f3f65c8c3ba4374d709c11fd641540c561f2410c74b8cde3fd0a513fce01b56d1993fee694901231ab60df0c0504d63f844a1a915513b4562f6a
+EBUILD gnatcoll-bindings-22.0.0.ebuild 2485 BLAKE2B a16cb572d954fc46cf029a6150b3ae6b1d7b3ba838956af985862c8af2edfa2d83f3a52721b7cf529a4fdd8e2401ad65dc4b7fc56e9634d5533828816a0ebb10 SHA512 0edef42f78e9694a65c172c4da9562cff2dd5c79f22e98e4d859b4746e2a1027c2e4220efa763c9a5c249a147fd66c432afd12534407a7d0c70f7abee3ea58f5
 MISC metadata.xml 1082 BLAKE2B 81d44f46969b4ebfeb13a2ddfbe086a0b9d59087869dbd5cbda17d923c16d2f6be0f3abe147311e477c6cac66a18b1ea8e41511e289f251ed4029871aeebdefd SHA512 f644094d9fd65a65495dcedb3b6b442193b243aa09a6f893d83ee342623a9e758449fa792470963860db0d24db37fa1304396727c664bcfcbd78238a0391f0f4
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
deleted file mode 100644
index 1b70824a09bf..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ /dev/null
@@ -1,79 +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=${PN}-20.0-20191009-1B2EA
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=${MYP}-src.tar.gz
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp iconv readline +shared static-libs static-pic syslog"
-
-RDEPEND="
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="
-	${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index f563b4f9ac7b..e232eb02e6d5 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing python-single-r1
 
 MYP=${P}-${PV}0518-19B15-src
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
index 5ebbb4aed05c..0e7007193e78 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
@@ -3,50 +3,67 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${PN}-20.0-20191009-1B2EA
+PYTHON_COMPAT=( python3_{7..9} )
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing python-single-r1
 
 DESCRIPTION="GNAT Component Collection"
 HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?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="gmp iconv readline +shared static-libs static-pic syslog"
+IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
 
-RDEPEND="
+RDEPEND="python? ( ${PYTHON_DEPS} )
 	${ADA_DEPS}
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )
+	lzma? ( app-arch/xz-utils )
+	openmp? ( dev-lang/gnat-gpl:=[openmp] )
+	"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}-src
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -r python || die
+	mv python3 python || die
+	default
+}
 
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_VERSION=${PV} \
 			-XGNATCOLL_ICONV_OPT= \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
+			for dir in gmp iconv lzma python readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
 			done
+			if use openmp; then
+				build omp $lib
+			fi
 		fi
 	done
 }
@@ -55,17 +72,21 @@ src_install() {
 	build () {
 		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_VERSION=${PV} \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
+			for dir in gmp iconv lzma python readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
 			done
+			if use openmp; then
+				build omp $lib
+			fi
 		fi
 	done
 	if use iconv; then