gentoo resync : 18.11.2018

3 files changed, 27 insertions, 38 deletions

diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 67700f350ce7..c22bad97ac71 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,7 +1,7 @@
-AUX langkit-2017-gentoo.patch 4182 BLAKE2B 5f0a275837a80ac41e231c807eb54a620d49311b3539b995951ce30be3de6cbf1d00c7909f5ac3186b4e06892416f8a4274b75f1de10af123824f4eede466c57 SHA512 53530378e4e04d940656244f42161abc0aae9a5fc54b0ddd12c153faef0fd4a8d3f67e27742f6a2e27496a705a8dafe9288d1c7c066a43fe0e8e7c0a0886c21d
+AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791
 AUX langkit-2018-gentoo.patch 569 BLAKE2B ea4df3a3651da82c7c61d251a2b330ef735d677f1303113160f7bfcf3c0760d7606d4ac7fdd3484efb3bf2fe23deb8d245a68a6425e2b8c36c2fdf0246ad0b38 SHA512 7a115b3f4307a01b7024571ad878b5c459cddf5c3e79747b9e5d7a64a15ffde75f6eef8225721b5f42821248df03d190030d24ae7f82492c8ff415eb76ca1113
 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
-EBUILD langkit-2017.ebuild 924 BLAKE2B 4fde947ea5db44e0e806162a7283bacd4d105d58bd20fcbb68952df7690e5f86c4dd6d998845a977f09808455bdbb29c572649e78addfb41bfe3fb9306ec283c SHA512 3430bc646265ccacc3178ba3f459613e3b0a0f4493b4238a97598158a4dbf7aa81ac5a60e40da380f86a075ce8119fe28770a438273133cef4ca3caa1626348d
+EBUILD langkit-2017.ebuild 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd
 EBUILD langkit-2018.ebuild 985 BLAKE2B 2b4bc94e8e20f93ba4b98e345bcf07b717d3f07075a447bb69d6ae586cff4a1ed7d0dfd2f61aa6636cc6212aa335f17a7ed8301b52d98e6fe133219292225a73 SHA512 e499e41572d61a668707710824865ba431d8e6ef576668c8d31895334014996fd98adde25baa7d0017087102b1eadd8c0b768aab18ace9fa5192838635d4c3e6
 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index ecb7ce6e74dd..7b6501ed8a70 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -1,29 +1,5 @@
---- langkit-gps-src/langkit/templates/project_file.mako.old	2017-07-11 14:19:12.841221846 +0200
-+++ langkit-gps-src/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
-@@ -82,9 +82,11 @@
-             for Default_Switches ("Ada") use
-                Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
- 
--            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
-+            for Default_Switches ("C") use Common_C_Cargs &
-+              ("-g3", "-O0", "-fPIC");
- 
--            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
-+            for Switches ("quex_lexer.c") use Common_C_Cargs &
-+              ("-g0", "-O0", "-fPIC");
-             --  This file is *huge* and the debugging information for it harms
-             --  Valgrind runs. We almost never have to debug this file so
-             --  this is acceptable.
-@@ -111,6 +111,7 @@
-                   --  ... and this prevents OOM on other platforms
-             end case;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- langkit-gps-src/langkit/compile_context.py.old	2017-12-13 22:12:38.689143125 +0100
-+++ langkit-gps-src/langkit/compile_context.py	2017-12-13 22:13:02.446737994 +0100
+--- a/langkit/compile_context.py	2017-12-13 22:12:38.689143125 +0100
++++ b/langkit/compile_context.py	2017-12-13 22:13:02.446737994 +0100
 @@ -1171,8 +1171,7 @@
          # the Quex specification changed from last build.
          if generate_lexer and self.cache.is_stale('quex_specification',
@@ -34,8 +10,8 @@
                                     quex_file,
                                     "-o", "quex_lexer",
                                     "--buffer-element-size", "4",
---- langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako.old	2017-12-26 20:47:28.461617512 +0100
-+++ langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:58.912060490 +0100
+--- a/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:28.461617512 +0100
++++ b/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:58.912060490 +0100
 @@ -2196,7 +2196,7 @@
     --  printing them.
  
@@ -45,36 +21,49 @@
  
     package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
       (Lexical_Env, Integer, Hash, "=");
---- a/testsuite/testsuite_support/__init__.py.old	2018-05-02 21:40:04.977442020 +0200
+--- a/testsuite/testsuite_support/__init__.py	2018-05-02 21:40:04.977442020 +0200
 +++ b/testsuite/testsuite_support/__init__.py	2018-05-02 21:40:45.422759387 +0200
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,8 @@
          # to build it in parallel.
          if not self.global_env['options'].disable_tear_up_builds:
 -            p = Run(['gprbuild', '-p', '-f', '-P',
 +            p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
++                     '-XGPR_BUILD=relocatable',
 +                     '-XXMLADA_BUILD=relocatable', '-P',
                       os.path.join(self.root_dir, '..', 'langkit', 'support',
                                    'langkit_support.gpr')], output=PIPE)
              report(p, "Langkit support")
---- a/testsuite/testsuite_support/langkit_support_driver.py.old	2018-05-03 08:01:20.019944992 +0200
+--- a/testsuite/testsuite_support/langkit_support_driver.py	2018-05-03 08:01:20.019944992 +0200
 +++ b/testsuite/testsuite_support/langkit_support_driver.py	2018-05-03 08:02:50.146430288 +0200
-@@ -36,5 +36,7 @@
+@@ -36,5 +36,8 @@
              ))
  
          self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
 +                            '-XLIBRARY_TYPE=relocatable',
++                            '-XGPR_BUILD=relocatable',
 +                            '-XXMLADA_BUILD=relocatable',
                              '-cargs', '-O0', '-g'])
          self.run_and_check(['./{}'.format(source[:-4])])
-+++ a/testsuite/testsuite_support/adalog_driver.py.old	2018-05-03 08:14:30.998698722 +0200
++++ a/testsuite/testsuite_support/adalog_driver.py	2018-05-03 08:14:30.998698722 +0200
 --- b/testsuite/testsuite_support/adalog_driver.py	2018-05-03 08:16:48.275417176 +0200
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,9 @@
                  )
              ))
  
 -        self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
 +        self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
++                            '-XGPR_BUILD=relocatable',
 +                            '-XXMLADA_BUILD=relocatable',
 +                            '-P', 'p.gpr', '-cargs', '-O0',
                              '-g'])
          self.run_and_check(['./{}'.format(source[:-4])])
+--- a/langkit/libmanage.py	2018-11-14 22:02:20.283672719 +0100
++++ b/langkit/libmanage.py	2018-11-14 22:02:39.970337338 +0100
+@@ -634,6 +634,7 @@
+ 
+         result = ['-XBUILD_MODE={}'.format(build_mode),
+                   '-XLIBRARY_TYPE={}'.format(library_type),
++                  '-XGPR_BUILD={}'.format(library_type),
+                   '-XXMLADA_BUILD={}'.format(library_type)]
+ 
+         enable_warnings = getattr(args, 'enable_warnings', False)
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
index df6770a0d6bc..57790df219e3 100644
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ b/dev-ada/langkit/langkit-2017.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
@@ -21,7 +21,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll[gnat_2017,iconv,shared]
+	dev-ada/gnatcoll[iconv,shared]
 	dev-python/mako
 	dev-python/pyyaml
 	dev-python/enum34