Updating liguros repo21.1.2

2 files changed, 26 insertions, 26 deletions

diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r2.ebuild
index 82c15f342e0e..231193a2a992 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 python3_{6,7,8,9,10} )
 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 589b8a728ace..198d612ce220 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 python3_{6,7,8,9,10} )
+#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