gentoo resync : 06.08.2019

4 files changed, 5 insertions, 110 deletions

diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 8c3ad6a4a7b4..5084389e81e4 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,5 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2802 BLAKE2B 4804c796c704d417276f345f97b02089edbe911e43c05ca5209c8f824131b5de4fd9cae0404dbdce90835a84ba20e0d16f6bf2d3692f869d26d98e55cfbf33ce SHA512 47ef7f0a0aab10023565291e049b7290c1a6af1c22158a41cd4ffcde4be503bdc18ed7f17a8f657df79e11c6bc1ebc550d54ec13cae14be5364a8963946cef20
-EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
-MISC metadata.xml 1555 BLAKE2B 18ba00a762c3ec120d127c9c47f8e7b086fa6126bf6a9196e7ffd7d29f88725d591df937d809c1348e20785d03a6371455fd9ae6ee8b40f68533392ded420279 SHA512 4c515e6411f950d2847076bcd2aca4b49ba9639f439e865c186616e7e7529bbc89f31f8f956e9246d56f68f4f4447849067df71a6fed141a3b2eefe056134186
+EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb
+MISC metadata.xml 1283 BLAKE2B edf8cff8d918007b78ad3d5011a1b4b6b0d3cb1023b892c941d499dd054c21e6e7e9ce0dc913b33e80f0052cd25d453114e622ffedd737f1a4e45bd9dd616364 SHA512 4c5746a6e201c8c5a1d4d17af1c73ed5f402eddf3af2b152e0229d847476b03dba2fb15c4439b0f032b5f0ed9ed425267db0e36617d9d220709c4ff279ea6e7c
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
index edb42ca118a3..af9bc69a22f9 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres
 	+shared sql sqlite static-libs static-pic xref"
 
@@ -28,7 +28,8 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_20
 	)
 	${PYTHON_DEPS}"
 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="gnatinspect? ( xref )
 	xref? ( sqlite )
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
deleted file mode 100644
index bce7b5b49aef..000000000000
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing autotools python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres
-	+shared sql sqlite static-libs static-pic xref"
-
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	sqlite? ( dev-db/sqlite:3 )
-	postgres? ( dev-db/postgresql:* )
-	xref? (
-		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
-		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-REQUIRED_USE="gnatinspect? ( xref )
-	xref? ( sqlite )
-	sqlite? ( sql )
-	gnatcoll_db2ada? ( sql )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	build () {
-		GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
-			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
-			-XGNATCOLL_VERSION=2018 \
-			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
-			-P $1/$3.gpr \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	if use shared; then
-		preflib=relocatable
-	elif use static-libs; then
-		preflib=static
-	else
-		preflib=static-pic
-	fi
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
-			-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
-			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
-			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
-			-P $1/$3.gpr
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
index 7cd1fd91fa6e..888f72c483e5 100644
--- a/dev-ada/gnatcoll-db/metadata.xml
+++ b/dev-ada/gnatcoll-db/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="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="gnatinspect">Build gnatinspect</flag>
 		<flag name="shared">Build shared library</flag>