gentoo resync : 04.08.2018

3 files changed, 48 insertions, 18 deletions

diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index b5fef0b0a68c..e45c583b352e 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,9 +1,9 @@
 AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
-AUX gps-2018-gentoo.patch 3372 BLAKE2B 22128eca9a779dc7bc9659d27f439e881570342d8057e8bad9c1a99600a120f193c4d662d089846aefb8ac0c21cc60c68027c8c997dcbd140c390bc61d760007 SHA512 1c27b56d89c9edea301dfdbfd47d52ab1449805da888c6709115e6d43a8d6270cb57b56f2a18863dcc74f241aaa7e57c12d076cd0bffbd175df519033cb635e9
+AUX gps-2018-gentoo.patch 4357 BLAKE2B f0097fb364986857139c96c29bf9abe43b894629518e584b16e949a505252483efe94533d3185a838eaad87af487491bb4a2c1fb1a4a87d0633bd9b731d3b6cc SHA512 5b77e991bf0eb9a873a76e2eaccf0bfc6ce0536c093992292791892793f4483544c39fe473ab60b47479e38ef5ebebc4bd98f9335d906727e442652f3b2ded8d
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 1946 BLAKE2B 8f1619962738e8d1fe5a60baa3b63bc0318441b95234c0a667d12ad88040a62635b8b46ec94f3598e583dd33a3d88b2bb1f3dcbb191a1c3007eb9efc007144b8 SHA512 67c410fb567b5b82fce282803f5b6292b0b8b221a4f554eab11dd097229e88d614716ee212bf83695721e254892666b1231073d8616da3f2584f3e187fecfc5d
-EBUILD gps-2018.ebuild 1873 BLAKE2B d2c57775c79786768d82914f7c39679107f9130845c42fa62b9b471604dffe93a25550114d20b34577cdd7e7bd8ca6067782c9a85255dc3b75588c002f7ab54f SHA512 69c90e7005c0c474bb73ca20908fc2869f35960f340f365be79bbcaa5f37c5f727f61f2ffc75703105a211a69b25e3ccb7996f602656729861a5ce2b2fbadd50
+EBUILD gps-2018.ebuild 1914 BLAKE2B b500fbeba0325dc14a747324fbfe1503a5a92f0305a1caadbe26818422a269f601086d9147a5cfc94ff032e2d27d6d653b32a4f8afe0aa953c60455093b16363 SHA512 16452727dfc6732882ea6b7fddd50c3cf723bde51f51cbd5569c06146bbcac71ea7c9ec2fe2fe8b6a523804bcc6c9715e1143fc2ec181cc9bb206d8e4bb1f18c
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
index d03a01111223..06a080b69d56 100644
--- a/dev-ada/gps/files/gps-2018-gentoo.patch
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch
@@ -1,25 +1,15 @@
 --- a/gps/Makefile	2018-07-09 20:27:34.950424490 +0200
 +++ b/gps/Makefile	2018-07-09 20:37:39.510558817 +0200
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,8 @@
  	for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
  endif
  	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
 -	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
-+	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7
++	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \
++    -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS}
  
  resources:
  ifeq ($(OS),Windows_NT)
---- a/testsuite/Makefile	2018-07-09 21:45:48.115937491 +0200
-+++ b/testsuite/Makefile	2018-07-09 21:46:15.896547268 +0200
-@@ -13,7 +13,7 @@
- endif
- 
- all default: package
--	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
-+	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -largs -lpython2.7
- 
- package:
- 	mkdir -p share/doc
 --- a/Makefile.in	2018-07-09 21:51:08.422550386 +0200
 +++ b/Makefile.in	2018-07-09 21:51:32.187225891 +0200
 @@ -10,7 +10,7 @@
@@ -85,3 +75,43 @@
         <string />
     </project_attribute>
  
+--- a/gnatcoll_extras/gnatcoll_extras.gpr	2018-07-22 14:42:17.618161040 +0200
++++ b/gnatcoll_extras/gnatcoll_extras.gpr	2018-07-22 14:43:33.973070921 +0200
+@@ -14,6 +14,7 @@
+       for Switches ("C") use
+         ("-g", "-O2")
+         & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+ end GNATCOLL_Extras;
+--- a/widgets/widgets.gpr	2018-07-22 21:46:23.907355738 +0200
++++ b/widgets/widgets.gpr	2018-07-22 21:47:02.673825994 +0200
+@@ -14,6 +14,7 @@
+       for Switches ("C") use
+         ("-g", "-O2")
+         & Shared.Gtk_Cflags;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+ end Widgets;
+--- a/common/common.gpr.in	2018-07-25 08:05:45.227060250 +0200
++++ b/common/common.gpr.in	2018-07-25 08:06:55.067009811 +0200
+@@ -23,6 +23,7 @@
+              for Switches ("dynamic_arrays.adb") use No_Checks;
+           when "Debug" =>
+       end case;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Binder is
+--- a/shared.gpr.in	2018-07-25 08:11:47.317597391 +0200
++++ b/shared.gpr.in	2018-07-25 08:10:56.774362671 +0200
+@@ -60,6 +60,7 @@
+                );
+             for Switches ("C") use Optimize & ("-g", "-O2");
+       end case;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Binder is
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
index e67c569534ff..5a97ccc8bd2e 100644
--- a/dev-ada/gps/gps-2018.ebuild
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -66,10 +66,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
+	CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
 		Build=Production
-	gprbuild -v -p -Pcli/cli.gpr -XLIBRARY_TYPE=relocatable
-	emake -C testsuite
+	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS}
 }
 
 src_install() {