dev-ada/gnatcoll-db: get rids of old style ada USE

Closes: https://bugs.gentoo.org/695060
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 0f405e447160c35488bc3aa74e40d20258399b39..ecb7f53f200717e0fe17721360c181bc6f0d51eb 100644 (file)
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,2 +1 @@
 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

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 (file)
index af9bc69..0000000
--- 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 e07dfab5a68c6b2e691c87c7618b7a83498a2ced..b73349412d9b35e12eec279f5cc0dd13a140e665 100644 (file)
--- 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>