gentoo resync : 20.03.2022

5 files changed, 79 insertions, 5 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index feeee00e6acb..f78312c7c73b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,5 +1,7 @@
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
 AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011
+AUX gprbuild-2021-runpath.patch 303 BLAKE2B c70fc64c1e4d361cb72910dbab2d8a7652f0c054da7f9a707fa81ea049fb8f2e6272b1d87bb1a177ecae821cc4fb0ebff197b4527c494893cc6f9f11f37220c0 SHA512 1fd8058bbb8c37654337528856c5b5f3538f2e893a4b6da844d661bd25695dc33304648da8c6f38df7d66019e0a616ae1b705035cdcfa48750df69925eb91655
+AUX gprbuild-22.0.0-2020.patch 1185 BLAKE2B 8932d43f342dd99b8b788de4a3bdc04e10a4326b438e2524b1279cc370fb68f1804af3049975086ecdcaaf0932a4a79c7de863b662a46481d773bd92844e7ec5 SHA512 fbae2ffe6566c70c479e2ba1359b6038f2b811e02bbc2e359f4957b0db5f755fd586b15acda4a4c4f5c9520afcb346d325c9d82ddb89c5d3fcf1d80c0b745b2c
 AUX gprbuild-22.0.0-ar.patch 468 BLAKE2B 8cf38d8632123623ff369e6bf0d96c9ca37e828e71e8445ac46ccfb1636ae8676146a61934c0db915c5b1235a4b9bdc899502b3c71cabae2dae2b69082c87b4e SHA512 e1d66c86b1eeea36a84114bf4993eceeef64541c207d8e11318d842648eaead40675f90b2d16ddb27a68088d6f6bcf4b803c5f8b8c282e73453f76f9b99eb773
 AUX gprbuild-22.0.0-gentoo.patch 11712 BLAKE2B 77088bba7bc022db46e122ea20af0372c7cde4acb4fb4991313306f8e179910ccc428933f04c78cc57f78ae9b400dbfdddd59328c8e454a40fadde2fdea035a3 SHA512 af8eb69a437b18ce9924f922b4ed1b9a09caf83015936e546e673abd908dc30ee16a94c39b9e45507d9a11e126091e35a6eee78f9d513517e7782fd407b288ed
 AUX gprbuild-22.0.0-nm.patch 410 BLAKE2B 71e0a87cce757f934392188d26b7b2e1a8d2adb84afd1ef775b547c90af38eb9390472df593456ff1bb8e29b2959cfd58ceeb91d33154d026efbf08bb3c7b16f SHA512 d560bf2a969018b81deb787e158bd7e408d07138f468ad29fd0d2aae9ea3c9c10d88a3da538b65274e1aa665047b16c86f679d8f5ea5a4f4613b14f588fc6974
@@ -9,6 +11,6 @@ DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a48
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
 EBUILD gprbuild-2021-r1.ebuild 1938 BLAKE2B 058a58dbd77220c11c1627867c758dec00df0727b4d2a9d2ebb94db71e466d39821b7bd084ffcaca41808f0dba30b4227f3353892206d9ef58cd9a89c513acad SHA512 7e825debb60ef8f8c9936ea1a3b8b8ca6987aa201c219ce18c404616150035e46a8860ce2a16a0db9d84b660c4bd62fcec6f4e5b858da532d8735040eebcb6ec
-EBUILD gprbuild-2021-r2.ebuild 2007 BLAKE2B 69fff8e5b76aa67822269d7b15f4d4c1aafd5ab90dec76719965204b9c5b0fcf41097522f17caf65a2e55eb172731ed44ebca5b51566c5464e62335f2b349159 SHA512 a5f9976cc00148098fac0e6c56387821c842e5e0150590468e7edb162f643788475e4f7ceb7dcb192368dba0d10380e7f860bb8d8bc575e79ee9e500bf4f8145
-EBUILD gprbuild-22.0.0-r1.ebuild 2118 BLAKE2B 1740daa9ef09b57b8b8833f348392be26cd43cbc381bc8a4b80287bff976eed77dd0e3613b4f45152b910389d9f8952ba9a7a22dcdd745d522e72fd20164022c SHA512 f1940bac00deb3a0c00c368fa7ced127d7ee4e4be33a7d4bc045ca5323f8a22bf476a475e5d0eb7ddeb22172111fabf40a11e8d9a89200403ee180539fe44533
+EBUILD gprbuild-2021-r3.ebuild 2041 BLAKE2B ddc4b54d33e3af69f73d91d866db78801843f0848084b97e753fa11e27c54a44b574d0bc0b0d7cc3d2d7c8756b357d659b332fa18ccc0e4ba66776d8e190e2c1 SHA512 272b8a3279be5312b81387525c455064f8e6ce4df725450042e4db0190e85b8a1139039288b8e9d3abcf73d6d06ba3f668bb49c94f412111dab873481fa69d35
+EBUILD gprbuild-22.0.0-r2.ebuild 2468 BLAKE2B 740ffc8709841a6973610e3b0db8e01b9db23a5d1081ae33a39c283918e50ce4fa49e5ae05fadd11fc8764c1c57900c16312514542ad7f9ab79da5d81bf13307 SHA512 727c9ee2d49d76e84b74a9a3220623d3d69436f98a0860f373cd94a1900ceae3491ab3d80cd93c0557caafd731705cd4234fc43e38cefe5ee96cf413b3093b9d
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
new file mode 100644
index 000000000000..9224a09f9049
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-util.adb	2022-03-19 22:41:32.372348082 +0100
++++ b/gpr/src/gpr-util.adb	2022-03-19 22:41:54.325010633 +0100
+@@ -3634,7 +3634,7 @@
+             end if;
+          end loop;
+ 
+-         return Ret;
++         return Ret(1 .. Length - Separator'Length);
+       end;
+    end Concat_Paths;
+ 
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
new file mode 100644
index 000000000000..ba5c2f858de7
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
@@ -0,0 +1,47 @@
+--- a/gpr/src/gpr_imports.c	2022-02-27 10:10:34.053638209 +0100
++++ b/gpr/src/gpr_imports.c	2022-02-27 10:12:03.898276758 +0100
+@@ -114,6 +114,44 @@
+ const char *__gnat_default_libgcc_subdir = "lib";
+ #endif
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <unistd.h>
++
++  extern long long __gnat_file_time(char* name)
++  {
++    long long result;
++
++    if (name == NULL) {
++      return LLONG_MIN;
++    }
++    /* Number of seconds between <Jan 1st 1970> and <Jan 1st 2150>. */
++    static const long long ada_epoch_offset = (136 * 365 + 44 * 366) * 86400LL;
++    struct stat sb;
++    if (stat(name, &sb) != 0) {
++      return LLONG_MIN;
++    }
++
++    //  return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9
++    //  + sb.st_mtim.tv_nsec;
++    // with check overflow below
++
++    if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset, &result)) {
++      return LLONG_MIN;
++    }
++
++    if (__builtin_smulll_overflow(result, 1E9, &result)) {
++      return LLONG_MIN;
++    }
++
++    if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, &result)) {
++      return LLONG_MIN;
++    }
++
++    return result;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
index 8bfc6af4419b..3aeaaf969f80 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${PN}-22.0.0-ar.patch
+	"${FILESDIR}"/${P}-runpath.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
index 06eb16e01235..63740fc4c7a9 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_202{0,1} )
 
 inherit ada multiprocessing
 
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${PN}-2021-runpath.patch
 )
 
 src_prepare() {
@@ -53,6 +54,18 @@ src_prepare() {
 		-e "s:@GNATBIND@:${GNATBIND}:g" \
 		src/gprlib.adb \
 		|| die
+	if use ada_target_gnat_2020; then
+		sed -i \
+			-e "s:Append_Vector:Append:g" \
+			-e "s:Insert_Vector:Insert:g" \
+			src/gprbuild-link.adb \
+			src/gprinstall-install.adb \
+			src/gprlib.adb \
+			src/gprlib-build_shared_lib.adb \
+			src/gprbind.adb \
+			|| die
+		eapply "${FILESDIR}"/${P}-2020.patch
+	fi
 }
 
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"