gentoo resync : 10.11.2019

3 files changed, 1 insertions, 109 deletions

diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 79e5f7d12266..ebab19d7f462 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,6 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-2019-src.tar.gz 2405755 BLAKE2B 70db599e8fe90a1312c2078379c6cddf518159fd8eea8c958d1abf4f4ccc504c8296e0018b03fe7f145619b6f73d6ce38b7a43cfd73dd5e1df7eb1949aa81043 SHA512 89e941a786b1d9591f4cb9f5f7db02875bb37638be7efb88e31087900c8c10ac52680f1246f90cda6fbac1b9ab213bf364d88bf583ad262f17c0a647492019a3
-DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb
 EBUILD gnatcoll-db-2019.ebuild 2879 BLAKE2B c63d41cccbe419906927068a23c690da4f6fc62c3d0e94c770136d4515a6982abfb21c4c8b29825bddb8e62493c8ac37393fed30112c1d792b660d64f0d06f53 SHA512 c5cf114975caa802d0b8d7df9e2839fd87560b6eeee81b21786cbba2050fae76f76ceac17b632ed410e6a0aace3ae8523598c62f427249d7abc339d7613711c6
-MISC metadata.xml 1334 BLAKE2B 19a30eae622d616152c1a35e30f6c732c4018963a903e3644738404a8a0b5205e5231c7aa9640ff64d0f7b0e1f8dc4ee092ba66f368e7a81e66937f8bf6c0f44 SHA512 3729735cf08a4bb8dd07d6837dd238911d882aabe9e5021a5d89b54fb3a65bf840a25f3e25b8bc24dc667cf9025661c8944538817b21f61dbfec69e5a055072a
+MISC metadata.xml 1274 BLAKE2B 4ad9306fe74b983dfc03d23ed61bb9dab8791169bbb33e316514ad6a59ec3b947fade3b61455e8554f1af4721f5647afd9649d06b721349024c0ef2d02de87ba SHA512 bd09add1cc91e61e428a05bcafdbbb23c39bcfab58e42a2e46fd8d6b1df16af2b65ea78bf5a21b74509ed3e498ef257f263c30412e2de7457bb850b5d93be169
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
deleted file mode 100644
index af9bc69a22f9..000000000000
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 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 gnat_2019 gnatcoll_db2ada gnatinspect postgres
-	+shared sql sqlite static-libs static-pic xref"
-
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	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(-)?,gnat_2019(-)?]
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="gnatinspect? ( xref )
-	xref? ( sqlite )
-	sqlite? ( sql )
-	gnatcoll_db2ada? ( sql )
-	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
-	${PYTHON_REQUIRED_USE}"
-
-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 e07dfab5a68c..b73349412d9b 100644
--- a/dev-ada/gnatcoll-db/metadata.xml
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="gnatinspect">Build gnatinspect</flag>
 		<flag name="shared">Build shared library</flag>