gentoo resync : 15.12.2017

7 files changed, 72 insertions, 22 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 720e943ff039..f1e07d3622c4 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 0d2365361d68..5a5264c67798 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,5 @@
-AUX gps-2017-gentoo.patch 11521 BLAKE2B d036d5b495cf3d08718347f5f2dba6c327cd97aec437b9b82df7808fc6de5ed24100cdfafec0a54bc162e64b17f9ffa868239582c69b57e218ae5efd5c8da4fa SHA512 950f9b27f50b18d30c29babcc212d52577b20ef17acae8ea4d5a1973b18ab6d01a2ba8d70b5693ea03ad0f50e06011aab6ee54f9399e1c58d61793f4f33794bd
+AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
 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
-EBUILD gps-2017.ebuild 1646 BLAKE2B 7d99c9dfc4bb0d98eb9d27b06e8b3c58930de167c163da43d239eb940e1b09778d592ceb4c4d5a10b03d41d29a8cce9c80c6a9f93fd3c8812df70125867b559a SHA512 c892e29d4dc2ee70c6ea85da4379cb4d11f8225ea2d8d7f352bb194cfe5c6d39a1ce9b3d46b4d6eb4d0b8c1a0852fceedd556119a1236da0f9a73b2d1437b314
+EBUILD gps-2017.ebuild 1673 BLAKE2B 0d8c504ff89fdf1478d5966e7c300aa0fdbc9a6f2260c1d46261cbb7aa364e0a7ad93963915f5fb1760a90a92027968bb4bcea57ae1a2e74036204fc7d33552c SHA512 40d6ccd2c4e1ccb94a59682670a3718502fd9b9fa18c7210f8e05b3f7630a86dc7ffb57237deb86c512765a92dc59cae86e56c7270a824a933fc79e32e971bf1
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
index e6ff1453189d..631e6dc92ef9 100644
--- a/dev-ada/gps/files/gps-2017-gentoo.patch
+++ b/dev-ada/gps/files/gps-2017-gentoo.patch
@@ -244,7 +244,7 @@
     ----------------------------
 --- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old	2017-11-23 22:02:52.819994229 +0100
 +++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb	2017-11-23 22:07:20.326248295 +0100
-@@ -309,12 +309,12 @@
+@@ -309,12 +309,13 @@
                 else
                    Set_Command
                      (Tc, GNAT_Driver,
@@ -255,7 +255,8 @@
                    Set_Command
                      (Tc, GNAT_List,
 -                     To_String (Full_Path) & "gnatls",
-+                     To_String (Full_Path) & "@GNATLS@",
++                     To_String (Full_Path) &
++                        "@GNATLS@",
                       From_Default,
                       Is_Default_Path);
                    Set_Command
@@ -278,10 +279,10 @@
  
 -      Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True);
 -      Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True);
-+      Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default,
-+         True);
-+      Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default,
-+         True);
++      Set_Command (Native_Toolchain, GNAT_Driver,
++         "@GNAT@", From_Default, True);
++      Set_Command (Native_Toolchain, GNAT_List,
++         "@GNATLS@", From_Default, True);
        Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True);
        Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True);
  
@@ -289,8 +290,50 @@
  
        if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then
 -         Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default);
-+         Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@",
-+            From_Default);
++         Add_Compiler (Native_Toolchain, "Ada",
++            "@GNATMAKE@", From_Default);
        end if;
  
        if Get_Compiler (Native_Toolchain, "C") = No_Compiler then
+--- gps-gpl-2017-src/gps/Makefile.old	2017-12-10 20:29:18.267622400 +0100
++++ gps-gpl-2017-src/gps/Makefile	2017-12-10 20:29:34.564312700 +0100
+@@ -45,7 +45,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 -XTP_TASKING=No_Tasking \
+-	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
++	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \
++	  -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS}
+ 
+ resources:
+ ifeq ($(OS),Windows_NT)
+--- gps-gpl-2017-src/common/common_no_xmlada.gpr.in.old	2017-12-10 20:48:13.986166250 +0100
++++ gps-gpl-2017-src/common/common_no_xmlada.gpr.in	2017-12-10 20:48:29.654872055 +0100
+@@ -22,6 +22,7 @@
+              for Switches ("dynamic_arrays.adb") use No_Checks;
+           when "Debug" =>
+       end case;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Naming is
+--- gps-gpl-2017-src/common/common_with_xmlada.gpr.in.old	2017-12-10 20:48:37.352727540 +0100
++++ gps-gpl-2017-src/common/common_with_xmlada.gpr.in	2017-12-10 20:48:50.423482155 +0100
+@@ -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
+--- gps-gpl-2017-src/shared.gpr.in.old	2017-12-10 20:52:51.117967249 +0100
++++ gps-gpl-2017-src/shared.gpr.in	2017-12-10 20:53:15.627507886 +0100
+@@ -56,6 +56,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-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index 1425084ddd95..7ab72b50e19c 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -45,9 +45,9 @@ src_prepare() {
 	GCC_PV=6.3.0
 	mv configure.{in,ac} || die
 	sed -i \
-		-e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \
-		-e "s:@GNAT@:gnat-${GCC_PV}:g" \
-		-e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+		-e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
+		-e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
+		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
 		aclocal.m4 \
 		share/support/core/gnat_help_menus.py \
 		share/support/core/toolchains.py \
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index dd4a7816ebfc..cf307b5ec7e3 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,6 +1,5 @@
-AUX libadalang-2017-gentoo.patch 1615 BLAKE2B 192a3981bed1d408d72e06431068eb3c204e28635231540cb25a5d561c778f00fb3f6532a92d296d52df7b9c850e9975d14cd15298665f7eed4a9ff1cd2048fc SHA512 30bd5d34b5f0a365c9ffda9d95025c424f8e1c5f1ee471d5565e1ba97ef0214998e2da911fcf156386baad845e1393f5de82946f2e17ad2ac80e1d53fe4166b0
+AUX libadalang-2017-gentoo.patch 2381 BLAKE2B 515d7d56d1b0adf1f14c5955f799732b33d41c4f2d182ab14c3653a9a18012ec880527d904dc34ed67476f54ec2514c2972de37e9a4731f4b56c54ead0a526f9 SHA512 4cdd11c16c0961be7ff9e6c2b9094b96a0be2e001d6d297ec801f9f0d33c99ee47d00f4f42b7ab9ee2a74baee2215448bd15cbc54d36fb4ed6c66093d37374b2
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
-DIST quex-0.65.4.tar.gz 2202154 BLAKE2B 6b273998c9641aeee458291245a4fb956b5fe9b66d8c42f0c1d9b360a4d171c830a1d487bcbab9ccea49d10b7532ed488ce66dc165f31cce9521f97c5a4575f4 SHA512 0b11d7e5c5165674626fbbe7f54853656c579c63b78bd2fef2f5a9b316171dc647812d9a37df4e7c49c05de11a307b6425089f4ab281affb6c03a9cf09e2a035
-EBUILD libadalang-2017.ebuild 2086 BLAKE2B 3fb67920d9c85c8405ff5b719e3cb5582f41faca280335845304a4d8780a3e6a2481c6e5116b4c490f65ce521cf19d8aa36ea140f312c2f2bffa811a4d91c475 SHA512 35319b7c17f1f5a59e95e21f179cb33384429e74bff1ac7a1d65f84e60e76d8fe9cb4013f196ec25c7af3ebca37a14ff06011fe79f0fc3812290ad0b6d1269d0
+EBUILD libadalang-2017.ebuild 1896 BLAKE2B 94ce515623fb7ce05cbe90fdcbc95b6dc073c0b4af331d1364d36feb301dbe8f678d65196fedb89817fc947f5b892afb037b3809f722d3d8799b8387947d3de5 SHA512 5456c7554c7f0456965c5c2959f41263fe4b51bd53cd6c6d646a558cb467934b1a3febb0a160e52d37f18b688c5b12e44188240872984031694bc9b560ec7b47
 MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505
diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
index a54f0cf98583..bf4dfcde83d0 100644
--- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
+++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
@@ -30,3 +30,15 @@
                  end Compiler;
              end P;
              '''.format(main_source=compile_units[0],
+--- work/langkit-gps-src/langkit/compile_context.py.old	2017-12-13 22:12:38.689143125 +0100
++++ work/langkit-gps-src/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',
+                                                   quex_spec):
+-            quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
+-            subprocess.check_call([sys.executable, quex_py_file, "-i",
++            subprocess.check_call(["quex", "-i",
+                                    quex_file,
+                                    "-o", "quex_lexer",
+                                    "--buffer-element-size", "4",
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
index 5a0a5cfba07e..958c5382196e 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -11,7 +11,6 @@ DESCRIPTION="high performance semantic engine for the Ada programming language"
 HOMEPAGE="https://libre.adacore.com/"
 SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
 	-> ${P}-src.tar.gz
-	mirror://sourceforge/quex/quex-0.65.4.tar.gz
 	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
 	-> langkit-gps-src-${PV}.tar.gz"
 
@@ -23,13 +22,12 @@ IUSE="gnat_2016 gnat_2017"
 RDEPEND="dev-python/pyyaml
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	dev-python/virtualenv
 	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
 	dev-python/docutils
 	dev-python/mako
 	dev-python/enum34
+	dev-python/quex
 	dev-python/funcy"
-#REQUIRED_USE="gnat_2016 !gnat_2017 ${PYTHON_REQUIRED_USE}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"
@@ -46,7 +44,6 @@ src_compile() {
 	mkdir bin
 	ln -sf /usr/bin/gnatbind-4.9.4 bin/gnatbind
 	PATH=$PATH:${PWD}/bin \
-		QUEX_PATH="${WORKDIR}"/quex-0.65.4 \
 		PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
 		GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
 }
@@ -66,8 +63,7 @@ src_test () {
 
 src_install () {
 	cd ${PN}-gps-src
-	QUEX_PATH="${WORKDIR}"/quex-0.65.4 \
-		PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
+	PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
 		ada/manage.py install "${D}"usr
 	python_domodule build/python/libadalang.py
 }