gentoo resync : 22.05.2021

4 files changed, 20 insertions, 75 deletions

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