gentoo resync : 24.12.2018

4 files changed, 29 insertions, 66 deletions

diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 5e0d709659a6..dc8171935958 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,9 +1,7 @@
 AUX asis-2016-gentoo.patch 1487 BLAKE2B 859aebba0bfe56ab846f82f2f75cb04c6b5edf25cd25175272f6da5e65356a8f82b205940e43b64832e25789c71a19ac0861d20fc44106bb06f1e05ec8d63f95 SHA512 93142623810c5a31e3d4d792144c2f352b4238a6fa96eec71489453bf6e9cfa084c0e3ec4d4e6bf37df09229f2f8045c82a4797a11555ef378774d0d2748a540
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
-DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
-EBUILD asis-2016.ebuild 1253 BLAKE2B 63b307cfa6f24c397538b3a2d9f301e922fcd2062a705f9fa00cb9be8e7f96a54d0a620438da7e15ce6b8acdb9fcfe98fc3477b6df39bfab0724765a1977d875 SHA512 b0ab62fda3dcdaba5d0c87893fedf8659d64c1a441a52e5859b3686a05beaa1a50de1916e3529f92ac0b301e83e85f10256ee42295b6d8823061d3ec31d89f7d
-EBUILD asis-2017.ebuild 1066 BLAKE2B dcca612165bfaa48d636e34606fb4f03eac1cf6fa5651458af91a923317090e5101911af771b82756eb6b0baf0bd6258b0d0c1a212f050f8294eaa8c92b61395 SHA512 6e1c71b2cbefa467fe434dbad8b600244adf6cda2f7cd40ab8497d093e483684591bdf571e6ad03019b90bc40494b7c7ec0b96b2540dc3f23dd3af8a69daeeef
-EBUILD asis-2018.ebuild 1094 BLAKE2B 8f7ad8347e9587d430565d39e6764bc4f1f8a4ca17df6278d9b1e2e798e30220b6b8446a76263d76f17ad64d0193459c63c646c70f0e9e23a92777bd44663a96 SHA512 4815766b0b98af239be713dfb3a97a4c2ece83a5e66ca50ce2c66d1ca9732e26ae112b514c660d268b6b1c641fe9a2f4cfabb322a8290e4cbd6c6a0fb8e067e9
+EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111
+EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395
 MISC metadata.xml 758 BLAKE2B aebcdb7e9be0cccf7350d68082d2461ec6a28c94df18dd936f689a3cf02a0139b96c0208fb7e8ff677ff0cb977199f8b4ef097faf6b3376624c4bf220845f216 SHA512 b673b7f404971e44cd09f746338dc2cd655b4b5cd0ced7a742e6986a8d454b4c2738a7576dd5b1ebe5fbea4ff073de60a1fbaf8dddac90e54981159affa0fb07
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 70735545b32d..74f0b0bdfadc 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -14,16 +14,17 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+gnat_2016 gnat_2017"
-
-DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
-	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-	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="${RDEPEND}"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+IUSE="+gnat_2016 gnat_2017 gnat_2018"
+
+RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+	|| (
+		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
+		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
 
 S="${WORKDIR}"/${MYP}
 
diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild
deleted file mode 100644
index 0f150265f63a..000000000000
--- a/dev-ada/asis/asis-2017.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-DEPEND="dev-ada/gnat_util[gnat_2017]
-	dev-ada/gnatcoll[gnat_2017,projects,shared]
-	dev-ada/gprbuild[gnat_2017]
-	dev-ada/xmlada[gnat_2017]
-	dev-lang/gnat-gpl:6.3.0"
-RDEPEND="${RDEPEND}"
-REQUIRED_USE="!gnat_2016 gnat_2017"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs)
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 88b9ba97d07e..503e02383473 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,21 +13,29 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]"
+KEYWORDS="amd64 x86"
+IUSE="gnat_2017 +gnat_2018"
+
+RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
+	|| (
+		dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared]
+		dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared]
+	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2017=,gnat_2018=]"
+
+REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
 
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_compile() {
-	emake PROCESSORS=$(makeopts_jobs)
+	emake PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD_FLAGS="-vl"
 	emake tools PROCESSORS=$(makeopts_jobs) \
 		GPRBUILD_FLAGS="-vl \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 }
@@ -36,6 +44,7 @@ src_install() {
 	emake prefix="${D}"/usr install
 	emake prefix="${D}"/usr install-tools \
 		GPRINSTALL="gprinstall \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 	rm -r "${D}"/usr/share/gpr/manifests || die