3 files changed, 9 insertions, 72 deletions
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 373697c1d313..7eb0c994a867 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,6 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
-DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
-EBUILD libgpr-2020-r1.ebuild 1463 BLAKE2B 4e9c08c8149d25ff2ce9adaac7c6ca70e9ea7eb37a5230d8b3429c8c82eacd738f93c1d49d4d06ced4a501d7f513ad0eeae489d9cd6f47a4762f67bbe6545747 SHA512 b297de3578231bc995acb4cddc52b10afa7489e8fac4f2f4cd87de3c8248e80e62f5cb59ce600626e3e8a17089e1dee5f871096189dc748dd936b4ec31a25e1e
-EBUILD libgpr-2020.ebuild 1451 BLAKE2B 7d79f56f139c6043b036528efb8bd160245f9f8786d003f99b5f93974a9e42c61d16cc107cc494500174916778f8c2b709c6d08dfbb985ed70ee6283f5adbbe8 SHA512 b50db347e1d97c5cf0b2c3309be7a992905eebd0c97087cc065189990df3db149c3950c17af43ec4dfa4e88158fb30d0e4b78860a16784ae564a1c8e652b336a
+DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 EBUILD libgpr-2021.ebuild 1494 BLAKE2B be464001890e3ae92f0942ee6f7dbe9f95236236523d2aaaae932dc7924d0470c1fa5af72d651ba6fbdf6b7bdaec1b7f5b4c24fd8d2fbd07ef02c9e9fa632cc3 SHA512 958a45707b2706d25da8cbc6e95223ddd3775fc8e1173b471b9280dbaacf16c33742b68bd43f18625ff698f894c0e380ad66b9ab4096a04666b8e77c918a2513
+EBUILD libgpr-22.0.0.ebuild 1427 BLAKE2B 19b871994f92f324610bddc71b7ca0a124de1c6a4b25b4995f870bf4556c5d5ac20fc263af1bbc61fd5696ede4886e34af9fefadd052de29e4cf0f748d5bf3d7 SHA512 eb170f793c8008e7629fdd2489e3c2eb39c7e8a563f396db7e3acdb613a16863593814f380d8afc99b751ecc4a23e0f1a8196855be782b2015d2795caa0f8ee6
 MISC metadata.xml 940 BLAKE2B aaa252e5e7455d29591e45927ccbefc9f7a21367af3f1da9a9341695f722dc6cfbf7f52ea6630e392439684fc8ecba06f2de6372c6624c2f53b2712533772490 SHA512 8bc90bfb6ae6ed3847b8809ef1e1d35ec8a1abf4a0b0353dac86c62c5fe5593a9523984988b723a3f9c9424285b2ab30bd45ef3b746956bc8be7751b63a35704
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
deleted file mode 100644
index f1f677ae6017..000000000000
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 )
-inherit ada 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}
-	|| ( shared static-libs static-pic )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake 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 prefix="${D}"/usr libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/libgpr-2020-r1.ebuild b/dev-ada/libgpr/libgpr-22.0.0.ebuild
index 7da344e05d7a..c0abd728513a 100644
--- a/dev-ada/libgpr/libgpr-2020-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-22.0.0.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_2020 )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
-MYP=gprbuild-${PV}-20200429-19BD2-src
+MYPN=gprbuild
+MYP=${MYPN}-${PV}
 
 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
+SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${MYP}.tar.gz"
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
-RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
+RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
 	!net-libs/grpc"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
@@ -26,7 +27,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}
 
 S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
 
 src_configure() {
 	emake setup