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

[Alfredo Tupone]

commit:     971f893b0e0d4c2080513bed8ebfe832049ed79f
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 20:30:25 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 20:30:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f893b

dev-ada/gnatcoll: require a more recent libgpr

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

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 20 +++++++++++---------
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch 
b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index 3d775e2c030..d6ece9454e2 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -34,15 +34,6 @@
     Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
     Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
     type Sqlite_Inclusion is ("yes", "no", "embedded");
-@@ -67,7 +67,7 @@
- 
-          when "Production" =>
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatws");
--            for Switches ("C") use ("-O2", "-Wunreachable-code");
-+            for Switches ("C") use ("-O2", "-Wunreachable-code", "-fPIC");
-       end case;
- 
-       case Syslog is
 --- a/aclocal.m4       2017-04-06 08:25:14.796699365 +0200
 +++ b/aclocal.m4       2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
@@ -214,3 +205,14 @@
           case GnatColl_Shared.Python is
              when "yes" =>
                 for Source_Dirs use Project'Source_Dirs & ("gtk/python");
+--- a/src/gnatcoll-projects-normalize.adb      2018-11-13 19:34:01.491003676 
+0100
++++ b/src/gnatcoll-projects-normalize.adb      2018-11-13 19:34:16.289760553 
+0100
+@@ -2202,7 +2202,7 @@
+             when N_Comment_Zones =>
+                null;
+ 
+-            when N_Comment =>
++            when others =>
+                null;
+          end case;
+       end if;

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild 
b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 435a16df129..4f0159efc45 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
        postgres? ( dev-db/postgresql:* )
        sqlite? ( dev-db/sqlite )
        projects? (
-               ~dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
+               ~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
                dev-ada/xmlada[shared?,static-libs?]
        )"
 DEPEND="${RDEPEND}