gentoo Easter resync : 12.04.2020

6 files changed, 13 insertions, 56 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index f1f1399fab68..b6941504a76c 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -36,8 +36,8 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-EBUILD gnat-gpl-2016-r4.ebuild 4568 BLAKE2B 0b393f4fd60acae6bf0c735c364a60bee5897ca84875cbbcad0e9282473b454c6eb7ca0deb28db6c8c63adf1191d0be79820940fcda77fd89e7d9c01cd9b6fc2 SHA512 863bb4b5b4a961605d74cce3d5ea0864c1055d1bb32eaa825a1d79c89471152e9d668d23c387b580f1894d60afab6defa7c2196fdfdc9473e62183af555d6366
-EBUILD gnat-gpl-2017-r1.ebuild 4009 BLAKE2B 3b3db2ca06eac7fa1024d78e31e6aa134d7b932547d7b8fb6102a31ad0ad178b9913128451c79d38c6df924622f78d1c26c9f86c3fe765ce7abc55e7cbdbac84 SHA512 618a17058917ba227e52a26f21626e3ba2d2b3abae304d52719bcb10f1314c51efb7c350fc2c82b557e0aa071e59bffac638eede999587aecd5d1faf4745cbc0
-EBUILD gnat-gpl-2018-r3.ebuild 4019 BLAKE2B 3a58368ea3baa6e29f03037d9d3f5865e130315b803432deb3be852dc00ea0e6c02f89387e2ecaa92cc93bd4cf4ca308c47a17f703bc66bd25584c2dec32f9df SHA512 303dcd36a49c2c5d68e80b116f668242ee1f78ede06d8586f3b39eed85ee514ba5ad5d5aadd95a80e8a554e9876137899b3e8bb558ba32a5607882e9b95180e9
-EBUILD gnat-gpl-2019-r1.ebuild 3873 BLAKE2B 8dd0490473434d5b839c8470bfe0107cc19272a0d05d27f0a26f13126c12f85ca3d7df33b076f5d20daf52fdb3db8f4c265622719257214c9ce065f580716cbc SHA512 0dcdd38fba83cf2fd93931a58e509e8cbce4f63168c221e3c4189b994ea2b496610626f5e036eea9273f99beb3fa3106e975d8207a946da7178c33d4b7d2a904
-MISC metadata.xml 2152 BLAKE2B 31bff57d2fd31dd4586511ff401529e315e07eb28f857d2b48c6cbfc2ab1d4269deeb845d70c149c36eaf9d04767e4fab7671aab1b4d31b5c0581361a8ef7ebd SHA512 f16c1bd61c46551986d15a9941a334486092aa32a1e7e922e5d368e57c07ef32fd8ad4f9e14853882f7ad20afc1295062b2578b64d5e6fa4ce9dfd19847299b3
+EBUILD gnat-gpl-2016-r4.ebuild 4316 BLAKE2B 6188e89ac12051f44e9ba487950530ff6a9015b7df36eaca8d429841ee1073d52dac113881a0922fe132328c7ce73a8cd10367bc22a7ac881a5d9690b35d8c65 SHA512 6e21b8e192db5f904712c3c939596abd9c61ba4752fbf65284019a99da11f7c26768ad883692900334a92b62d9bb2872a2a0f70b14f5abab6fdca34e4cd6e89e
+EBUILD gnat-gpl-2017-r1.ebuild 3757 BLAKE2B cd57c0e594381937659b2d8d60b12022e0ffdb2aa2834011e03709c50a69fb9d9e995fab29ada2a65f81f4f548253ad664f1d6dac24f51f75f4ed10d38fdfa44 SHA512 d639e62c1d91ba72fce153acd95edba60e063204637a3df7c21adc0bc50b302c367b0f630e0aed05c41c281b78444fea986dbd4eae6b98984855eda7249805ac
+EBUILD gnat-gpl-2018-r3.ebuild 3767 BLAKE2B 720479ba962055058c5177c64f3a537e0a9ef035619eafbd7257494c82664759f4ac1b9f5980e2ca4e0c206791ba9c8435fba7ccf8ca48075bbf900b43e2a1bf SHA512 01604b11e918c547fe9d3f08ecb16c305b7f13d99d0843598de1609f33544db45393e3f012c1cad2a5ee2a4751ee93200bdd373e7fc5a574611d4930eae2915a
+EBUILD gnat-gpl-2019-r1.ebuild 3621 BLAKE2B c6abf8494e8b562b08c050dc16c982615c3284583a69ffe8c626a20a3911f35c2a931a7cde5b0987a4b2b3eff5148e1068607f93ed1429ab55d52d3ad251555f SHA512 a1e5407e3b0637b6c233b12129129de896344428860fa8f0de045715c243cc508f42e57cbb8ac380be0a889005081ae6a2646fac10f389e3cf2f9a9688f61191
+MISC metadata.xml 2217 BLAKE2B 3862fbb5ca8625a16c4031de574ff280c9aef0522dee6a8578615d5161daefaf636c8564cb4995e0096ff74728c9bb68e61af93c799c736c1f0fb69b34a4d1d3 SHA512 5880952bc0f2de368250178859059204fc527dd8e3b178ef689e5f1cebae90dd65840658afeda3f1ac18115ef6023b9ebea45a485e56dcfec719ce091f36c274
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
index 555b2df05631..b10bbb93de4e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
@@ -53,7 +53,7 @@ SRC_URI+="
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
 KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -145,22 +145,11 @@ src_prepare() {
 src_configure() {
 	downgrade_arch_flags "$(gcc-version)"
 	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada \
 		CC=${GCC} \
 		GNATBIND=${GNATBIND} \
 		GNATMAKE=yes
 }
 
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
-}
-
 pkg_postinst() {
 	toolchain_pkg_postinst
 	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index 8a6cf4555b8c..a0efa9b463c1 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -40,7 +40,7 @@ HOMEPAGE="http://libre.adacore.com/"
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
 KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -130,18 +130,7 @@ src_prepare() {
 src_configure() {
 	export PATH=${PWD}/bin:${PATH}
 	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
+	toolchain_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index 6559a30cfa32..239c00d759da 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -39,7 +39,7 @@ HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
 KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -128,18 +128,7 @@ src_prepare() {
 src_configure() {
 	export PATH=${PWD}/bin:${PATH}
 	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
+	toolchain_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
index 2d74d35e7a04..34a131541eaa 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
 KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -127,18 +127,7 @@ src_prepare() {
 src_configure() {
 	export PATH=${PWD}/bin:${PATH}
 	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
+	toolchain_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 923cfc961fa4..d3aadec0e515 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="ada">Build the ADA language (GNAT) frontend</flag>
 		<flag name="awt">Useful only when building GCJ, this enables Abstract
 			Window Toolkit (AWT) peer support on top of GTK+</flag>
 		<flag name="bootstrap">Used to bootstrap gnat-gpl</flag>