gentoo resync : 03.12.2017

4 files changed, 56 insertions, 113 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 60d1e2b9b86b..f53348309d1b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -6,6 +6,6 @@ DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b5
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD gprbuild-2016.ebuild 2507 BLAKE2B a3907e12e5150f717489412c5d971b42eac1581e6e1b2662e56ea0c9a997e9c10ecb4b6cc7db2259f815ac951bee3785bf470a84a9e2f76db131795de64d3d8b SHA512 81634ab42782ff032dae9f3e773de64a05d4de862b1e6cea4b0fdfbf05e898adec348e463f0d8925d0a23c0f4236ff567cf944b7e692dc1299239d0c88a67d8a
-EBUILD gprbuild-2017.ebuild 2994 BLAKE2B fa67cda6a5ecefbd8a31fa3c17e227ba24ea25623af1f751a9ee3f47d90d7c18ef7d8540bd1b3531c4d5bdd57ac3ffccc39f1e291189501b71e94838fe06bd39 SHA512 73d30c0990e5779263b9ae5b31971932394e15f0466a99fac0faadedb59bc735ce2a2e8783e50007472ec3d3223f18522090714ff487475e23ead0e3abf3a610
-MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
+EBUILD gprbuild-2016.ebuild 1904 BLAKE2B dfbbf8c7e70a8d162e891533564da190d6fdfe008ef164be9194a94c299a54f7307bbbc727ab4dab49084f665ec3195a1518f0b98f165df8df6a480b36503651 SHA512 c4f36b447c96cd6db916202352c923cc8df91bdeddbfa56131d6048f5327c1aa48aab23bd5d65cbed006e7898b20c07523be29007c2c964589439866522fe333
+EBUILD gprbuild-2017.ebuild 1935 BLAKE2B c2a5c922308e9bdf8d01aad71826f7356cc6b1e7b47e19d15fbf9d0ef192aa2651d02d6f4c2de403178ecd3d7cb04be3738384c3a536d25cc737823d2dd8053a SHA512 ed4fd0292184dedef38fac1127df1ea660f64b2b2163277c169789984a3d1a093c78356f38bb0300956d2454e3829d0d7b03b52d18208f4f9412ffee5aca6953
+MISC metadata.xml 989 BLAKE2B 5272fa5dfd9ff7de586ce34d17fb928c63c4f674a64abd241e6e74c13772e96a29b28111bc2ca4241ac0c153bfbd2d9930b448237eb33954b0075fab0a6e3739 SHA512 20942ef749ddf04b54263b1a867bbcca05d90152fb556b521919585554455cd7e5ee9b69b6a8221730517d43cf3758b3737bfbe7e923aaab7c93ac3d6b32632d
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 162f31f1ee4d..5559e173f19b 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -12,23 +12,20 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
 	http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
 		-> ${MYP}-src.tar.gz
-	bootstrap? (
-		http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
-		-> xmlada-gpl-${PV}-src.tar.gz )"
+	http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
+		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017"
 
-DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
@@ -42,9 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if ! use bootstrap ; then
-		default
-	fi
+	:
 }
 
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
@@ -52,48 +47,30 @@ lib_progs="gprlib gprbind"
 
 src_compile() {
 	GCC=${CHOST}-gcc-${GCC_PV}
-	if use bootstrap; then
-		GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-		local xmlada_src="../xmlada-gpl-${PV}-src"
-		incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-			-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-			-I${xmlada_src}/input_sources"
-		${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die
-		for bin in ${bin_progs}; do
-			${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-				-o ${bin} -largs gpr_imports.o || die
-		done
-		for lib in $lib_progs; do
-			${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-				-largs gpr_imports.o || die
-		done
-	else
-		emake PROCESSORS=$(makeopts_jobs) all
-		for kind in shared static static-pic; do
-			if use ${kind}; then
-				emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind}
-			fi
-		done
-	fi
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
 }
 
 src_install() {
-	if use bootstrap; then
-		dobin ${bin_progs}
-		exeinto /usr/libexec/gprbuild
-		doexe ${lib_progs}
-		insinto /usr/share/gprconfig
-		doins share/gprconfig/*
-		insinto /usr/share/gpr
-		doins share/_default.gpr
-	else
-		default
-		for kind in shared static static-pic; do
-			if use ${kind}; then
-				emake DESTDIR="${D}" libgpr.install.${kind}
-			fi
-		done
-	fi
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
 	insinto /usr/share/gprconfig
 	doins gnat-${GCC_PV}.xml
 	einstalldocs
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
index 889b9667cf1b..8dfb66913524 100644
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -12,23 +12,20 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
 	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
 		-> ${MYP}-src.tar.gz
-	bootstrap? (
-		http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
-		-> xmlada-gpl-${PV}-src.tar.gz )"
+	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
+		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017"
 
-DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
@@ -50,58 +47,30 @@ lib_progs="gprlib gprbind"
 
 src_compile() {
 	GCC=${CHOST}-gcc-${GCC_PV}
-	if use bootstrap; then
-		GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-		local xmlada_src="../xmlada-gpl-${PV}-src"
-		incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-			-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-			-I${xmlada_src}/input_sources"
-		${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-		for bin in ${bin_progs}; do
-			${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-				-o ${bin} -largs gpr_imports.o || die
-		done
-		for lib in $lib_progs; do
-			${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-				-largs gpr_imports.o || die
-		done
-	else
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			gprbuild.gpr -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
-			-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-		if use shared; then
-			gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-				-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
-				gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-		fi
-		for kind in static static-pic; do
-			if use ${kind}; then
-				gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-					-XLIBRARY_TYPE=${kind} -XXMLADA_BUILD=${kind} gpr/gpr.gpr \
-					-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-			fi
-		done
-	fi
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
 }
 
 src_install() {
-	if use bootstrap; then
-		dobin ${bin_progs}
-		exeinto /usr/libexec/gprbuild
-		doexe ${lib_progs}
-		insinto /usr/share/gprconfig
-		doins share/gprconfig/*
-		insinto /usr/share/gpr
-		doins share/_default.gpr
-	else
-		default
-		for kind in shared static static-pic; do
-			if use ${kind}; then
-				emake DESTDIR="${D}" libgpr.install.${kind}
-			fi
-		done
-		rm "${D}"usr/doinstall || die
-	fi
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
 	insinto /usr/share/gprconfig
 	doins gnat-${GCC_PV}.xml
 	einstalldocs
diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml
index 4cf88165a988..4540dd6e09e3 100644
--- a/dev-ada/gprbuild/metadata.xml
+++ b/dev-ada/gprbuild/metadata.xml
@@ -8,9 +8,6 @@
 	<use>
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="shared">Build shared library</flag>
-		<flag name="static">Build static library</flag>
-		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
 		GPRbuild is an advanced software tool designed to help automate the