gentoo resync : 20.11.2017

3 files changed, 90 insertions, 2 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 4f28ec374919..8f6b8e9258d2 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,6 @@
-AUX gprbuild-2016-gentoo.patch 8398 SHA256 c7f2b1d8608c731654e0e3189674ff7e6cc9bb0bee9de2347f11be1619a8750e SHA512 de60fcce5a1a9ddf1f7697032b8b254f80153485cb96d35eaf8f4ddf910648d21d6c3fcbfdccdec5c5913946d6d1c4434b6c98e8e80583811e24bbff9858ac32 WHIRLPOOL d88be557bea39a987be2290f1d0bb5433e16789e9bc796f1f045b676a921bb5d6a7cf6f10a982b3dee105d479fe4e20146cea476dd1c3886b12d9c7dfa720d3b
+AUX gprbuild-2016-gentoo.patch 9724 SHA256 cd4851e1947e5cdd3d998ec870d04c820c230a18338ba8a3fc99cae573f06f78 SHA512 9780407a7c28eff5901284309b079702fe76c27c9ef46e9140dfccd094df5488f4b9a5bdc0db9e3b4fc364d24217aab70fbf682f25ebcad9b4fa650e829afc05 WHIRLPOOL f2721e0d2d5778c5fe42da5212d1fbc305bcef17e85c30456f948509504efbeec72efd0a16e79dcbc3d23efa536ca4ef193f19d227ae24c755e96321b7e8f19f
 AUX gprbuild-2016.xml 4083 SHA256 6c7030e461260862e6de77dbfc9e3f9d8f951b0e8abb4dd31bda4119d47e3a4c SHA512 f6416039c980e7482f8fd45690a68cf190101ebf408bc253332d8a9557ede8d3da5af004fe7f6f2f416e74b6411232c2e17744d20e36cbe50a51d5b21b816b79 WHIRLPOOL f7994e95f9f4f7691026cb355c86eebd4db966de8f4738b42435f73f14c239653f11195c4d4f24eac8400936f7aebe7e1845fac2834fefea02327d5600996e7d
-AUX gprbuild-2017-gentoo.patch 1306 SHA256 4a8b08fd5f2333fbd497b03033a17b8cd768e5d5d48e5229d4153a301c7878fb SHA512 c8ab7d97625a3e29e95b8b75bf31fb829bbbd91e6f684410b12fc60c658a0a9f0b117e5ee6607c01147e8ea40df2a4e6841359ec4eb89b8f28e31be511849b94 WHIRLPOOL e66ab8d6a8550c5a99135c7ebd239b2f86d4d3818852b82dcdbd92ed6d0059b47239a9de71be0f6818de7c0a62b60eddb09fc68757bcb443286a01ebc985f948
+AUX gprbuild-2017-gentoo.patch 2632 SHA256 0351873c535909794c8fbc25196756cd2b10e22feb3e5ebf0370c9ebab9c8497 SHA512 4c4ccc865e44b329d7565b8e282dd3c0c409040e8052a6494924699680a9174701143b68d9e134a4eb6de565bd3877b4aa8d51d77911b0cfb2872ec9633681cd WHIRLPOOL b02bfc3f12fb641aeeac774f0c1eb8046318b79c6248f468b70eec5126d994c1a92c33fb5dd07adf6df492f731dfab825f33de0bff48c1a37f1a9d4528cbeff3
 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 d54c8da00191..ddf5a0c3309e 100644
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -225,3 +225,47 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+@@ -27,6 +27,8 @@
+    Name_Buffer : String (1 .. 1_000_000);
+    Name_Len    : Natural := 0;
+ 
++   Last_Id     : Name_Id := Name_Id'First;
++
+    procedure Get_Name_String (Id : Name_Id);
+    procedure Get_Name_String (Id : Unit_Name_Type);
+    procedure Get_Name_String (Id : File_Name_Type);
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+@@ -354,6 +354,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Enter;
+ 
+@@ -427,6 +429,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Find;
+ 
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+@@ -53,6 +53,10 @@
+          return;
+       end if;
+ 
++      if Last_Id = Name_Id'First then
++         Add_Name ("");
++      end if;
++
+       Add_Name ("a");
+       Add_Name ("b");
+       Add_Name ("c");
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
index 57b3bfe213e9..79a07a349887 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -32,3 +32,47 @@
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+@@ -27,6 +27,8 @@
+    Name_Buffer : String (1 .. 1_000_000);
+    Name_Len    : Natural := 0;
+ 
++   Last_Id     : Name_Id := Name_Id'First;
++
+    procedure Get_Name_String (Id : Name_Id);
+    procedure Get_Name_String (Id : Unit_Name_Type);
+    procedure Get_Name_String (Id : File_Name_Type);
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+@@ -354,6 +354,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Enter;
+ 
+@@ -427,6 +429,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Find;
+ 
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+@@ -53,6 +53,10 @@
+          return;
+       end if;
+ 
++      if Last_Id = Name_Id'First then
++         Add_Name ("");
++      end if;
++
+       Add_Name ("a");
+       Add_Name ("b");
+       Add_Name ("c");