gentoo resync : 28.12.2017

5 files changed, 21 insertions, 15 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 4f0c771ddd53..f55ea9507d3f 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index b2be7c08f2b4..ae4802b90ced 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,4 +1,4 @@
-AUX langkit-2017-gentoo.patch 1861 BLAKE2B e82dbc0b73833215e706362dc7fcee11a23dc7f2567dd095cdd06a3938a22a5e3240b5624a2d445e8f1d0b3cb61504f2b3351238af8eeb98cfc343a30c195050 SHA512 5c82150304cd66e0d6bdb6f568ce88101363d4125199d9a299f49aa213960ded751d6d326329d0c7887c1d7ddf7b3c1250659ec887ce896a4452f8f0a5c060df
+AUX langkit-2017-gentoo.patch 2378 BLAKE2B 0fedd0d2f7c2ab7cf75114c32baa7a753aca0bfb1cef9bfc3dbb9a70027b75bb177fcb298ce1d1d35262162a6f10d907ea1f6e5a7ceb4be93dddae3cba6a0d69 SHA512 5a277b01d55f7fb373b5016adf8b7f9514ab1d56fa0faf51eeff5ffd7cccc9c3bbafb2e0747e7122560ea60d38728361851c1a6850016ad6d43f33041ef8f0e1
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
 EBUILD langkit-2017.ebuild 921 BLAKE2B 99eeaa5fede2398bca076bd8f41c090ea031071841074159b6ba60492dc8245eb82d4f18415a95a615bf82d7b5dbdd28e3c9477f1828582a5a2b927a2909ba53 SHA512 2ba63d5b0a9d188b7d663a636f237ca4ebad290c4d0b8f23da00b57cbd85281c8bf31fb69903157a80c5b0a90d4ea83af42ecd75f8d29546997114328c66d73b
 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 0260d44c8885..e6609236b6cd 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -34,3 +34,14 @@
                                     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
+@@ -2196,7 +2196,7 @@
+    --  printing them.
+ 
+    function Hash (S : Lexical_Env) return Hash_Type is
+-     (Hash_Type (To_Integer (S.all'Address)));
++     (Hash_Type'Mod (To_Integer (S.all'Address)));
+ 
+    package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
+      (Lexical_Env, Integer, Hash, "=");
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 3b6e646012c1..e13873c9d776 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,4 +1,4 @@
 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 1508 BLAKE2B afff927d16b80a90c047f2b1f241581d59d2dd2fffb3d31d5de24bb37041897374c304a4a4b103b29416c5de7ddac174679566c1a761862ab9e541f7692b3408 SHA512 63f53f90de98e525c4816162c773236cc8dc28e68f8d48f1ed13c7160d497aa63350f68880a72576bd3cdc4c6097e1a0596ae1287b7c2aff5b3fb9003dccc500
+EBUILD libadalang-2017.ebuild 1093 BLAKE2B a4367e0ad2fdd068fd41ac07f6e8379b00e8882717dbd590f6d27690656a95c130191f2d51ed7a17db9ec73eab71a01bf886a5044e63a465cdbc3915fe268941 SHA512 3dae751414a9bef245465d08f20f3d3692e1589da67d221960275f10577e3a796c8a1387a4789900f2279be67fa68391b6e422b86a3843149eef0332f3c4a4ad
 MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
index 651850d933e4..30ee55045318 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -18,9 +18,9 @@ KEYWORDS="~amd64"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-python/pyyaml
+	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
 	dev-ada/langkit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( gnat_2016 gnat_2017 )"
@@ -31,24 +31,19 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
-	rm -r ada/testsuite/tests/{acats_parse,stylechecks} || die
+	rm -r ada/testsuite/tests/acats_parse || die
+}
+
+src_configure() {
+	ada/manage.py generate || die
 }
 
 src_compile() {
-	GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
+	ada/manage.py build || die
 }
 
 src_test () {
-	local myDir="${WORKDIR}"/${PN}-gps-src
-	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 \
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${myDir}"/build/lib/libadalang.relocatable \
-		PYTHONPATH="${myDir}"/build/python \
-		PATH=${PATH}:"${myDir}"/build/bin ./testsuite.py --show-error-output
-	rm c_support/libadalang.h
-	cd -
+	ada/manage.py test | grep FAILED && die
 }
 
 src_install () {