gentoo resync : 11.02.2018

4 files changed, 36 insertions, 33 deletions

diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 118af85fbd03..7160ba409568 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -2,6 +2,6 @@ AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3
 AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-EBUILD libgpr-2016.ebuild 1168 BLAKE2B dfb30003c3f2ff033c0748dd62c7b2236804050c9cae7e76a83cf2bc02b92bb447b28a9b0102e7399427cf89ead48bd17ed381f4afe5ad4c8aa015b5457f5cc6 SHA512 7b8eb381deb93b476d661e01b36a19314a2c75e811a38c6471a97c70ee3ab7305c90cb402ac9772c80063dda640893effef7d1d8b7a7b43992b061fada97d00c
-EBUILD libgpr-2017.ebuild 1554 BLAKE2B 04d24fbbb0b4476dd6ffa00a9b4c54706e4f1786e0b8574085726541f573635111250d78b15e807449145d2796e5d6dbe9f72f0db7e71aff08759b478b6124fc SHA512 b32b7cb469b338557f8672f624f20dc18f8e3be38eaf51d741b98a2ec29cc88a2b5197876c6ee5506968636bb7ab543edbefe474576d859ddcc157c0b15e9484
-MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
+EBUILD libgpr-2016.ebuild 1240 BLAKE2B a9e16be1e744e6b139f54531419ae617b389821d778255056ddffb2fcefb1fe0f67f07f3f84a5af606a1b3c02c36956ed6bf59e6c9f940edbbdbe76b55ea23ee SHA512 c220a09158363748b7a40f6d60f32a1b48e3d9fe665452c523623e96578fca9563ad0a9de3cb354d5214f0747a5ca29dcb5cdb0f489af82630d65a2789e4b960
+EBUILD libgpr-2017.ebuild 1385 BLAKE2B 0ebdf2e5f29132c137a9e0a90d7e0c2ee064c45e3303c57dea344e152adf36b7eaaf2030347560e2fe2f18dfcf63e89648fd858f1013ddc21a0d7191d92c9511 SHA512 97de10f550893588fcfb93a59808b6b04bae8ff05e42ea46f91e1921efe115148bf444f02878b9c49fd36bd478c7bab67a4f5a6e97e0a0ca8d3d8ee119c15122
+MISC metadata.xml 1107 BLAKE2B dbe4a515d1655167dcef70cd183765b53f31468a439b560194a762bb62370869895569d516ac4eba2cc3ce20696177c448bc1cab41239fa095923ab04fd8a60b SHA512 269d4eac542602f975615593fa979f853c01d4bfaa4c0dd418d3ce3a790c2409897b59ccb25c6266d15bad8b7c0f9674be316731869c49d0b24e10144b350562
diff --git a/dev-ada/libgpr/libgpr-2016.ebuild b/dev-ada/libgpr/libgpr-2016.ebuild
index 9747b4797515..fa0836fb0b7b 100644
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ b/dev-ada/libgpr/libgpr-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=6
@@ -14,18 +14,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=]
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=]"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="|| ( shared static static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="|| ( shared static-libs static-pic )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
@@ -35,7 +32,10 @@ src_compile() {
 		GCC_PV=6.3.0
 	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake PROCESSORS=$(makeopts_jobs) libgpr.build.static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind}
 		fi
@@ -43,7 +43,10 @@ src_compile() {
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake DESTDIR="${D}" libgpr.install.static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake DESTDIR="${D}" libgpr.install.${kind}
 		fi
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index 1c5295b68c91..df6ab7a6beeb 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.ebuild
@@ -9,24 +9,20 @@ MYP=gprbuild-gpl-${PV}
 
 DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
-RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
+RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="|| ( shared static static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="|| ( shared static-libs static-pic )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
@@ -34,6 +30,11 @@ src_configure() {
 }
 
 src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
 	if use gnat_2016; then
 		GCC_PV=4.9.4
 	else
@@ -41,21 +42,21 @@ src_compile() {
 	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
 	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
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
 	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
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake DESTDIR="${D}" libgpr.install.static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake DESTDIR="${D}" libgpr.install.${kind}
 		fi
diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml
index 4cf88165a988..05c462d34072 100644
--- a/dev-ada/libgpr/metadata.xml
+++ b/dev-ada/libgpr/metadata.xml
@@ -9,7 +9,6 @@
 		<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">