gentoo resync : 24.12.2018

5 files changed, 38 insertions, 21 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 244077462e3b..c30ae6cb2416 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,10 +1,10 @@
-AUX gprbuild-2017-config.patch 5387 BLAKE2B 0c4e970a384dfa569b44dfa0596fd8e7302f9259eede555c7c760e9291bcb6e68b65d1c405840ac1f917bced6c768d2fd189514e871071f0ad6d19ee7289a0ee SHA512 71e95e20e8624f3a05f04e4ad0a80c92c0069c854c82a48aab90f1c8e1cbb4cb4f83a0500d04fd77969b41caeac6c67b3f38a7aa16e520b19bb91a0f8ad8c912
+AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
-AUX gprbuild-2018-gentoo.patch 10903 BLAKE2B ac85c698dd4f0fac0eb2e309cffac073608470408268763a4bea1be4716876fb57271e17b25d98e362dfe8f0b32b7f86f0079352f9a7336e3819fa40c5e05534 SHA512 b2c0a2d0df73d60ab1414675a9cc1cd77adf85076f8904ee7163fb1b2edaa70ebfea6addc6c5bf811d40a55e25d0369c5a25bddf8e6dcbd856fb4ef918d724f2
+AUX gprbuild-2018-gentoo.patch 11203 BLAKE2B 0dc7c1e7bfc4d3864c3e200ebb1e5f4f7f920fa1939cd940f67d72cd0bf9044f0bdf09a51e492f133be1ba3ffa50816531d7038ed60c8d757fb3d60f12da268b SHA512 56c439a97109e805dea79ed624cb8687327170351e760078acc4506f02af7374fe1e51aad57150a8960ee7d904f496e0e4583543f5cbcfce2ba3677600b01ead
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
-EBUILD gprbuild-2017-r1.ebuild 2099 BLAKE2B 249b02870c30526a8cf70a647dfb2c6c1d4ba3d32ceb69386e7faafd6e1eb4f36a3353737fb10e3935acf096d2e7d343bc2968cfdee36302ec15a56718e98216 SHA512 752fee648caef4a2bebc57ae3c4fa1679729a52036ae393e6e7527072f94f34afc20a0d05f433909b182769e759372bc2ecae561967f28acbf0079b47f19f48c
-EBUILD gprbuild-2018-r3.ebuild 2271 BLAKE2B fd44965ebe8726240a9ff70f545cf0f800ee572b10102b068465393f30aae4f3d95725283a7e6e977853430c95b7f6f86651381c169b9375ba2bedf2c93bca3c SHA512 8cd9902b9678655fecd4da3d52757ed94709dde15352c78b3211ce881cf6b3e89cc444e6d6ba93d3674a3c8a216491c97580adc20e5b7d4a808ab286d2c55bbf
+EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
+EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index 72f1fd829c1c..5dcd58ffb21d 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -102,12 +102,21 @@
     </configuration>
 --- a/share/gprconfig/linker.xml	2018-10-27 09:43:17.934862859 +0200
 +++ b/share/gprconfig/linker.xml	2018-10-27 09:43:54.127304471 +0200
-@@ -742,7 +742,7 @@
-    for Shared_Library_Suffix use ".sl";
-    for Library_Auto_Init_Supported use "true";
-    for Run_Path_Option  use ("-Wl,+b,");
--   for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o");
-+   for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+@@ -814,7 +814,7 @@
+       when "arm-android" | "arm-linux-androideabi" =>
+          null;
+       when others =>
+-         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+    end case;
+     </config>
+   </configuration>
+@@ -830,7 +830,7 @@
+        <target name="^.*linux.*$" />
+     </targets>
+     <config>
+-   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
++   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
  
-    package Linker is
-       for Max_Command_Line_Length use "5000";
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index 1f967b61d4c7..34936ea1f52b 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -264,12 +264,21 @@
     </configuration>
 --- a/share/gprconfig/linker.xml	2018-10-17 21:36:15.856883517 +0200
 +++ b/share/gprconfig/linker.xml	2018-10-17 21:35:15.985896804 +0200
+@@ -1025,7 +1025,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
+ 
 @@ -1044,7 +1044,7 @@
      </targets>
      <config>
     for Library_Partial_Linker use
 -         ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
      </config>
    </configuration>
  
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index df5101ac4bfc..d279f478a5e8 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
 		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
 		src/gprlib.adb \
 		|| die
+	if use gnat_2016; then
+		sed -i \
+			-e 's:"-no-pie", ::g' \
+			share/gprconfig/linker.xml \
+			|| die
+	fi
 }
 
 src_configure() {
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
index 719ce8ae4725..a1157f5c3701 100644
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
@@ -30,9 +30,7 @@ REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
+	if use gnat_2017; then
 		GCC_PV=6.3.0
 	else
 		GCC_PV=7.3.1
@@ -49,10 +47,6 @@ src_prepare() {
 		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
 		src/gprlib.adb \
 		|| die
-#	sed -i \
-#		-e "s:\"-Wl,-r\":\"-r\":g" \
-#		share/gprconfig/linker.xml \
-#		|| die
 }
 
 src_configure() {
@@ -88,6 +82,5 @@ src_install() {
 	doins share/gprconfig/*
 	insinto /usr/share/gpr
 	doins share/_default.gpr
-	insinto /usr/share/gprconfig
 	einstalldocs
 }