gentoo xmass resync : 25.12.2021

6 files changed, 25 insertions, 8 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 6149673f1261..feeee00e6acb 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,13 +1,14 @@
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
-AUX gprbuild-2021-nm.patch 421 BLAKE2B 44b6166e3102df7eafa8af168701d09e2680a91c28cd808414a1073eb84ebfe0c6dc98c53886020d8acb27369b45f5897c7a1f236ad6dfe32ad6feaf0beac76f SHA512 49cf35270e29e3292ac95b23d117aeb3ed1d3ee8c2a9a174a8ba2a2e7270fa56cad2a3edbc548731f2ec8c66d8327ec754fcdb2a6f2e17220d6c649f20741e3d
+AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011
+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 393 BLAKE2B 2ad3e37a5f62e47c2049f88cc0d2378287ec7d33521de73d2680f2b01770b7856bed7dfec26c61a908f68b742caa57405768e7f5881f93efca9ede4ac6ce17a8 SHA512 9011cda1b306647e1d1f38a2a19b601065683ccbce253be0e9c7ecf6dd261b15a9936ec6d619bf71650d8fa5cf6103a1f35d9b0d1dbf0b4d2938cbb5d19a35e7
+AUX gprbuild-22.0.0-nm.patch 410 BLAKE2B 71e0a87cce757f934392188d26b7b2e1a8d2adb84afd1ef775b547c90af38eb9390472df593456ff1bb8e29b2959cfd58ceeb91d33154d026efbf08bb3c7b16f SHA512 d560bf2a969018b81deb787e158bd7e408d07138f468ad29fd0d2aae9ea3c9c10d88a3da538b65274e1aa665047b16c86f679d8f5ea5a4f4613b14f588fc6974
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
 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 1970 BLAKE2B 502e146075d047a5b492f2f35503937e3e1f765637f63d8dbd42d3f9c2eceb1f541c73249c1f008c7de621ee7de3ea85aa2ea82bc174b81e1716ee7c12161802 SHA512 4581ff1adedf9ba53b3740a3dc6f7dd203f560f9723483b9c70c17e040c674f3f1d88744c2a28b35991bdc86416bc6c9a955c72062e7b08712c048c2fdeef839
-EBUILD gprbuild-22.0.0-r1.ebuild 2089 BLAKE2B 45dce3b479724a520aaea113d57eec8faa64f3c667c679d213b41a888be4ae887827acb24e38ea3b0f58a8175b4a512ab82ebc085ab362905e3db131e60cb7f2 SHA512 93404c1f91686ff58dc380634999c73bdfc2174bd13eb186b0245e86ded86c9a8676251c71353670481a9731c458a4324d9a0b8976cb1050c46e45f6fd6d767a
+EBUILD gprbuild-2021-r2.ebuild 2007 BLAKE2B 69fff8e5b76aa67822269d7b15f4d4c1aafd5ab90dec76719965204b9c5b0fcf41097522f17caf65a2e55eb172731ed44ebca5b51566c5464e62335f2b349159 SHA512 a5f9976cc00148098fac0e6c56387821c842e5e0150590468e7edb162f643788475e4f7ceb7dcb192368dba0d10380e7f860bb8d8bc575e79ee9e500bf4f8145
+EBUILD gprbuild-22.0.0-r1.ebuild 2118 BLAKE2B 1740daa9ef09b57b8b8833f348392be26cd43cbc381bc8a4b80287bff976eed77dd0e3613b4f45152b910389d9f8952ba9a7a22dcdd745d522e72fd20164022c SHA512 f1940bac00deb3a0c00c368fa7ced127d7ee4e4be33a7d4bc045ca5323f8a22bf476a475e5d0eb7ddeb22172111fabf40a11e8d9a89200403ee180539fe44533
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
index 2bf41a8e1b07..9fcab1565857 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
new file mode 100644
index 000000000000..6a9513473bf9
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -0,0 +1,12 @@
+--- a/share/gprconfig/linker.xml	2021-12-22 22:40:42.611766036 +0100
++++ b/share/gprconfig/linker.xml	2021-12-22 22:42:28.839096356 +0100
+@@ -877,7 +877,8 @@
+       <host name="^x86_64-.*linux.*" />
+     </hosts>
+     <config>
+-   for Archive_Builder  use ("ar", "cr");
++   AR := External("AR", "ar");
++   for Archive_Builder  use (AR, "cr");
+    for Archive_Builder_Append_Option use ("q");
+    for Archive_Indexer  use ("ranlib");
+    for Archive_Suffix   use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
index 4455e8befffa..062d7960fce7 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 40a16cb9b2d4..8bfc6af4419b 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
+	"${FILESDIR}"/${PN}-22.0.0-ar.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 2a07d5e4d71d..06eb16e01235 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_prepare() {