gentoo resync : 02.03.2018

3 files changed, 53 insertions, 23 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 243a1b8e0ebe..ed285647fe03 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -20,9 +20,10 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2
 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
+DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
-EBUILD gnat-gpl-2016.ebuild 5533 BLAKE2B 19e81c9796fcd7a11900075a9efa1fc2e6e141e94728d05ba2c42388ed149a7cec662a1c0e9c1342cdc4ad436ce0ba61c16178671f5ba7b6700f1ece04ccc758 SHA512 417cf2c2db26c04fbd03d4c27b2cdac9ea6775f2285d27e3c946d29e1c6c9b7604bc17e3e49f0e4e56eaa1643120bb8c57c9c86c6674ebeca4ca7f532c2093ab
-EBUILD gnat-gpl-2017.ebuild 4780 BLAKE2B 294c5feb6017864e3f064d240b120cd6b9efeb49657d97a1d1f907ce8f9cd1d8ad0295cc1a73410ff084d5c4972c4cbf86b998870294971a40b3dbb162b2d05c SHA512 4f5783cad29f9bcf342c2a435f6a953a6f05ce37ad2b970ba0439638052625763b933f893607adcd609bc9b7e352b1359be4d1028cb56b26010325869fd94d09
+EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B a03d74f9c4e4b0d3789315eaf0811072320a2f67216d1032b0e08c5a508e60ff3591c6217039a7eccef140902aae3d40934a9a979b3b49ab423d62897bbfda90 SHA512 a799d810e63f3ada01d33bf92c93f2db3fbfcde18c6155a35071bb1fa3bdc000ace459582e7b78bc1f22505b7364009829ecae1b6aab51608c183a09521da928
+EBUILD gnat-gpl-2017.ebuild 4917 BLAKE2B a03bb4ce92e9bfe21467e9ad74401d4b2d7f17b7b1989a1c29e62400feea1b3c7a6c4e80ea0c56a33ffeeef968c80a838f48444884cf36a6365d9d43cccaadca SHA512 1952435167dc47b141b4c540c8396f051ccdc910920dcc48007744111c483af8d8206e8931ba142725557bbe01f2f9f682b3c1c0ee5a29db4dc952197f17db7c
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index cbbcdeca4f8e..7015061fac26 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,6 +25,8 @@ inherit eutils toolchain-funcs toolchain
 
 REL=4.9
 MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
 
 DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
@@ -35,12 +37,20 @@ SRC_URI+="
 		-> ${MYP}.tar.gz
 	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
 		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-		gnat-gpl-2014-x86_64-linux-bin.tar.gz )"
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
 
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="bootstrap"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -57,8 +67,13 @@ FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 pkg_setup() {
 	toolchain_pkg_setup
 
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
 	if use bootstrap; then
-		GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
 	else
 		GCC=${ADA:-$(tc-getCC)}
 	fi
@@ -87,17 +102,17 @@ src_unpack() {
 		${FSFGCC}.tar.bz2
 		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
 	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} gnat-gpl-2014-x86_64-linux-bin.tar.gz"
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
 	fi
 
 	toolchain_src_unpack
 	if use bootstrap; then
-		rm gnat-gpl-2014-x86_64-linux-bin/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld || die
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
 	fi
 }
 
 src_prepare() {
-	mv ../gnat-gpl-${PV}-src/src/ada gcc/ || die
+	mv ../${P}-src/src/ada gcc/ || die
 	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
 
 	sed -i \
@@ -152,7 +167,7 @@ src_compile() {
 	toolchain_src_compile
 	gcc_do_make "-C gcc gnatlib-shared"
 	ln -s gcc ../build/prev-gcc || die
-	ln -s x86_64-pc-linux-gnu ../build/prev-x86_64-pc-linux-gnu || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
 	gcc_do_make "-C gcc gnattools"
 }
 
@@ -190,7 +205,7 @@ src_install() {
 pkg_postinst () {
 	toolchain_pkg_postinst
 	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "Set the ADA variables to gcc-${TOOLCHAIN_GCC_PV} in your make.conf"
+	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
 	einfo "Even if the c/c++ compilers are using almost the same patched"
 	einfo "source as the sys-devel/gcc package its use is not extensively"
 	einfo "tested, and not supported for updating your system, except for ada"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
index 445189b6be88..dde7fbf04a93 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,6 +11,8 @@ inherit eutils toolchain-funcs toolchain
 
 REL=6
 MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
 
 DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
@@ -22,13 +24,19 @@ SRC_URI+="
 	http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae
 		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
 	bootstrap? (
-		http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			gnat-gpl-2014-x86_64-linux-bin.tar.gz
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
 	)"
 
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="bootstrap"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -42,8 +50,15 @@ FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 
 pkg_setup() {
 	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+
 	if use bootstrap; then
-		GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
 	else
 		GCC=${ADA:-$(tc-getCC)}
 	fi
@@ -70,12 +85,12 @@ src_unpack() {
 		${MYP}.tar.gz
 		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
 	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} gnat-gpl-2014-x86_64-linux-bin.tar.gz"
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
 	fi
 
 	toolchain_src_unpack
 	if use bootstrap; then
-		rm gnat-gpl-2014-x86_64-linux-bin/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld || die
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
 	fi
 }
 
@@ -102,7 +117,7 @@ src_prepare() {
 	echo ${TOOLCHAIN_GCC_PV} > gcc/BASE-VER
 
 	cd ..
-	mv gnat-gpl-${PV}-src/src/ada ${MYP}/gcc/ || die
+	mv ${P}-src/src/ada ${MYP}/gcc/ || die
 	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	cd -
@@ -129,7 +144,7 @@ src_compile() {
 	toolchain_src_compile
 	gcc_do_make "-C gcc gnatlib-shared"
 	ln -s gcc ../build/prev-gcc || die
-	ln -s x86_64-pc-linux-gnu ../build/prev-x86_64-pc-linux-gnu || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
 	gcc_do_make "-C gcc gnattools"
 }
 
@@ -167,8 +182,7 @@ src_install() {
 pkg_postinst () {
 	toolchain_pkg_postinst
 	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "Set the ADA variables to ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV} in"
-	einfo "your make.conf"
+	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
 	einfo "Even if the c/c++ compilers are using almost the same patched"
 	einfo "source as the sys-devel/gcc package its use is not extensively"
 	einfo "tested, and not supported for updating your system, except for ada"