gentoo resync : 25.01.2018

9 files changed, 30 insertions, 26 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 99f663610a00..5942ce93b16c 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 244d98241783..42ad7cadeedd 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,6 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
 DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
-EBUILD aws-2016.ebuild 1063 BLAKE2B 8740045c5cc3080020201210ec47cb3d534375cf34252cc8bd224beeadb61abad46458d9c8d3344a5b93678be076221cfb960f899098a62b182e0f1b5d7b7f35 SHA512 4ff9923478be7c849cd4dce904c44ff228e2e66d188f732e61930af8b9a7cdd592b5de788cdce602e6bcb240706caf9a98948436dbc2d288433476e29425d41d
-EBUILD aws-2017.ebuild 1070 BLAKE2B 73b9197184d9975165048ffa6650ca0b0bc05c96e2a960bc150e0575f148f19dee1ce0f8f113c0898c6346dff1967020ab3a4d3912a427f3351b22df118f8665 SHA512 e1d2dcd204465fbffec546df8ee7fed6e7ec72cfd01ae163d93de0de025c49b5dd6cdb3bbda8fb4222389ee882e2e37715401dac2a637ee098f8ffbc3085fd46
+EBUILD aws-2016.ebuild 1068 BLAKE2B 18daa6c3e03eec724aa91a9c915530db708651b975e803b37b65c3426b20389b81b33203bc8095de269861804185fbd22b8296a845ef9d2f971aa3b1149ea864 SHA512 0d3eb5c5879c3d4ecfd0a8529c59e2999ad6fc76a6604fb88f6e76bb6d42a20ce953af14717fb2da59ed4eeeded14c57cb09259d4d65bfb71eb1f5d9aff30fdf
+EBUILD aws-2017.ebuild 1075 BLAKE2B 88126d8f186c6363ffd00d4ed2cd020b767339bef3ade2913d6bc6e4b81363f207f5558f3a6ecd9826bcb209e28e9b8201ce67d3280436d9aa3c53ebeb167ad9 SHA512 0e4ff02f6aa2fdd6cc97b0e8473ddbb8e3caa61ca249683643db545d739041c9b901977fc97e5a8688487b9eb8ef2f427aea5e4fa7669282044a4953e2c0ff72
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index e0d114382774..61bfe3b8ff8c 100644
--- a/dev-ada/aws/aws-2016.ebuild
+++ b/dev-ada/aws/aws-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
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+gnat_2016 gnat_2017"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 919248e920a4..ddae3fbd89b2 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-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
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnat_2016 +gnat_2017"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 1295a74e6495..118af85fbd03 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,5 +3,5 @@ AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c0759
 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 1549 BLAKE2B ef7ed848ecccd7cc7d53437c859ef066fa80aa3af7e0190a6cb47ae5595ade408f40e696ed159862e0d6073a67cfd8db8eefc3654c0a9747522101ef61fd8a59 SHA512 68f2ded303465eef392a550e540a58b7aca5ce8e82727cc4db30d1f99c7571942f5e8a8619c6ddb701c8bab7b2d4cf3fdf37bf2583c91a912e541e05fb641363
+EBUILD libgpr-2017.ebuild 1554 BLAKE2B 04d24fbbb0b4476dd6ffa00a9b4c54706e4f1786e0b8574085726541f573635111250d78b15e807449145d2796e5d6dbe9f72f0db7e71aff08759b478b6124fc SHA512 b32b7cb469b338557f8672f624f20dc18f8e3be38eaf51d741b98a2ec29cc88a2b5197876c6ee5506968636bb7ab543edbefe474576d859ddcc157c0b15e9484
 MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index 333c21736a07..1c5295b68c91 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-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
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
 
-RDEPEND="dev-ada/xmlada[static,gnat_2016=,gnat_2017=]
+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 )"
 DEPEND="${RDEPEND}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 1dd5088f0fea..acc35af7804c 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 2005 BLAKE2B ef14d181496c26de1ebe71cf496830ea75015c816ee6b28fcb8d60c40cb8c8cc78ba6ae446f79ab8ff16abb47801ce4830142af0b603f53e0fd365161c0e9d99 SHA512 81a6efd7a7959958f496e8d3e5a73bdcce62c995f2bdbeb11d6b95c424421317492feb6f028355336e991052366074e609550184882da73bc98b4d812cf69ff4
-MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
+EBUILD xmlada-2017.ebuild 2117 BLAKE2B 663d3c4733de28834c2d88a4bab9e0ce2ae481c2413cbf20c434b7da3cfc54ab5353bd04e59f4db64c6e74bb4370355817857b090e82445406727a13d746abb2 SHA512 5ae386913ad0a71d7b69768ef566d831ba2e8a432eebbcc3138c91133fb408e7c5b9167671d4244967a38e3e4c28e4fea04bf88a48fab74eea785cba6afc61e7
+MISC metadata.xml 1075 BLAKE2B f22c55f2e3e81e0284911b281ae3db216682681bada1b3fe2756bf1e3ef85ebf82dfbbfc302657da1914078c56197f179d9f2d0dfe74bd6e61206057543950d2 SHA512 8a290180597185d3f42ecbb09d4d18512a88ffccbc413e5346bf310ab340d927f90db35c574de1eebb87431c8892a04cf96d731a9ab20846a2343ada24e40797
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 6a0e93a661fe..a31a912b0055 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/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/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 04b53bcdf500..c13e8f5859ba 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-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
@@ -15,8 +15,8 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
-REQUIRED_USE="|| ( shared static static-pic )
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 )"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -41,11 +41,12 @@ src_compile () {
 	if use shared; then
 		build relocatable
 	fi
-	for kind in static static-pic; do
-		if use ${kind}; then
-			build ${kind}
-		fi
-	done
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
 }
 
 src_test() {
@@ -64,7 +65,10 @@ src_install () {
 		done
 	}
 
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake PROCESSORS=$(makeopts_jobs) install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
@@ -75,11 +79,12 @@ src_install () {
 		if use shared; then
 			fix_install ${dir} relocatable
 		fi
-		for kind in static static-pic; do
-			if use ${kind}; then
-				fix_install ${dir} ${kind}
-			fi
-		done
+		if use static-libs; then
+			fix_install ${dir} static
+		fi
+		if use static-pic; then
+			fix_install ${dir} static-pic
+		fi
 	done
 	einstalldocs
 	dodoc xmlada-roadmap.txt