gentoo resync : 25.12.2017

3 files changed, 11 insertions, 56 deletions

diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 8c34ea1df1cb..3b6e646012c1 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,5 +1,4 @@
-AUX libadalang-2017-gentoo.patch 2381 BLAKE2B 515d7d56d1b0adf1f14c5955f799732b33d41c4f2d182ab14c3653a9a18012ec880527d904dc34ed67476f54ec2514c2972de37e9a4731f4b56c54ead0a526f9 SHA512 4cdd11c16c0961be7ff9e6c2b9094b96a0be2e001d6d297ec801f9f0d33c99ee47d00f4f42b7ab9ee2a74baee2215448bd15cbc54d36fb4ed6c66093d37374b2
-DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
+AUX libadalang-2017-gentoo.patch 521 BLAKE2B 0493204f7a71f9f906017b69b988260add9744888559034e066dd0e33114aaad3c1f69cca23ca59b2c0b2d3503469772a91d6c278595ad8dbda5cf7fb063f8db SHA512 88613409e2ba5aa4e33ae01bdab3ac5298a363732372a33334a85781d1b29d045c7e1207650a1f9a819acad671c5dbfc1d3940a2eda9bf923456dadebb6c9af0
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
-EBUILD libadalang-2017.ebuild 1843 BLAKE2B 2017797209a4479ef071ba7b5eb6b1d00be5caee69aac215ac048ea30f7e84ad6e364aa14d2c399c1cdd24a1c920d6af4c76f1010fdc82c97a6b81621996684b SHA512 17216a1f3e7023bd135953607d952a863df020c1dcede0064018c1b262b1d36ce3fa3a15536cbd4c75388a78b58e4a1707e4926b490628bf3fdd6f93db0f0a93
+EBUILD libadalang-2017.ebuild 1508 BLAKE2B afff927d16b80a90c047f2b1f241581d59d2dd2fffb3d31d5de24bb37041897374c304a4a4b103b29416c5de7ddac174679566c1a761862ab9e541f7692b3408 SHA512 63f53f90de98e525c4816162c773236cc8dc28e68f8d48f1ed13c7160d497aa63350f68880a72576bd3cdc4c6097e1a0596ae1287b7c2aff5b3fb9003dccc500
 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 bf4dfcde83d0..dc84915ad5a0 100644
--- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
+++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
@@ -1,27 +1,5 @@
---- work/langkit-gps-src/langkit/templates/project_file.mako.old	2017-07-11 14:19:12.841221846 +0200
-+++ work/langkit-gps-src/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
-@@ -82,9 +82,9 @@
-             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
---- work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
-+++ work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old	2017-07-30 16:00:08.104464440 +0200
+--- libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
++++ libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old	2017-07-30 16:00:08.104464440 +0200
 @@ -72,6 +72,7 @@
                         --  different default standard.
  
@@ -30,15 +8,3 @@
                  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 8e4ed678cb32..651850d933e4 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -10,9 +10,7 @@ inherit python-single-r1
 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
-	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-	-> langkit-gps-src-${PV}.tar.gz"
+	-> ${P}-src.tar.gz"
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
@@ -23,32 +21,26 @@ RDEPEND="dev-python/pyyaml
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
-	dev-python/docutils
-	dev-python/mako
-	dev-python/enum34
-	dev-python/quex
-	dev-python/funcy"
+	dev-ada/langkit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( gnat_2016 gnat_2017 )"
 
-S="${WORKDIR}"
+S="${WORKDIR}"/${PN}-gps-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
-	rm -r ${PN}-gps-src/ada/testsuite/tests/{acats_parse,stylechecks} || die
+	rm -r ada/testsuite/tests/{acats_parse,stylechecks} || die
 }
 
 src_compile() {
-	cd ${PN}-gps-src
-	PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
-		GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
+	GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
 }
 
 src_test () {
 	local myDir="${WORKDIR}"/${PN}-gps-src
-	cd ${PN}-gps-src/ada/testsuite
+	cd ada/testsuite
 	ln -sf "${myDir}"/build/include/libadalang.h c_support/libadalang.h
 	#./testsuite.py --show-error-output |& grep FAILED && die "Test failed"
 	GPR_PROJECT_PATH="${myDir}"/build/lib/gnat \
@@ -60,8 +52,6 @@ src_test () {
 }
 
 src_install () {
-	cd ${PN}-gps-src
-	PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
-		ada/manage.py install "${D}"usr
+	ada/manage.py install "${D}"usr
 	python_domodule build/python/libadalang.py
 }