gentoo resync : 06.08.2019

4 files changed, 3 insertions, 68 deletions

diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 81b2d6f37d9e..1508655eff54 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,9 +2,8 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0
 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2017-r1.ebuild 1430 BLAKE2B 1d5e92937f0ce1196145bf75b2df951201265ed320b62c6c7709a58127e5e3c0f66a77e23e1becfc95bcc370aafb887c4808fd06ad9376ccfa0c9eb90b388856 SHA512 4c675dcac5771a4581c85ef5fdee785155395af8fe7f8943f7e2a7cc6d562d830f6b8f770055ce0da32c098ea15bce41fbc6e7d90d576feb44b565445a77a8c5
-EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4
+EBUILD gnat_util-2017-r1.ebuild 1428 BLAKE2B 82c57959eecc3aaa4aa4f47495ec92d05dbdb195f03834d5d0fa8c133b69f293e1cb460c071daf9025e69e15eba75160f81874118d2055c312ef832a92a33a05 SHA512 c7df4a1ed891db9d537b819aaa9ffae0f7750e0b95ae1182a8d90619288888287e6336624dd127a913b872f35a890527714f16e5c48a246ee45aebd4f06bb8d0
 EBUILD gnat_util-2018-r1.ebuild 1436 BLAKE2B 4a97460a25fdb8bfcac1eb0783a3fc9111aae0636f01a966a0c58c1298244f23eae1345d56ff72d4b3b6d03ce97e6890b70393d00f00a6347d5ad69e5a9ab652 SHA512 ffcb270b491efdfd0a6cbeb9a3d1c9a3ec1d3c8d7d5b7f3eab9da404789f570611cac0861b77933f67fe2977d9fec5672aea8293d11b66e361650d6f0a2ec6bd
 EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
 EBUILD gnat_util-2019.ebuild 1296 BLAKE2B ee2e6b50d0ea4e324864d4be580607616bb8c556c1d53e4afa154d7662e8b396b2d5fc06521d56145dd63d6f5671de7ade9982b0dbd77319925527ae534e7691 SHA512 b849ce93833c3aecd9ee93ef275e546580c261fc395bc440a215590e5d370c098e485e32ccc96a5fcfc04bb0a8af402541ed8babe07bd39890b8b1406379cef7
-MISC metadata.xml 1193 BLAKE2B 1661d540e7969dfb3abb0d53ff6250f9f26809f07f03859c066d34088d7908f3889a787b237e935ab500466763e5166933c2d3e92f50c07e01d809a0f318a802 SHA512 c75c8b8e0344dcd9e9b5aac3b5f300798b0138b31cac960a485886805cea164cdbc224a7e6324bb2834c188115b0e6bd9463e0fb114c5dea1b1481d049a9ad13
+MISC metadata.xml 921 BLAKE2B 7e70b07f291098feab880aaedb4ebf5eb1dd6a83d4e5bff1f50b9e8657b9d2fc947cc33d91c02b1a1df5cfd15ce565fee9c267fdbe4063affc4a02e8944348c2 SHA512 d313f2d9d6dfd9a5616e75ce7ab5fb3670deb54f0fbc66f584ce398d5b5c8b9196f92833f54188ab8ea5dc50e5b7b8c74104b4af7050b268e9c2dfd5defe0374
diff --git a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
index 0d7f07e12a8f..3a211e741e37 100644
--- a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
deleted file mode 100644
index de225724a4e8..000000000000
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ /dev/null
@@ -1,60 +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=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 7810e6399b12..a1270420b82b 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/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 gnat_util shared library</flag>
 		<flag name="static-pic">Build gnat_util static library with pic code</flag>
 	</use>