gentoo resync : 15.11.2017

3 files changed, 21 insertions, 31 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index e5ef912760c0..4f28ec374919 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,6 @@
-AUX gprbuild-2016-gentoo.patch 8634 SHA256 8d47b594c23f9a744c565e9443a713c00cb8ae34aa9c4ee97ec56dc93381cbc5 SHA512 b4dfd7e9b74c78532b7402c966e7d2940ecf63fe32d6b2d35b0069b06e1f9075e715ea1ee2fd3a2f35f144d18e674655df5f8bddb1d1da6892eeea1917eb9a36 WHIRLPOOL 3c96953125edd4d126f9278345439b7c99da38f6479a513d447a1bedfc66f6ba2afc0035879d85b116a41f57cfffac514c918aa002e15aaffee25c4a774f865d
+AUX gprbuild-2016-gentoo.patch 8398 SHA256 c7f2b1d8608c731654e0e3189674ff7e6cc9bb0bee9de2347f11be1619a8750e SHA512 de60fcce5a1a9ddf1f7697032b8b254f80153485cb96d35eaf8f4ddf910648d21d6c3fcbfdccdec5c5913946d6d1c4434b6c98e8e80583811e24bbff9858ac32 WHIRLPOOL d88be557bea39a987be2290f1d0bb5433e16789e9bc796f1f045b676a921bb5d6a7cf6f10a982b3dee105d479fe4e20146cea476dd1c3886b12d9c7dfa720d3b
 AUX gprbuild-2016.xml 4083 SHA256 6c7030e461260862e6de77dbfc9e3f9d8f951b0e8abb4dd31bda4119d47e3a4c SHA512 f6416039c980e7482f8fd45690a68cf190101ebf408bc253332d8a9557ede8d3da5af004fe7f6f2f416e74b6411232c2e17744d20e36cbe50a51d5b21b816b79 WHIRLPOOL f7994e95f9f4f7691026cb355c86eebd4db966de8f4738b42435f73f14c239653f11195c4d4f24eac8400936f7aebe7e1845fac2834fefea02327d5600996e7d
-AUX gprbuild-2017-gentoo.patch 1526 SHA256 b3fbd5c18c4664bd2018741aa586d6634b386ba7e4e46d81c7d485721766ab00 SHA512 25cd7461231c5faae21af189e89ca708856b4b9a540f4055346bad2823506c96c02fe76de7e7f850ae2c24ced27dd852ef241be19d506dff54c547be3b0282d7 WHIRLPOOL 5fad65d6439a7154634855ba2442451f2793504581e1d1ee0f9f6d24aedc9e1b24951a9d14a7a35a59cbb79981db0dd0cc80d0297a206bcde644e55fc04865ee
+AUX gprbuild-2017-gentoo.patch 1306 SHA256 4a8b08fd5f2333fbd497b03033a17b8cd768e5d5d48e5229d4153a301c7878fb SHA512 c8ab7d97625a3e29e95b8b75bf31fb829bbbd91e6f684410b12fc60c658a0a9f0b117e5ee6607c01147e8ea40df2a4e6841359ec4eb89b8f28e31be511849b94 WHIRLPOOL e66ab8d6a8550c5a99135c7ebd239b2f86d4d3818852b82dcdbd92ed6d0059b47239a9de71be0f6818de7c0a62b60eddb09fc68757bcb443286a01ebc985f948
 AUX gprbuild-2017.xml 3844 SHA256 fe319a46c96c1c15281e9d75a1e41048fe4ab798f8c4620b3663b6a8446d3d6e SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89 WHIRLPOOL fba1b030959fb1f8d18ea5ea05e982c26349fd972c01afb519421cbc1d562816ee0542e8d4525934e4866e362ca88fb11aa5d5c3c6d7948bb84169dc5bc38f26
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
index 53cc4df8a304..d54c8da00191 100644
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -214,19 +214,14 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
  
     package Binder is
  	make BUILDER="$(BUILDER)" BUILD="$(BUILD)"
---- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old	2017-09-12 21:29:25.945747949 +0200
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb	2017-09-12 21:35:16.299101715 +0200
-@@ -1932,6 +1932,13 @@
-                end if;
-             end if;
- 
-+            Compiler_Root := First_Compiler_Root;
-+            First_Compiler_Root :=
-+              new Compiler_Root_Data'
-+                (Root => new String'("/usr"),
-+                 Runtimes => null,
-+                 Next => Compiler_Root);
-+
-             --  Reorder the compiler roots in the PATH order
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
+ 
+       end if;
  
-             if First_Compiler_Root /= null
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
index fb494aeaafcc..57b3bfe213e9 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -21,19 +21,14 @@
  
                          end if;
                       end if;
---- gprbuild-17.0/gpr/src/gpr-conf.adb.old	2017-05-17 14:40:26.000000000 +0200
-+++ gprbuild-17.0/gpr/src/gpr-conf.adb	2017-11-10 22:44:38.482432592 +0100
-@@ -1932,6 +1932,13 @@
-                end if;
-             end if;
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
  
-+            Compiler_Root := First_Compiler_Root;
-+            First_Compiler_Root :=
-+              new Compiler_Root_Data'
-+                (Root => new String'("/usr"),
-+                 Runtimes => null,
-+                 Next => Compiler_Root);
-+
-             --  Reorder the compiler roots in the PATH order
+       end if;
  
-             if First_Compiler_Root /= null
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;