gentoo resync : 13.06.2020

16 files changed, 604 insertions, 6 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 3abec34bd9c6..68bc0d94349f 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index fb806de2ccfe..6b449e7841ff 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
-EBUILD gnatcoll-core-2019-r1.ebuild 1534 BLAKE2B f35eaf7d3ae1bf5798e203bbd7caab039a2c7b82d61ea8495eed3753405791f8612a1b7a3c16e5732525ea2eefaa6be95deaed1641faf41f66ed7dc274002213 SHA512 332e2b088a585ee7e7ac037d70f4e6710b096d736eb3ff0ae371dfa1f3ddfec266fe96167af0e43b2f4012919df58a250575b8e97e1bbb92b828c92cbb78d9b5
+EBUILD gnatcoll-core-2019-r1.ebuild 1521 BLAKE2B c968eba624a3c5a1c2fda36f63e90a8f02c6f8aa072925447cac7051202165a5dd461b0aab0276b879a259322753d9dd2f54dffe07df211195581ac9c1149879 SHA512 373dde5f1ceee4264137f8ba60c2288754610f5609cbe3be0f45cb0182673377434dd3ad136e23bd261e6822bb7482d5847bb552471dab98219712fc243d8b9b
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild
index 7fe63c005070..a1f0dc711f42 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
-	dev-ada/libgpr[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	!dev-ada/gnatcoll"
+	~dev-ada/libgpr-2019[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index ddbf5415a19a..5fa690552e10 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,10 +1,14 @@
 AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2019-gentoo.patch 11240 BLAKE2B 609968e7d95bb686db4362c06600a90cd9d9cde1c4058618ed40fd90585153b02316369dc3a439b84f3c8e1031d182ed3f739b449ed8e09761e90e2b80d73a4c SHA512 f48ed180ecfd8cb6691473e1f996f1805dcae693a0e2710fdfd0c246443cbe732ccc6dbb415c90396886b0b79d8aac22e3c7b720ca4f6da746e22485972aace5
+AUX gprbuild-2020-gentoo.patch 11219 BLAKE2B fc898b35f5a0901ca7cf8b229c2115a595387d16a586aecbcd75daa62fdcb413dfa2f1c970a9bc25632cd92919ea94f09bfb94d274ca00dc9d78cfeacce647c6 SHA512 4c34de0793f68f42c3577d57f6b7e7bde54a70807bccefa309317e4409b3d0fdac8aeb831b40545ab3e0d5219647c557e0aeadf73895e617bb2b3d67e7aea1e3
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
+DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
+DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 EBUILD gprbuild-2017-r2.ebuild 2003 BLAKE2B 38de852e3e89d34fb0392f13b81aa1a615551874a49a0a825ff4884c4e3efd9d1252bed78a83c175c65547571b6c565bad155fd153e219313e0a069e570cd63a SHA512 629b7a22ff13c049bcdf7e6413f0059d9c223958f41861aa8ee15a639fd8553de9011936fb328a98c5dd1b33ff9eb9b2f62cee76c35f69886d66457932ad2761
 EBUILD gprbuild-2019-r1.ebuild 1868 BLAKE2B 0da947626ada0499ad24a66f696556242e9be465b728636704a2c7319996620fdf57a8d196b51be6b6ecd0c24b461f9a53d561d8f679b202de429b2e2ad81275 SHA512 570882f4afca2d40885c505a5b1fc60f34692b931068d273e582804168059ccd57998db2603743fc647a8aec27401140e3b64182554e76fedfa4793c86aed241
+EBUILD gprbuild-2020.ebuild 1987 BLAKE2B 1b62dd96f7caa37a1dab074574206bd66c2b98d1fd684a372eef45c390b3941460bf864dd6d1374ec998abc11b8b3bc05ae07f82b03f2979e1ff619d3b986a07 SHA512 ff4dd748cd44549567a2bc3e3888ba28200159a469feb47d21d176574f8f3caf7f7eaceeb653c9cb4c659b655a4c44739aa86ba4d3fb57777945eaab8ebf21fc
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
new file mode 100644
index 000000000000..66ec4f7f0dd1
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
@@ -0,0 +1,274 @@
+--- a/src/gprlib.adb	2019-06-02 10:57:49.807002425 +0200
++++ b/src/gprlib.adb	2019-06-02 11:01:32.986518447 +0200
+@@ -266,7 +266,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");
+ 
+@@ -2081,7 +2083,7 @@
+                           and then Line (Last - 2 .. Last) = "gcc"
+                         then
+                            Gnatbind_Name :=
+-                             new String'(Line (1 .. Last - 3) & "gnatbind");
++                             new String'(Line (1 .. Last - 3) & "@GNATBIND@");
+                            Objcopy_Name :=
+                              new String'(Line (1 .. Last - 3) & "objcopy");
+ 
+@@ -2089,7 +2091,7 @@
+                           and then Line (Last - 6 .. Last) = "gcc.exe"
+                         then
+                            Gnatbind_Name :=
+-                             new String'(Line (1 .. Last - 7) & "gnatbind");
++                             new String'(Line (1 .. Last - 7) & "@GNATBIND@");
+                            Objcopy_Name :=
+                              new String'(Line (1 .. Last - 7) & "objcopy");
+                         end if;
+@@ -2241,7 +2243,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));
+--- 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-|.*-pc-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-|.*-pc-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>
+@@ -170,14 +170,14 @@
+    -->
+   <compiler_description>
+     <name>GNAT</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?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">
+@@ -187,67 +187,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>
+-    </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>
+@@ -262,45 +206,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>
+-
+-  <!--  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
+@@ -1015,7 +1015,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
+ 
+@@ -1034,7 +1034,7 @@
+     </targets>
+     <config>
+    for Library_Partial_Linker use
+-         ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
++         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
+     </config>
+   </configuration>
+ 
diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
new file mode 100644
index 000000000000..c633f202b550
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2020.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{7,8,9} )
+
+inherit ada toolchain-funcs multiprocessing
+
+MYP=${P}-20200429-19BD2-src
+XMLADA=xmlada-${PV}-20200429-19A99-src
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
+		-> ${MYP}.tar.gz
+	https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${ADA_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@VER@:${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
+}
+
+src_configure() {
+	emake prefix="${D}"/usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs ${LDFLAGS} gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 3bd2035d44be..e6ce089b0d1d 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,8 +1,10 @@
 AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899
 AUX langkit-2019-gentoo.patch 3308 BLAKE2B 266bd5bd1d507a565c325e5668eebc3a2a96a448656a6c1f74644d222a4fbdb1cc77eb0c51a33d9453c19a958ed0867bdb59245f09c2b383c59cbd62f699c277 SHA512 d85677824a2da7a8b3c06b665a8e517d7151da4ff458fa595e7c5b71dcf4f78a5a0914e9fe8f8a700b0422071af4d6e4890bc8e70c539f59ae25f89c19d4a8d9
+AUX langkit-2019-gnarl.patch 349 BLAKE2B f26ff18ef2176a9e5f277e510202c3d87f2e40d29054d78b0d531d22c769ed2c18319dc0198a3f79a048a9f26027710334d80957f635ed05427581245b4d4525 SHA512 9f979f63839fb56a0536bf045b859fadb917177e587debe23c2e142fc05d78b06114e6c93125633aa244ac8e4e8965ce66336eb71099890d063353954c2120d9
 AUX langkit-2019-pyyaml.patch 558 BLAKE2B 811deec6f63e8408f07df7b526a5f4e743c14d3757d92cfcd88400a5cc759374ba8c12f43b8551c565e570cd492025276b7c228610a0517c700e047b3f227677 SHA512 4281f14588fe92c19a2372d615f1ec792a69432dd8bfb5ee4ef8f7ee0cf831f57812be6aacaf5f766ab7d660a0a998898ae318b31688d5a75972cd18342efe4d
 DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
 EBUILD langkit-2018.ebuild 1049 BLAKE2B 97dfaf5ffb20d46ff78315333a48d0984512bfdbd20eb0dab024df19494586cc94aed6e8c3030ec7998081ed05d2dd60a9a316af218c2e416a1e9a775d3a07e5 SHA512 cb5f04dd80f16dbb170f1d604ec96554670d85b3167a0e557201ff2aa06b5fb16e8a61e507fa6095208d399503cd531c07a137415804ab1c173f7d3731ea9695
+EBUILD langkit-2019-r1.ebuild 1143 BLAKE2B 95a66132de694f528a60c0aa8af1aea4a7b267529c4e00885639843050b3b920275a7aacd17e27159737369315bf1df94389627d71d5d35b304795f4222ba83c SHA512 239a6c78722014ba204b0324b90ea025b23340be85191e4348e191c1b292db64450b6641e86da50be4fd6e176475e2bd5c22c1a022a0ff21a872bf499d111078
 EBUILD langkit-2019.ebuild 1109 BLAKE2B 8f12cc6f7a8cacd2e04366b2a98a85e0fe89332afa44ae24d3862737fd649345725b9956e4056fd5fdf4c901b4482f035348dd61b9445c22c6bb06870d917e0e SHA512 fe581da40bcac53a3559caa0522ef1c7ad86156f6e58b29224e08996cc32a892b4a1a87bf13352f68e462dcf368aa5c47eb520971ee928ab77376768a1fc2784
 MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714
diff --git a/dev-ada/langkit/files/langkit-2019-gnarl.patch b/dev-ada/langkit/files/langkit-2019-gnarl.patch
new file mode 100644
index 000000000000..fb69768dc9de
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2019-gnarl.patch
@@ -0,0 +1,10 @@
+--- a/langkit/templates/mains_project_file.mako	2020-06-09 09:34:36.677265457 +0200
++++ b/langkit/templates/mains_project_file.mako	2020-06-09 09:35:30.569451995 +0200
+@@ -40,4 +40,7 @@
+       for Switches ("ada") use ("-E");
+    end Binder;
+ 
++   package Linker is
++      for Switches ("ada") use ("-lgnat", "-lgnarl");
++   end Linker;
+ end Mains;
diff --git a/dev-ada/langkit/langkit-2019-r1.ebuild b/dev-ada/langkit/langkit-2019-r1.ebuild
new file mode 100644
index 000000000000..1f7676ec30e0
--- /dev/null
+++ b/dev-ada/langkit/langkit-2019-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 multiprocessing
+
+MYP=${P}-20190510-19B8C
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-bindings[iconv,shared]
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/enum34
+	dev-python/funcy
+	dev-python/docutils"
+
+DEPEND="${RDEPEND}
+	test? ( dev-ada/gnatcoll-bindings[gmp] )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pyyaml.patch
+	"${FILESDIR}"/${P}-gnarl.patch
+)
+
+src_test() {
+	testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log
+	grep -q FAILED testsuite.log && die "Test failed"
+}
+
+src_install() {
+	default
+	python_domodule langkit
+	python_doscript scripts/create-project.py
+}
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 3b12f8b9dd56..45d9d08d0cef 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
-EBUILD libadalang-tools-2019-r1.ebuild 897 BLAKE2B a06ab3cc98c80a5de552ad231665ab6747d59121c4755ba9e5ed2397fab7d3b0193d2c2efc94ea40f7ab9882dddda586ddd42f3ce23a3703f1cfd31de889c52a SHA512 9074fb61e967bdabff40c2433c655a4d700a8c917590e9f11a4124e8948edadebb7f95ce049938382a84c98ba2ad4b0dd39e8ea4a3b1e16c238937732f0a4631
+EBUILD libadalang-tools-2019-r1.ebuild 914 BLAKE2B 7e8130996d44cc8e5071ae82f4fee9089519481f420af070ca1c3cd7c44c2ca7d418f87db60324d2a54e4edde914a473f1ea31ff9a9902cd5c5f5fa9ac2e530a SHA512 310b2139bb645a899125ef1306425a8ebaca9ca7efd633d06cd32f3d7edc84d7a14b73c7dab7a05fa02c78e4bd04991e9fb6c4626ef09ebcafb34b256c407140
 MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2019-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2019-r1.ebuild
index 3b28c79a0dcd..501150ff3d5b 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-2019-r1.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+RESTRICT="test"
+
 RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/libadalang[${ADA_USEDEP},static-libs]
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 5f9c2244f6f8..d368c7260588 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,4 +1,7 @@
 AUX libgpr-2019-gentoo.patch 1515 BLAKE2B 0641ed287592709ae58f554e14189d7bb44b864d48518198180e060189714ab3de8a18cba0af3ed92f45e7d72ae2029d1ed17a05de656935cd88d8d6910cd372 SHA512 1cd8225e7aec41a01327de1cd1e10e006a0d84c74345979b07157caa7188e4dd0159cf6f015f479452a068074eba76997b4f694f2975f578b34ffd1a4ac22684
+AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
+DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 EBUILD libgpr-2019-r1.ebuild 1407 BLAKE2B b3f88bd6116977c382ba3c8164ada748af412c48a51333b7a0a510bdfe4e0ac08b72cb2045ac976a67eef6847cdf84308bcec3dd6430c7a6e5aa74f334e99182 SHA512 a182e1dba2020ad168bd1711afbd55fd8382039f3a23bb09b54afdd3b77c4ff0c5893c064020044354e2148c9b6ca82217f1ee7fccb9f93240c4d0d5e022c630
+EBUILD libgpr-2020.ebuild 1513 BLAKE2B 46a4264d80145926786582055c0c7ba56aa6d1cd0579beecc289aa57a0ec2ffd9a26ed96af9292d47034c97d11b5787ff363ed087ebdc77bdffba2ac82d9aa5d SHA512 f218a0e76f506cf30bf63a12a9b305f9be4cc320db669ce6db566b1ae6f315cdae29acbda809533626fd61bb98a5e2960235e46d234d70b39d47ddf978942477
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/files/libgpr-2020-gentoo.patch b/dev-ada/libgpr/files/libgpr-2020-gentoo.patch
new file mode 100644
index 000000000000..d80fd83a355a
--- /dev/null
+++ b/dev-ada/libgpr/files/libgpr-2020-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-env.adb	2017-11-13 22:16:53.349083426 +0100
++++ b/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
+ 
+       end if;
+ 
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
new file mode 100644
index 000000000000..d502e034f8a1
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada toolchain-funcs multiprocessing
+
+MYP=gprbuild-${PV}-20200429-19BD2-src
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
+		-> ${MYP}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
+	!net-libs/grpc"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+QA_FLAGS_IGNORED=(
+	/usr/lib/gpr/relocatable/gpr/libgpr.so
+)
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	emake prefix="${D}"/usr setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_install() {
+	if use static-libs; then
+		emake DESTDIR="${D}" libgpr.install.static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake DESTDIR="${D}" libgpr.install.${kind}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 5b7894953cdc..e0ffe7b1faa0 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,6 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
+DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 EBUILD xmlada-2019-r1.ebuild 1755 BLAKE2B c99e364b968451b1264622ee0aad3212966aeb8ca6875736f55127f7e997ed301e5df3ddbb4d748d63c70e0e42d7a2742124f0cf06bec503b50d49ee958a9113 SHA512 894a656bf01a4a45554b9c3babea6e9f0ec042bc460a8efda31a53b8456d61d284dd05fdf601aecf396d4bda4aced610382394282f4af781298d0108eb4c378b
+EBUILD xmlada-2020.ebuild 2360 BLAKE2B 8948fb0f573086a5f770442b6d607a0f9dc110fe38978e7e70d784d998c1dbd9464728df971ad6480742e032a3d9b00135963354d94007c025faabf5fb8daa98 SHA512 e63afd18d8d4c57e0e3876e56e278f2264335184fae1a1488d856501ac5c494a50c8346b3b3761f7a70f2e36a93f369b648fa7f88c544bc05b7084ef2eeb8170
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
new file mode 100644
index 000000000000..cbc536004e3a
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada multiprocessing
+
+MYP=${P}-20200429-19A99-src
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${MYP}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
+
+QA_FLAGS_IGNORED=(
+	/usr/lib/xmlada/xmlada_dom.relocatable/libxmlada_dom.so.2020
+	/usr/lib/xmlada/xmlada_input.relocatable/libxmlada_input_sources.so.2020
+	/usr/lib/xmlada/xmlada_sax.relocatable/libxmlada_sax.so.2020
+	/usr/lib/xmlada/xmlada_schema.relocatable/libxmlada_schema.so.2020
+	/usr/lib/xmlada/xmlada_unicode.relocatable/libxmlada_unicode.so.2020
+)
+
+src_configure() {
+	econf --prefix="${D}"/usr
+}
+
+src_compile() {
+	build () {
+		echo gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS}
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_test() {
+	emake test
+	emake run_test | tee xmlada.testLog
+	grep -q DIFF xmlada.testLog && die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+
+	einstalldocs
+	dodoc xmlada-roadmap.txt
+	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
+	rm -rf "${D}"/usr/share/gpr/manifests
+}