gentoo resync : 11.02.2018

10 files changed, 46 insertions, 41 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 5942ce93b16c..e5c0b01d2a52 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 97f385d1810a..c697b939613d 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 2963 BLAKE2B 88c6806748d1ec08ef4a7767857ce4a2f691b609f17b4de376c9ec4edc25b7492ab65d96e94b4786dee5b6cf875561191491bb667b8b632a3801b53be8efe2b8 SHA512 9420452c92ec7a23214598e93b73bab38adad717c52f4350c1c5b3317d95592a1e6ea76ee3aad8063fcdf8eab15b8a99e516697f815e6f5da6845c5547c87150
-EBUILD gnatcoll-2017.ebuild 3090 BLAKE2B 5cefba1001bd018da8553a5d1bf03a07c9159f783d3eda3166761ed87ab042c75fd9a586bbad922dbaa8f0a185940b11dee0708ba59c970829cee85c6d8bb6b4 SHA512 b68f212e0ecc85f6630144878c1fa33b528abdb0425b4b5e675fbd4badb87a306640d7955fc08d94dfef173a939281daf04da1e8dc53c828fdac826df44d2e4b
+EBUILD gnatcoll-2016.ebuild 2997 BLAKE2B c5ede25bb739b20af41220f035d6d0eb577ef2e9bb5f113d177cf5d014ca73b94df7ab772371361183d4c4af832f2f19475a83965fe09d4749d2b93442e3ffd0 SHA512 ac033da158a745dfb037d1fc632adc082ae717f01efb3b28d3256ccaaf8a2aa6c1f1bcf291185b829925d653723cf2fb765360e0d8bdf1f247ce7cd2d9ae7b0e
+EBUILD gnatcoll-2017.ebuild 3125 BLAKE2B 1cec59b829326461c4b4baa93fb83eaff8d4d1ce999bad2d405f3fa94c1f7064983c7032214d279eb7c6b75611c6559b3a553d7f110cbc2ab45602310132bec2 SHA512 e5d0ffb4b41947e9f362124dced0cb873a19e4a7779b910f6331ae77343b9f04890fa532fd1668bfebd6a3f59ffeef8e4c106c1ad0b62b7b7d33b43ddcf0d1c0
 MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index c65349de0a8a..dd595440c8b5 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-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
@@ -35,7 +35,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static?]
+		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?]
+		static? ( dev-ada/libgpr[static-libs] )
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 8ed1fc5f0144..52ac0776cb56 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-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=6
@@ -34,7 +34,8 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/libgpr-2017[gnat_2017,shared?,static]
+		>=dev-ada/libgpr-2017[gnat_2017,shared?]
+		static? ( dev-ada/libgpr[static-libs] )
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2017]"
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">
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index acc35af7804c..18a70261ac5e 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,4 @@
 AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2017.ebuild 2117 BLAKE2B 663d3c4733de28834c2d88a4bab9e0ce2ae481c2413cbf20c434b7da3cfc54ab5353bd04e59f4db64c6e74bb4370355817857b090e82445406727a13d746abb2 SHA512 5ae386913ad0a71d7b69768ef566d831ba2e8a432eebbcc3138c91133fb408e7c5b9167671d4244967a38e3e4c28e4fea04bf88a48fab74eea785cba6afc61e7
+EBUILD xmlada-2017.ebuild 2116 BLAKE2B 0bd2b4aed73d23072253adbf6a2181c4266e83ffdb20bc17f659d38ee9a12583d4b22975fa102656ef3ee735aba9a186a9b8426134ba67509297a12eafd9fa22 SHA512 8ee2e47da21f8fea58aa457fd75581a3e799a250aa1b6d591924008ce9c81213bf9fdfb7082fa1c4824643ac716ae17dc9bb726fc28676d4e3e8fbb1d3383e2e
 MISC metadata.xml 1075 BLAKE2B f22c55f2e3e81e0284911b281ae3db216682681bada1b3fe2756bf1e3ef85ebf82dfbbfc302657da1914078c56197f179d9f2d0dfe74bd6e61206057543950d2 SHA512 8a290180597185d3f42ecbb09d4d18512a88ffccbc413e5346bf310ab340d927f90db35c574de1eebb87431c8892a04cf96d731a9ab20846a2343ada24e40797
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index c13e8f5859ba..0afc0340bab8 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 )"