gentoo auto-resync : 25:11:2022 - 01:11:36

4 files changed, 6 insertions, 334 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 692c817feff2..755b3eda4b0f 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,16 +1,14 @@
 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-gentoo.patch 2052 BLAKE2B dcab01dcc71bdab78ecf16796c4174401a3d1dd950fb3600b993ed8e3f9606b7bb19e0ef9e30a1e2265a2003154b6ed06de8b1da73bb3279301b21e68a58e7a0 SHA512 6266611075133e580b07044f1fa85a03918254c189d2def36e227996f377b56876085f3e3ff18b443ccb0cc1d67ee69cb478cd90403015ff4d68107870929c0d
 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-r2.ebuild 1975 BLAKE2B 116c5addf0196380c77e4a34c587742d24120b0df93c8f11602eefbae3240b2b4ae4b9f5b0c9741ac28ed4396191656939d7e90674214726af997ba5a05d3e31 SHA512 edb25a5fbd85a6081b5f84fb61e5bdc9e1715e11e82bec3e25438ea2dff59d6982a1d85c56763e877216d8b827de84f72363a671e8abe39bf2be3ed04afb7e18
 EBUILD gprbuild-2021-r4.ebuild 2089 BLAKE2B 6a044a6c0ab8943c937ba5e2cf9b1509f768e6bfc1a60d433fe82db8a4d19ee202595385a8cfd6d3f9d680906435a4486849fd720c287c181b0b0ece351da262 SHA512 ca4526d4382998ed63e6fae8d76fb9a23ba286db8465aba6f6b767ab85db0a47a6d0cecca96a812368847cbe07ae246b96f175e82c0819039700c657d36049d1
-EBUILD gprbuild-22.0.0-r2.ebuild 2516 BLAKE2B ccdd194b0b6fcd91f49727a49f95a1e01bdb069c9882cbfba2d0f38d72d3cf29180f1461fcdb663c8a434912b4a05505f78a3a9472e7cb5d90a9aa9ab1d6a902 SHA512 869e69ca66d781529d6f34c71302782c573b30f45c647aeaf77306add73c41500710ddff5eb88da1a99103cb9cc3af24f49f787a6f1cd72baabfa58e0a4427b3
+EBUILD gprbuild-22.0.0-r3.ebuild 1623 BLAKE2B 3fb13b4776cd0abe2e663783d9a7e9755a4d6a4b117f552f1cbc5086cab53702ff0644b0bb0c744af9dfcfaadc9e25b70733e99b15f5d038d0aea4df2b3a5fbe SHA512 4adf4f424c8fff0e66fab00a1b76a9ef1fbc38c7009977caea3dc2d08e8e7bc1f5f83e9ed06803e82783e0c3372ed0aca129e15aee39baa1b97b6e89a3fe61e6
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
deleted file mode 100644
index ba5c2f858de7..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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/files/gprbuild-22.0.0-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
index a974d18c4144..3decc264638e 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
@@ -44,249 +44,3 @@
  
              when Copy_Source_Dir =>
                 Copy_Source_Directory := new String'(Line (1 .. Last));
---- a/share/gprconfig/compilers.xml	2019-06-01 21:29:57.611722804 +0200
-+++ b/share/gprconfig/compilers.xml	2019-06-01 21:42:56.000608601 +0200
-@@ -20,15 +20,15 @@
-   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
-   <compiler_description>
-     <name>GCC</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
-     <version>
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <nogrep regexp="for GNAT Pro"></nogrep>
-       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
-     </version>
-     <languages>C</languages>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -185,14 +185,14 @@
-    -->
-   <compiler_description>
-     <name>GNAT</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
-     <version>
--      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-     </version>
-     <languages>Ada</languages>
-     <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-     </variable>
-     <runtimes default="default,kernel,native">
-@@ -202,68 +202,11 @@
-        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-     </runtimes>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
- 
--  <!--  CodePeer -->
--
--  <compiler_description>
--    <name>GNAT_CODEPEER</name>
--    <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada,C,C++</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>codepeer</target>
--  </compiler_description>
--
--  <!--  Generic GNAT LLVM Target -->
--
--  <compiler_description>
--    <name>GNAT_LLVM</name>
--    <executable prefix="1">(llvm-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/rts-native/adalib/</directory>
--       <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>llvm</target>
--  </compiler_description>
--
--  <!--  Generic C compiler for LLVM  -->
--  <compiler_description>
--    <name>C_LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang --version</external>
--
--      <!--  '...clang version 6.0.0...'  -->
--      <grep regexp="clang version (\S+)" group="1"></grep>
--    </version>
--    <languages>C</languages>
--    <target>llvm</target>
--  </compiler_description>
--
-   <!--  Generic C++ compiler for LLVM  -->
-   <compiler_description>
-     <name>C++_LLVM</name>
-@@ -221,28 +221,6 @@
-     <target>llvm</target>
-   </compiler_description>
- 
--  <!--  C Target -->
--
--  <compiler_description>
--    <name>GNAT_C</name>
--    <executable prefix="1">(c-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,ccg">
--       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--    </runtimes>
--    <target>c</target>
--  </compiler_description>
--
-   <!--  CCG Target (C generation via LLVM) -->
- 
-   <compiler_description>
-@@ -286,23 +264,6 @@
-   </compiler_description>
- 
- 
--  <!--  GNAT_DOTNET -->
--
--  <compiler_description>
--    <name>GNAT_DOTNET</name>
--    <executable prefix="1">(.*dotnet-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <runtimes default="default,kernel">
--       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
--       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>dotnet</target>
--  </compiler_description>
--
-   <!--  JGNAT -->
- 
-   <compiler_description>
-@@ -421,21 +326,6 @@
-     </target>
-   </compiler_description>
- 
--  <!-- LLVM Compiler -->
--  <compiler_description>
--    <name>LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang -v</external>
--      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
--    </version>
--    <languages>C,C++</languages>
--    <target>
--      <external>clang -dumpmachine</external>
--      <grep regexp="[^\r\n]+"></grep>
--    </target>
--  </compiler_description>
--
-   <!--  Windres compiler -->
-   <compiler_description>
-     <name>WINDRES</name>
---- a/share/gprconfig/gnat.xml	2019-06-01 21:53:53.383281607 +0200
-+++ b/share/gprconfig/gnat.xml	2019-06-01 21:57:08.414196529 +0200
-@@ -60,7 +60,7 @@
-    &filter_gnat;
-    <config>
-    package Compiler is
--      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
-+      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-       for Language_Kind            ("Ada") use "unit_based";
-       for Dependency_Kind          ("Ada") use "ALI_File";
-       for Leading_Required_Switches        ("Ada") use
-@@ -77,6 +77,9 @@
-       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-       for Driver         ("Ada") use
-           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-+      for Required_Switches ("Ada") use
-+        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-    end Binder;
- 
-    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
---- a/share/gprconfig/c.xml	2019-06-01 21:57:36.244755708 +0200
-+++ b/share/gprconfig/c.xml	2019-06-01 21:59:14.919191663 +0200
-@@ -14,7 +14,7 @@
-      </compilers>
-      <config>
-    package Compiler is
--      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
-    end Compiler;
-      </config>
-    </configuration>
---- a/share/gprconfig/linker.xml	2019-06-01 21:59:34.546880368 +0200
-+++ b/share/gprconfig/linker.xml	2019-06-01 22:00:50.906668730 +0200
-@@ -112,6 +112,9 @@
-    for Object_Lister use ("nm", "-g");
-    for Object_Lister_Matcher use " [TDRB] (.*)";
- 
-+   LDFLAGS := External_As_List ("LDFLAGS", " ");
-+   for Leading_Library_Options use LDFLAGS;
-+
-    package Linker is
-       for Export_File_Format use "GNU";
-       for Export_File_Switch use "-Wl,--version-script=";
-@@ -1211,7 +1211,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
-+     ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
-@@ -1232,7 +1232,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
-+     ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild
index d221c018a4fe..9c520cc6d4a1 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
 
 inherit ada multiprocessing
 
 XMLADA=xmlada-${PV}
-GPRCONFIG_KB=gprconfig_kb-${PV}
 
 DESCRIPTION="Multi-Language Management"
 HOMEPAGE="http://libre.adacore.com/"
@@ -16,57 +15,28 @@ SRC_URI="
 	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.tar.gz
 	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz
-	https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz
-		-> ${GPRCONFIG_KB}.tar.gz"
+		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="${ADA_DEPS}"
+DEPEND="${ADA_DEPS}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-nm.patch
-	"${FILESDIR}"/${P}-ar.patch
 	"${FILESDIR}"/${PN}-2021-runpath.patch
 )
 
 src_prepare() {
-	kb_src=../${GPRCONFIG_KB}
-
-	# Install the gprconfig knowledge base
-	rm -rf share/gprconfig
-	cp -r "$kb_src"/db share/gprconfig || die
-
 	default
 	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		-e "s:\$gcc_version:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
 		-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"
@@ -92,9 +62,6 @@ src_install() {
 	dobin ${bin_progs}
 	exeinto /usr/libexec/gprbuild
 	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*.xml
-	doins share/gprconfig/*.ent
 	insinto /usr/share/gpr
 	doins share/_default.gpr
 	einstalldocs