gentoo resync : 30.06.2018

3 files changed, 33 insertions, 16 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 388d9b6e27ff..10bcc2041499 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,11 +1,11 @@
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
-AUX gprbuild-2018-gentoo.patch 2884 BLAKE2B 8f50d855883ab7e051fb8275f30f21af87a03e0f43ed94e1badfca24c96bcb0925ff551afec743d6b8d4a6958487ac748d9abc2626b91c4fb4d42692626e4581 SHA512 ab4f93c7869fb682bd9e647ea1ca21dcf3d1d39f76ac170f871d09d850beb0d6c8b07bcc97a3f45304f86cb591782d51124e6bae7f410542c6c660535b067f42
+AUX gprbuild-2018-gentoo.patch 3384 BLAKE2B cf10449869b12fad0043b7422e6ce51a0c3a72a145b517b752c43d30f675366b0c7b5b2881b8d66c65848b637bd3bdad0fe0182551bb0e391c8e86d311349610 SHA512 29a751fbae2630d53c3d0c7a7ccb4a0828ceb17928eae25665fd7d5d3b2d4d8693e5b3a9a14718f8dee1cae94cd2d321ec3070a5fd0daf4da7ae475edd373874
 AUX gprbuild-2018.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 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.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
-EBUILD gprbuild-2018.ebuild 2122 BLAKE2B cfd22d168d1644d13c30b143299581dc97bb0ba7b69457e1f04103b59d429ea34d5b814823c1b7c93c622dc52b4c4e49df42bb15ae185b58b310ad58651bd87f SHA512 357b92851c14bd0ee5daf89e70b5ab1595a92c54e946ae2938a3500064520d81f9ee7ef00bd3a3dc1906a6db2bd5014cb87e415ddf51aa1daf2db5d6fa5d12e9
+EBUILD gprbuild-2018.ebuild 2122 BLAKE2B 44aad2909aeb39d064a3f306476a1689945c45367cbc1d29e497c01fa321b2bc03095b22e8fae15c6995c5cd2a11dc83c203fcd652482f6d9f3d39568d381ec7 SHA512 8dc48bef4b704b4d828252a11c3df4fae821e1cf41fbedd6ac25570036a01351a8820c0332b0c244866e9157cf2fe1c23687f363700197029caf7362909194e0
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index c5225d8d11f2..35a98ae03fcb 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- gprbuild-2017/gpr/gpr.gpr.old	2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
+--- a/gpr/gpr.gpr	2017-05-27 20:59:07.061135892 +0200
++++ b/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
 @@ -67,6 +67,7 @@
              for Switches ("gpr*.ad?") use
                Compiler'Default_Switches ("Ada") & ("-g1");
@@ -8,8 +8,8 @@
     end Compiler;
  
  end GPR;
---- 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
+--- a/gpr/src/gpr-names.ads	2017-11-19 13:09:18.947527738 +0100
++++ b/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;
@@ -19,8 +19,8 @@
     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
+--- a/gpr/src/gpr-names.adb	2017-11-19 13:10:27.674316703 +0100
++++ b/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
 @@ -354,6 +354,8 @@
  
        Name_Chars.Append (ASCII.NUL);
@@ -39,8 +39,8 @@
        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
+--- a/gpr/src/gpr-snames.adb	2017-11-19 13:12:41.592995718 +0100
++++ b/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
 @@ -53,6 +53,10 @@
           return;
        end if;
@@ -52,18 +52,20 @@
        Add_Name ("a");
        Add_Name ("b");
        Add_Name ("c");
---- gprbuild-gpl-2017/src/gprlib.adb.old	2017-12-18 12:20:02.937317216 +0100
-+++ gprbuild-gpl-2017/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
-@@ -263,7 +263,7 @@
+--- a/src/gprlib.adb	2017-12-18 12:20:02.937317216 +0100
++++ b/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
+@@ -263,7 +263,9 @@
  
     Driver_Name                   : Name_Id := No_Name;
  
 -   Gnatbind_Name                 : String_Access := new String'("gnatbind");
 +   Gnatbind_Name                 : String_Access := new String'("@GNATBIND@");
++
++   Gnatbind_Path_Option          : constant String := "--gnatbind_path=";
  
     Compiler_Name                 : String_Access := new String'("gcc");
  
-@@ -2237,13 +2237,13 @@
+@@ -1944,13 +1946,13 @@
                            and then Line (Last - 2 .. Last) = "gcc"
                          then
                             Gnatbind_Name :=
@@ -79,3 +81,18 @@
                          end if;
                       end if;
  
+@@ -2100,7 +2102,13 @@
+                Mapping_File_Name := new String'(Line (1 .. Last));
+ 
+             when Binding_Options =>
+-               Binding_Options_Table.Append (Line (1 .. Last));
++               if Last > Gnatbind_Path_Option'Length
++                  and then Line (1 .. Gnatbind_Path_Option'Length) =
++                     Gnatbind_Path_Option then
++                     null;
++               else
++                  Binding_Options_Table.Append (Line (1 .. Last));
++               end if;
+ 
+             when Copy_Source_Dir =>
+                Copy_Source_Directory := new String'(Line (1 .. Last));
diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild
index 2a10644bfbb2..19175a509333 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.ebuild
@@ -21,7 +21,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.0 )"
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
@@ -35,7 +35,7 @@ src_prepare() {
 	elif use gnat_2017; then
 		GCC_PV=6.3.0
 	else
-		GCC_PV=7.3.0
+		GCC_PV=7.3.1
 	fi
 	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
 	default