gentoo new year resync : 01.01.2021

4 files changed, 28 insertions, 28 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index d54b9e21b891..fc36a624f3e8 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 3560974dfa07..4053c3b889a7 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
-EBUILD gnatcoll-bindings-2019-r1.ebuild 2183 BLAKE2B 0406c1a302581dacd187b74cdf44ae71623ffc41426ad8bf15373bc84ac854be225490ababea7bdf5f22055ba94398fde7b9af5e3de552500f29f23d09de0e2a SHA512 da2e5688800c07c427918cdb67b0fb3f531751eae2d1f65c7a7e82c228184f7bab5d50af3d39937cf43cd8921c20099bc7bb834883fa0c849e2c5d73047e3405
-EBUILD gnatcoll-bindings-2020.ebuild 2253 BLAKE2B 00ec0729f977a952d5c604c40478a44ed72584b84e6451274f12ecb5f8e17149dd69f2c47acf6237c842f4639255555adcc4214a361126cfb9a61da81c3465be SHA512 f46488f353a16f20b2a011da201bef22e7c7b6e17fee7e92e5bc5dbb985778c2a39f1148b230d21ab9f871eba036e0cd1a19d552f0bcab7188cfae560c3ce832
+EBUILD gnatcoll-bindings-2019-r2.ebuild 1888 BLAKE2B 1d4d0541e7d59e56ae1fca30d991038b186c4af0b7e2116395ca2dfbc400596866967010561a93a0c9adfe5e771b1e32368fa9523ca8676845a84236c5218e41 SHA512 73426849293a22ecdba9bab4672a5b81e2df83fb1908df22e2d4e0ad2beb2fca88c8b451c6679e09297a43fc219dac11bad03374f7a08776d190e45acc221104
+EBUILD gnatcoll-bindings-2020-r1.ebuild 2506 BLAKE2B c0aa82783dbd0b785b95b36fbea6539cb19f5e45111db21210946234a8e3e917185dfde3c656635aab0ce4c954ebae18b50c260c5cf81246328a1129995b7a35 SHA512 e512511eee059ff26586120e063cdd5e20c8fe4022cf7e19ab2f324144a4e899fdf0ed66e3a9a3d379108cbdd6ef81c2b8b9b21b2f62192bca0caebaa16ea48e
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r2.ebuild
index fae30e62e54a..e4563f2e5c14 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
 ADA_COMPAT=( gnat_201{6,7,8,9} )
-inherit ada multilib multiprocessing python-single-r1
+inherit ada multilib multiprocessing
 
 MYP=${P}-20190430-1928C
 
@@ -17,39 +16,33 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054
 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?]
 	gmp? ( dev-libs/gmp:* )"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
 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_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-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 python readline syslog ; do
+			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
@@ -68,7 +61,7 @@ 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
 				fi
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
index 0f52f08c86cb..742e2f983a43 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+#PYTHON_COMPAT=( python2_7 )
 ADA_COMPAT=( gnat_201{6,7,8,9} )
-inherit ada multilib multiprocessing python-single-r1
+#inherit ada multilib multiprocessing python-single-r1
+inherit ada multilib multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
 
@@ -17,22 +18,25 @@ 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 python readline +shared static-libs static-pic syslog"
+IUSE="gmp iconv readline +shared static-libs static-pic syslog"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+#RDEPEND="python? ( ${PYTHON_DEPS} )
+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="python? ( ${PYTHON_REQUIRED_USE} )
+#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+#	use python && python-single-r1_pkg_setup
 	ada_pkg_setup
 }
 
@@ -41,15 +45,17 @@ src_compile() {
 		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_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-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 python readline syslog ; do
+			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
@@ -68,7 +74,8 @@ 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 python readline syslog ; do
+			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi