dev-ada/gnatcoll: remove hack on GCC for 2016 vers

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

2 files changed, 7 insertions, 194 deletions

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index 1a1d4d14eec2..cd9507026e2e 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -23,58 +23,25 @@
  
  #######################################################################
  #  install
---- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
-@@ -24,6 +24,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use Gnatcoll_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use Gnatcoll_Shared.Compiler'Switches ("C")
-         & (@GMP_CFLAGS_GPR@);
-    end Compiler;
---- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
-@@ -26,6 +26,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
-           & GnatColl_Shared.Iconv_Include;
-    end Compiler;
 --- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
 +++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
-@@ -60,8 +60,9 @@
+@@ -60,7 +60,7 @@
  
                    --  force full optimization for sqlite, we do not debug it
                    --  in any case.
 -                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
 +                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
        end case;
-+      for Driver ("C") use External ("CC", "gcc");
     end Compiler;
  
-    package Linker is
---- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
-@@ -38,6 +38,7 @@
-            for Switches ("C") use
-               GnatColl_Shared.Compiler'Switches ("C");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
 --- gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in.old	2017-01-07 09:12:30.490399897 +0100
 +++ gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
-@@ -30,7 +30,8 @@
+@@ -30,7 +30,7 @@
          GnatColl_Shared.Compiler'Switches ("Ada");
  
        for Switches ("C") use
 -        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
 +        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
-+      for Driver ("C") use External ("CC", "gcc");
     end Compiler;
  
     package Linker is
@@ -100,7 +67,7 @@
        case Syslog is
 --- gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in.old	2017-01-20 19:53:16.647607400 +0100
 +++ gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
-@@ -63,11 +63,12 @@
+@@ -63,7 +63,7 @@
        for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
  
        for Switches ("C") use
@@ -109,32 +76,6 @@
          & GnatColl_Shared.Python_Cflags
          & GnatColl_Shared.Pygtk_Include
          & GnatColl_Shared.PyGobject_Include
-         & Gtk_Include;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
-@@ -49,6 +49,8 @@
-    package Builder renames GnatColl_Shared.Builder;
- 
-    package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
---- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
-@@ -64,6 +64,7 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
-+      for Driver ("C") use External ("CC", "gcc");
- 
-       case GnatColl_Shared.Atomics is
-          when "intrinsic" =>
 --- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
 +++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
@@ -166,26 +107,6 @@
          self.gprbuild()
          self.runexec("json_stack_test", "test.out")
  
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use

-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");

-       for Switches ("c") use ("-fdump-xref");

-+      for Driver ("c") use External ("CC", "gcc");

-    end Compiler;

- 

- end c;

---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use

-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");

-       for Switches ("C") use ("-fdump-xref");

-+      for Driver ("C") use External ("CC", "gcc");

-    end Compiler;

- 

- end c;

 --- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
 +++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
 @@ -105,25 +105,6 @@
@@ -214,112 +135,6 @@
      @chdir("NB12-045")
      def test_NB12_045(self):
          # Test registering attribute in unknown package
---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("Ada", "C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
-@@ -6,4 +6,7 @@
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
- 
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr.old	2017-04-24 20:08:06.018564544 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr	2017-04-24 20:08:53.682748215 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr.old	2017-04-24 20:10:00.146610101 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr	2017-04-24 20:10:40.512919251 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end COmpiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr.old	2017-04-24 20:13:28.543059408 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr	2017-04-24 20:14:05.513430176 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr.old	2017-04-24 20:15:26.420053157 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr	2017-04-24 20:16:12.695265558 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr.old	2017-04-24 20:16:53.562570024 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr	2017-04-24 20:17:32.086914323 +0200
-@@ -4,4 +4,7 @@
-       for Spec_Suffix ("c++") use ".h";
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr.old	2017-04-24 20:18:03.688376474 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr	2017-04-24 20:18:52.761541251 +0200
-@@ -1,3 +1,6 @@
- project Dummy is
-    for Languages use ("c");
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr.old	2017-04-24 20:19:40.401730504 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr	2017-04-24 20:22:52.303465944 +0200
-@@ -4,5 +4,6 @@
-    package Compiler is
-       for Switches ("C") use ("-fsyntax-only", "-fdump-xref");
-       for Switches ("C++") use ("-fsyntax-only", "-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr.old	2017-04-24 20:31:02.679123516 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr	2017-04-24 20:31:42.515445784 +0200
-@@ -8,4 +8,7 @@
-       when "release"  => for Object_Dir use "obj1";
-       when "debug"    => for Object_Dir use "obj2";
-    end case;
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr.old	2017-04-24 20:32:45.175379776 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr	2017-04-24 20:33:16.130853112 +0200
-@@ -7,6 +7,7 @@
-    package Compiler is
- 	   for Default_Switches ("Ada") use ("-gnatws");
- 	   for Default_Switches ("C") use ("-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end Default;
 --- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
 +++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
 @@ -211,7 +211,7 @@
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 7f73bf715c62..9aa2594fbfa3 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
@@ -62,7 +62,6 @@ src_configure() {
 	else
 		GCC_PV=6.3.0
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
 	if use sqlite; then
@@ -90,17 +89,16 @@ src_configure() {
 		--with-python-exec=${EPYTHON} \
 		--enable-shared-python \
 		--disable-pygtk \
-		CC=${GCC} \
 		$myConf
 }
 
 src_compile() {
 	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
 			build_library_type/relocatable
 	fi
 	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
 			build_library_type/static
 	fi
 	python_fix_shebang .