gentoo resync : 06.08.2019

5 files changed, 10 insertions, 74 deletions

diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 4fd387024f15..8a2ee5d212b7 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,6 @@
 AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
-EBUILD libgpr-2018-r1.ebuild 1455 BLAKE2B 09c0754d011aaa9507c89e7931ee261a06d72f507fb171ea2290a5087fe423837e4c16c82408732ffbf5375f16fd315e19dff4889604f3a934b1379e8c514e06 SHA512 2e48d5c512756b1e0222a43e958b6bab697be451b74e20a9b3afb3f7dfd65a15671b1a81b2479cad60eecd9f0b893201ebba9d1fa70b47cb9fd5a63d4b49c4f3
-EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1
-EBUILD libgpr-2019.ebuild 1434 BLAKE2B bd5ec33870135ccbe9dfcdd42d2c12cee85a593afd6cadfd764d260dd17d640193f167b46751816368ae5e6fc8030d8e69a9e3a39d46646fba19502d0ac945aa SHA512 de84b8e96df7d2d1a8f2449e731bcf964c96555d16001f47746b637eec35b8a3626434dfcff51dabc251b917d95dc9a9c0235dbe9d34d8db0d85ef2f56d5b540
-MISC metadata.xml 1211 BLAKE2B 072a1af7bb43fc3a59da80afdae5aecca7ddd9307d8aed91a1bb70892036485a8a0ca3057484e2af8209915bc71ea3a1d3799bae7d44e8fb5fa701eb78267639 SHA512 bb6a4a25fcc68773ee2b78313d1ccdfac47e21504f4f7e5ccfbee41fdfffd2af2561bf0db505df29c1298bffce49c750d038779bdc255f9ba6dacf1a8f3cffa0
+EBUILD libgpr-2018-r1.ebuild 1484 BLAKE2B a7d8bc4137640c55f24f0d26bea4cbad31aee22b9226402d1ccec485b39730276be75c4f8ec9568d86c4a4bd0e736a9f9b5c71a1197223f7566c4dab5a39ee44 SHA512 47a20f6b42e982f0cbe0f2ac8064c71e8384529f50b1e8e93d9b0a3125d910c7f54ae992e714968313588038bfb9b16b4f8001dbb5ba7457c0742877701c8261
+EBUILD libgpr-2019.ebuild 1451 BLAKE2B 974cfb4da43aed484fba18cb88b922d8139dacc1e7d2fd06f32d6c1d2f48ee5eb10fbeade2cd969a91d7fb1d553f61fbd51e47bb24b1ec14b882c044b69d8df9 SHA512 51ac3ce060d096e71faefaf481011592acbd4de25de1c9ee5c3e4a79ce622ab9bed793adf63df3c1dab2541cc72afe0d6379dcdf2221bdace22caebd6043e0a3
+MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild
index 18b7fe860f2a..fdd4077231da 100644
--- a/dev-ada/libgpr/libgpr-2018-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2018-r1.ebuild
@@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
 		-> ${MYP}-src.tar.gz"
 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="dev-ada/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	!net-libs/grpc"
 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(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
deleted file mode 100644
index 6041a1d9e70e..000000000000
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-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/5b0819dfc7a447df26c27a68
-		-> ${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/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]
-	!net-libs/grpc"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-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 shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_install() {
-	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
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild
index aa2517a75a3c..c493b2839717 100644
--- a/dev-ada/libgpr/libgpr-2019.ebuild
+++ b/dev-ada/libgpr/libgpr-2019.ebuild
@@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
 		-> ${MYP}-src.tar.gz"
 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="dev-ada/xmlada[shared?,static-libs?,static-pic?]
 	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	!net-libs/grpc"
 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(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml
index b019905df244..1f0f18cea5f2 100644
--- a/dev-ada/libgpr/metadata.xml
+++ b/dev-ada/libgpr/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-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>