gentoo resync : 06.08.2019

5 files changed, 8 insertions, 90 deletions

diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 8a7546724d9e..8986cfdee86d 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
-EBUILD gnatcoll-core-2018-r1.ebuild 1819 BLAKE2B c7ebb38b4ee6b3cce6b2a54aadad4482b03405cdf290498f63ca0106af6fc9b8e865f31b352112f7dc875047388a5cdfd9681bfff3505c8dd4d5248ead9fc9de SHA512 469841e1059869a40084d23150ec8c053e3752c319c8945b004a2422ab5a09df222a3039def88c764356de7f325adf72ee6a483b878055fe8f78bc3625bd6d2a
-EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881
-EBUILD gnatcoll-core-2019.ebuild 1830 BLAKE2B 45bb3e91490790ae103d74ccf9397dbae604c4f1200bace2452e881d7b7fd6fa72663b991b3e1ea91ca13905ed3c683432e565cf4b3d513f368da6640bb19056 SHA512 25a6c2dfad3738c5aed6bfd7c1cb5852d5511ff568e45ce557ec454c20222671c9790a34e8850e15c03ef5378f2b31886736ec480fe78836b3e8036e5e154b13
-MISC metadata.xml 1367 BLAKE2B 8d2cc7d1880d5dad79c2a3c7692c6a0261605ba5de8709ca89eab302671b8261ec5a1d25db143cd7aa16b963c3893b47681d27f44a88ef82e685842e1301836f SHA512 b1574899cdb80ac0e497b7d3f1f281ac95f0573f8a917ab4545ce0c9a2a8aad6b7082f854f07d954c4f54af578070406d01d65ae008a2966bc35fe5aaff4ce1b
+EBUILD gnatcoll-core-2018-r1.ebuild 1836 BLAKE2B 47ca0213599f3b740c14934bb3360599d86409a221ef555e5388c39f16bb1e7f73fae3b7bdd914919e4d4d9d8431630af364166daccb3fc5aa491739c4be5a37 SHA512 e54b32a58803f4c2bb06a56d3981dff7ae9a8bdd0fd8a055316a489e433a7f807828f32501718644983fa602e7bf0556342148099ce0be00a8e9a4ffa5bd8815
+EBUILD gnatcoll-core-2019.ebuild 1849 BLAKE2B 2d4e3be08c9126b602bdb97808e9514d982141975647cc3755cb6382c6005db7e31129512b5991e65d26ac26ad80ae4c0e92c996b5c4e5954c01c999abb292a3 SHA512 d519208fd2ac9e542a017f2fa2b78b7974cbe04042b110901eb1a3678573a2457109e6c59ab1708f6548133827f2f978114d7d1cdf31bb6259a27ad8f43edf84
+MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
index e3449f09b04f..605dcf42e672 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
 
 RDEPEND="
@@ -21,7 +21,8 @@ RDEPEND="
 	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
deleted file mode 100644
index 37d1058f21c9..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
-
-RDEPEND="
-	dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/libgpr[shared?,static-libs?,static-pic?]
-	!dev-ada/gnatcoll"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}usr" PROCESSORS=$(makeopts_jobs) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake install-relocatable
-	fi
-	if use static-pic; then
-		emake install-static-pic
-	fi
-	if use static-libs; then
-		emake install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
index e9678209c711..e1a9570911f3 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml
index 67e9acaf0903..26e17d5dcfbb 100644
--- a/dev-ada/gnatcoll-core/metadata.xml
+++ b/dev-ada/gnatcoll-core/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<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="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>