gentoo resync : 22.12.2021

3 files changed, 18 insertions, 26 deletions

diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 14b16375253a..fb31d4bf0d83 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
 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
+EBUILD gnatcoll-bindings-2021.ebuild 2254 BLAKE2B 86f295e0a2174d8c904ae4804891485fb78a473e64e14dc45c4c883f4a27b04e1253739fc7f524b1e17adce9013bd989d87ebdd9afa404d82306945f0fc3f0ef SHA512 c3db61663a7c0706ffa3b29651a3e13fe4d6ee1f4fe87afd433cd42bac49c1e923b1038492bcf75f4ba6138b52d8e6763dc71b7b8bfced9907b16a28ddcb7cab
+EBUILD gnatcoll-bindings-22.0.0-r1.ebuild 2471 BLAKE2B 7566ee61ad046ab8034ea281abebab1f1912cf3857825574328d736b9388c0a4e3aab275dd1905689e029b0fd419e17c160db3c3f7549f70e28b4f1f8fc95ca6 SHA512 0a4253a1723d462820ea89048c4cc3343805cbfa5a8c43c9b84f16aa8fc8df71ec5a032362521bf34f922503d8dc2e60c2e5f7abeddb727f7d4f5d8ffe606512
 MISC metadata.xml 1082 BLAKE2B 81d44f46969b4ebfeb13a2ddfbe086a0b9d59087869dbd5cbda17d923c16d2f6be0f3abe147311e477c6cac66a18b1ea8e41511e289f251ed4029871aeebdefd SHA512 f644094d9fd65a65495dcedb3b6b442193b243aa09a6f893d83ee342623a9e758449fa792470963860db0d24db37fa1304396727c664bcfcbd78238a0391f0f4
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index e232eb02e6d5..b37ed6806642 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -17,23 +17,25 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="${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} )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
 
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
+
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 	ada_pkg_setup
 }
 
@@ -48,7 +50,6 @@ 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_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"
@@ -70,6 +71,7 @@ src_install() {
 	build () {
 		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			--build-var=LIBRARY_TYPE \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
@@ -83,12 +85,6 @@ src_install() {
 			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
+	rm -rf "${D}"/usr/share/gpr/manifests
 	einstalldocs
 }
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
index 0e7007193e78..2f979894c8c7 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
@@ -16,8 +16,12 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	|| ( gmp iconv lzma openmp python readline syslog )
+	${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="${PYTHON_DEPS}
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )
@@ -27,8 +31,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	${ADA_REQUIRED_USE}"
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -47,7 +50,6 @@ src_compile() {
 			-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"
@@ -72,7 +74,7 @@ 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_VERSION=${PV} --build-var=LIBRARY_TYPE \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
@@ -89,12 +91,6 @@ src_install() {
 			fi
 		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
+	rm -rf "${D}"/usr/share/gpr/manifests
 	einstalldocs
 }