gentoo resync : 15.06.2021

4 files changed, 100 insertions, 32 deletions

diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 45cf62a51bc3..dc7bb90602cf 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,6 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
-EBUILD gnatcoll-bindings-2020-r1.ebuild 2506 BLAKE2B c0aa82783dbd0b785b95b36fbea6539cb19f5e45111db21210946234a8e3e917185dfde3c656635aab0ce4c954ebae18b50c260c5cf81246328a1129995b7a35 SHA512 e512511eee059ff26586120e063cdd5e20c8fe4022cf7e19ab2f324144a4e899fdf0ed66e3a9a3d379108cbdd6ef81c2b8b9b21b2f62192bca0caebaa16ea48e
-EBUILD gnatcoll-bindings-2020-r2.ebuild 2518 BLAKE2B 24be5efd551ffd6411238e638d334e8ba9b05ea196df49daa0c21d7cf19be2060478ab0484a436da780a6f86e41b584ca9fa828755d000210232f74e23027b11 SHA512 724c79f89928f16a9629c85532e2a3ab23c44a770136caf14b64e2ea9218b343d8121d2222edcf971e466110231ee3f3f99dcdd6386faaa0e204dd76a0fbfce3
+DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
+EBUILD gnatcoll-bindings-2020-r1.ebuild 1941 BLAKE2B 7a536cbeb74cc777d1313a6028c2459f73434eddc0419855ebab884b044cf17e724a5e97f590747e4ab5b10b306a8cbb95330adb0c15b839a063bb561089c0ff SHA512 48f4943ac35909e1b556054e1f4c69dca023f1e9123ed3fc0b20add8c7226b77a0498c63476bb5dd4a53e5190d6bb44353142adcbe03e98ede95c1db0d7c68f4
+EBUILD gnatcoll-bindings-2020-r2.ebuild 1958 BLAKE2B 151ab89cf5c6e0aacbf92c36be997727f6be69dd21a8079ae3023ca5911276b7545469872d952df2a0c88e4b838341e0dcc92533e7840f9ed3fa523e9c47c23b SHA512 c77a376be1e52ff62ca6a13e90d3054dfc61b02c651907e8e0daae7399a843e237df97f6438f50f74f365227404afb0d44d7a47702d63b3844594a9660c7aa5a
+EBUILD gnatcoll-bindings-2021.ebuild 2393 BLAKE2B 0b03e3a3c03399d44a5bda6ecf567eb37dcc1269cbfdc5b8220f19afd6e76f639e840a44d5b57f69d004baad33b2f5b88de9cc55cb5859c62c4e8ca6cee3c216 SHA512 eeca43fb2eeef35799db40c7ede79b8a7e526f3029195feafbc590a276ec7859f0f1317deced23f63028f20f2d5dba9e0f312d51ff95ec086b46bf49cd62e4bf
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
index 742e2f983a43..8f47cc46b77a 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multilib multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@ SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 IUSE="gmp iconv readline +shared static-libs static-pic syslog"
 
-#RDEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-pkg_setup() {
-#	use python && python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
 			-XGNATCOLL_ICONV_OPT= \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-#			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-#			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 	}
 	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 python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
index 52cb19c29ba6..e1b4a17dd43c 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multilib multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@ SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 IUSE="gmp iconv readline +shared static-libs static-pic syslog"
 
-#RDEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-pkg_setup() {
-#	use python && python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
 			-XGNATCOLL_ICONV_OPT= \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-#			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-#			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 	}
 	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 python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
new file mode 100644
index 000000000000..d8d413bfabdd
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+inherit ada multilib multiprocessing python-single-r1
+
+MYP=${P}-${PV}0518-19B15-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=d93655ced17f15c5f376b6861825df3f9c183980
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	${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="python? ( ${PYTHON_REQUIRED_USE} )
+	${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -rf 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_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 python 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 python 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
+}