gentoo resync : 22.05.2021

15 files changed, 49 insertions, 475 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index a4b06c8b41a7..3cb5066fde92 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 9a7669af2769..df8c3f856a17 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,6 +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
 DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
-EBUILD gnatcoll-core-2019-r1.ebuild 1521 BLAKE2B c968eba624a3c5a1c2fda36f63e90a8f02c6f8aa072925447cac7051202165a5dd461b0aab0276b879a259322753d9dd2f54dffe07df211195581ac9c1149879 SHA512 373dde5f1ceee4264137f8ba60c2288754610f5609cbe3be0f45cb0182673377434dd3ad136e23bd261e6822bb7482d5847bb552471dab98219712fc243d8b9b
 EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B d7593e3a7c2ac7a5abbed1ad802872029f6cb374cb12ec5d04bd42c8d2efb5fb91a72b37b70d79a28f81e5f859e07ea273917ac5a317aef741e696fc7ed41339 SHA512 05f9861d9177680df0a5ad5994346e3c7890c45ca4f8ca2d4adc027281f3952a0929b4a8d782d10c2e4d5bf7c5b94a218dc74debe15851bce426cc385a8591bc
 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
deleted file mode 100644
index a1f0dc711f42..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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}-20190515-24AD8
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8ae231e87a8f1d425052
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="
-	~dev-ada/libgpr-2019[${ADA_USEDEP},shared?,static-libs?,static-pic?]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake install-relocatable
-	fi
-	if use static-pic; then
-		emake install-static-pic
-	fi
-	if use static-libs; then
-		emake install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 9e826eb3c045..2602fc9c9b58 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,14 +1,11 @@
 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 11688 BLAKE2B 698f203f1a4b6086b1cc20300506db4d10e62bbade354891404fb8ac1e828370992e6e85cdb6777c6d1ae5831a2a65a1f7483ccb8a3b065c83233162055c1c8d SHA512 ec9c99db6fcd26b6971754dbab9187e6589a1bbc2e513cb205b37519c21296a91678aac09833839256cd6558d9e228878e63e264658b32b1b9403e40a61f02ab
-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 1985 BLAKE2B 0a287f601a6ca3ebc4c50b361b8adb9e4aa5dd0e69423fb5021823b8465bca6d584c20ca50669bdafe4374c2e1f2e4e5b6c09bdf2400ee92b5521fed5e4bae8b SHA512 a70327ac3083fc432c74f3297c001f5e9c7425a9eefbfc54cd46aca16b8ddd704f73ac8d1c819dadd3a2412972a35c839c9a8b04b8530a7ef0b362e6c7c48da7
+EBUILD gprbuild-2017-r2.ebuild 1973 BLAKE2B 2cdba6aff85b0a25010e66c442a26e8f36e0c4007e6053205a21912cc99cf079c1035a291c8744a89cbe67b57953ee925f4463edf27c2c63a9438ae083d66d6d SHA512 af9505dc527d335e4dab40d8c532a886c008ee80ebfd00a190af91f828aa43dbb1fe8e9bec61070ac950d4fb9d232db4eb2a290ee626aeab42dd2040d7e206d8
+EBUILD gprbuild-2020-r1.ebuild 1944 BLAKE2B 89f815aa6ae31ecb34a58cadb246bd29f20c871b074b30b32999f57991e47346dead6133aeb2e61fcd3927cf775f752caec99f76070fe66806a8a3221673b8fd SHA512 624ad556d9c9349c983358032ba3b5a221104e462401e8c23776cb26318201ed2e9508d7e4cddbebfe8cbd8870d5e010f14205f6b02d130d79fee860ac8af626
+EBUILD gprbuild-2020.ebuild 1933 BLAKE2B ef95a4e2a94b502bbde2ea536ed846534fafc8ed0bc5138501118b668db31968019f61a523a250bfbc5207f1de79a99b9db2852a87b118a984d4685cf6dcc366 SHA512 5d2fcc275366e0408e2dbb14ef31ae00e6222610a98056376cf57f53f47b84725142352442fcf2c37c09bae05f78ba4bee347fed9b1b67349c2520ced36f35bf
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
deleted file mode 100644
index 352ff033b81b..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
+++ /dev/null
@@ -1,274 +0,0 @@
---- 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>
--
-   <!--    G77  -->
-   <compiler_description>
-     <name>G77</name>
-@@ -404,21 +309,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-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
index 8e9afef371c1..4b54ddf99782 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,10 +54,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	emake prefix="${D}"/usr setup
-}
-
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
 lib_progs="gprlib gprbind"
 
@@ -69,11 +65,11 @@ src_compile() {
 	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 gpr_imports.o || die
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
 	done
 	for lib in $lib_progs; do
 		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
+			-largs ${LDFLAGS} gpr_imports.o || die
 	done
 }
 
diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
index edba878042c2..d3ee4019b229 100644
--- a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
 
 inherit ada toolchain-funcs multiprocessing
 
-MYP=${P}-20190517-194D8-src
-XMLADA=xmlada-${PV}-20190429-19B9D-src
+MYP=${P}-20200429-19BD2-src
+XMLADA=xmlada-${PV}-20200429-19A99-src
 
 DESCRIPTION="Multi-Language Management"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
+	https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
 		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
+	https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz
 		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="${ADA_DEPS}"
@@ -45,10 +45,6 @@ src_prepare() {
 		|| die
 }
 
-src_configure() {
-	emake prefix="${D}"/usr setup
-}
-
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
 lib_progs="gprlib gprbind"
 
@@ -60,11 +56,11 @@ src_compile() {
 	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 gpr_imports.o || die
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
 	done
 	for lib in $lib_progs; do
 		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
+			-largs ${LDFLAGS} gpr_imports.o || die
 	done
 }
 
diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
index 9d14bd49683a..dd6ac51b2faf 100644
--- a/dev-ada/gprbuild/gprbuild-2020.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,10 +45,6 @@ src_prepare() {
 		|| die
 }
 
-src_configure() {
-	emake prefix="${D}"/usr setup
-}
-
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
 lib_progs="gprlib gprbind"
 
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 4067a63f024c..caedcd99b59a 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,5 @@
-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 1449 BLAKE2B ad317edefd6fa4cb5ac69b6b18d8ffb7e84abe8efd8813a7a5c8e67434d0a9f8d1ba7091a71650bf1014a1c62aa7b02b7bcd25e51b5942b23664a37708e2e984 SHA512 a825b5fff9a81411da1790faef490f103aebc728c03e8892b284cfe71b17494393ed47a145e79a3fb246a816cabfd45ecc29a72f3e69cbd7c8689e468069ac59
+EBUILD libgpr-2020-r1.ebuild 1484 BLAKE2B c56c62b9b1bf80318f39dceece21f7c404b10520b4ada53523b29f2d6debcc1b74cace1b6b631604ea30427d0e2df0938c8b53ceaf5e4671ebb2d066ca8bbcfc SHA512 5cf1f289af218b134fc65814ec52deab0620576f429e44939095fac3cca0e6fd9d636753266e3c7e96a28c921f4ae6dccf7875630bffb3721604c342767d7bb3
+EBUILD libgpr-2020.ebuild 1475 BLAKE2B 345e78dcabe1557b5b0a6b1307549dfcd6075e0796f422e671c69bac139c331f4d6a491331bb1c2497e6a5dd117c250499c5f3f32980193e920e9ae49a0dbaff SHA512 143b8264b3f0bfe837471c44cc50c6c63fe649b1963a7ecf6d82cb246f4bf461b6104167e6f59532b83e64cf0c464bd94b47dbfbd510cbf7893893ba4a22a804
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
deleted file mode 100644
index b7b9a2d3c870..000000000000
--- a/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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;
---- 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;
- 
-+   Last_Id     : Name_Id := Name_Id'First;
-+
-    procedure Get_Name_String (Id : Name_Id);
-    procedure Get_Name_String (Id : Unit_Name_Type);
-    procedure Get_Name_String (Id : File_Name_Type);
---- 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);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Enter;
- 
-@@ -427,6 +429,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Find;
- 
---- 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;
- 
-+      if Last_Id = Name_Id'First then
-+         Add_Name ("");
-+      end if;
-+
-       Add_Name ("a");
-       Add_Name ("b");
-       Add_Name ("c");
diff --git a/dev-ada/libgpr/libgpr-2019-r1.ebuild b/dev-ada/libgpr/libgpr-2020-r1.ebuild
index 7906a8d27d4f..9a3b8981ee3f 100644
--- a/dev-ada/libgpr/libgpr-2019-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada toolchain-funcs multiprocessing
 
-MYP=gprbuild-${PV}-20190517-194D8
+MYP=gprbuild-${PV}-20200429-19BD2-src
 
 DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
-		-> ${MYP}-src.tar.gz"
+SRC_URI="https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz
+		-> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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}"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
 
-S="${WORKDIR}"/${MYP}-src
+S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-	emake prefix="${D}"/usr setup
+	emake setup
 }
 
 src_compile() {
@@ -50,11 +51,11 @@ src_compile() {
 
 src_install() {
 	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
+		emake prefix="${D}"/usr libgpr.install.static
 	fi
 	for kind in shared static-pic; do
 		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
+			emake prefix="${D}"/usr libgpr.install.${kind}
 		fi
 	done
 	rm -r "${D}"/usr/share/gpr/manifests || die
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
index 8c5317a4755a..ab41d067b564 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,14 +21,15 @@ 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}"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
 
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-	emake prefix="${D}"/usr setup
+	emake setup
 }
 
 src_compile() {
@@ -50,11 +51,11 @@ src_compile() {
 
 src_install() {
 	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
+		emake prefix="${D}"/usr libgpr.install.static
 	fi
 	for kind in shared static-pic; do
 		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
+			emake prefix="${D}"/usr libgpr.install.${kind}
 		fi
 	done
 	rm -r "${D}"/usr/share/gpr/manifests || die
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 598fca89bbc1..d7f73259c6af 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,5 @@
 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 2034 BLAKE2B 807fbf7d7da746f5fbd11d9a1ff5b6405f4d2360caffb2d1322c21d1634c442b4185d6db449a64fe36bc32f0489e7727b4fbc997ad6a42b79aac5bcb3cd0ced5 SHA512 421e18b834a4211b61a40839660e6767d665c6042ac0eba2e163cf8d5e10024f187ebc1acbfcf4f880c7a3efc2f9fec67d16ea0f7b3bfe9b038ff70cbb3a28ac
+EBUILD xmlada-2020-r1.ebuild 1821 BLAKE2B 644ea00091274003ab0a87a6bffdefd88579ffee3a60e5e8d07a8737585ed845b51855688383db498221f76d99b868f26dcc69a74a26df98ce138c829e158376 SHA512 01631796a796f7f17dea07dbe03c517da5a80104bc894ba388b5db19be28f3d3ee227d40d7b32b7be2e686b38ddc22d51e8fff02ec9dd7dea23bc818a375f5c8
+EBUILD xmlada-2020.ebuild 1986 BLAKE2B cdf92efc79b033ec8071a3464303c538e950e03cd24543b8ab054f698231a40af742607d7dd2ec9601543d0001a5192d762d72cfe31df109b8dd343644f030c8 SHA512 603a5f3ef31f01f138b0d5f59dce45fc7ae0f606cc094dbbac228569f9fec602b01ab38353c0652b72c2a97f858b9416106cf7f8bc96b4a50010430cc44f4546
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2019-r1.ebuild b/dev-ada/xmlada/xmlada-2020-r1.ebuild
index a08b9acda13c..c1d2eca395dc 100644
--- a/dev-ada/xmlada/xmlada-2019-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2020-r1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada multiprocessing
 
-MYP=${P}-20190429-19B9D
+MYP=${P}-20200429-19A99-src
 
 DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
-	-> ${MYP}-src.tar.gz"
+SRC_URI="https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${MYP}.tar.gz
+	-> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
@@ -24,18 +24,15 @@ RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-S="${WORKDIR}"/${MYP}-src
+S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	econf --prefix="${D}"/usr
-}
+PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
 
 src_compile() {
 	build () {
 		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
@@ -76,5 +73,6 @@ src_install() {
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
+	rm -rf "${D}"/usr/share/examples
 	rm -rf "${D}"/usr/share/gpr/manifests
 }
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index 4fe97505e826..6092f980feaf 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,10 +28,6 @@ S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
 
-src_configure() {
-	econf --prefix="${D}"/usr
-}
-
 src_compile() {
 	build () {
 		echo gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \