[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-db/files/, dev-ada/gnatcoll-db/

[Alfredo Tupone]

commit:     32f323a0bb67c3a8db2c686d3b2aad9e265ffa88
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 17:52:12 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 17:52:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f323a0

dev-ada/gnatcoll-db: Stabilize

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch | 10 ----------
 dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild             |  7 ++-----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch 
b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
index e6d5119aed4..9d95a9bfc1c 100644
--- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
@@ -9,13 +9,3 @@
  
     Thread_Lib := ();
  
---- a/postgres/gnatcoll_postgres.gpr   2018-06-24 16:39:56.345322365 +0200
-+++ b/postgres/gnatcoll_postgres.gpr   2018-06-24 16:40:30.737772583 +0200
-@@ -81,6 +81,7 @@
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
-             for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is

diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild 
b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
index 48085f33267..b954b8f7327 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -29,8 +29,7 @@ 
RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
 DEPEND="${RDEPEND}
        dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
-REQUIRED_USE="!gnat_2016
-       gnatinspect? ( xref )
+REQUIRED_USE="gnatinspect? ( xref )
        xref? ( sqlite )
        sqlite? ( sql )
        gnatcoll_db2ada? ( sql )"
@@ -40,10 +39,8 @@ S="${WORKDIR}"/${MYP}-src
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-       GCC_PV=7.3.1
        build () {
-               GCC=${CHOST}-gcc-${GCC_PV} \
-                       GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
+               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 \