gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-ada
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
61 files changed, 539 insertions, 1439 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 0e64cc2df83b..5dc9f89d3e34 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
deleted file mode 100644
index 9cb377af475e..000000000000
--- a/dev-ada/asis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
-DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
-EBUILD asis-2019-r1.ebuild 1207 BLAKE2B 02002b6d758c758a305a96538bcf8dbc17a2241b370e25340ab21a3e348e5f6811b465cc2c29c83d81ec898fe6ff003c879cadcefbf8324ae318033b8fe00702 SHA512 b4cb2635493cf9b85037d5568a7ae568b9d295a46db9e4376ffa2d25f00d8164614a2a5ed5081e28da51cdd23d50f59f9b2cbe9b8323a70a50d90351f9ae668b
-MISC metadata.xml 508 BLAKE2B 15964fe3bd9f54ebeb251f7cda5556a3c3da9f9f5c5568b8ad46e647157beee7e8a49981a94e312515696099335912cd775662a99cc1c8924195c39a9f398aec SHA512 6edf9a3b75e80f055d05280f5cab76c16f97f5e2f9c726d59f1069dbb60ab0af04c56a8d4d28e265aa48a581461f65fc2df9f763d7d831bc9bda4745b1eee1d6
diff --git a/dev-ada/asis/asis-2019-r1.ebuild b/dev-ada/asis/asis-2019-r1.ebuild
deleted file mode 100644
index e7cccc68ec91..000000000000
--- a/dev-ada/asis/asis-2019-r1.ebuild
+++ /dev/null
@@ -1,51 +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=${P}-20190517-18AB5-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf849031e87aa2cdf16b10
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-ada/gnat_util[${ADA_USEDEP}]
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	mv "${D}"/usr/bin/gnatpp{,-asis} || die
-}
diff --git a/dev-ada/asis/files/asis-2017-gentoo.patch b/dev-ada/asis/files/asis-2017-gentoo.patch
deleted file mode 100644
index 3c3ab73618fc..000000000000
--- a/dev-ada/asis/files/asis-2017-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- asis-gpl-2015-src/Makefile.old	2017-01-03 13:59:38.106788092 +0000
-+++ asis-gpl-2015-src/Makefile	2017-01-03 14:01:43.735605615 +0000
-@@ -10,18 +10,21 @@
- 
- .PHONY: all
- all: setup-snames
--	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) -XGNSA=$(GNSA) \
--		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) -XGNSA=$(GNSA) \
-+		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr \
-+		-cargs $(ADAFLAGS)
- 
- .PHONY: tools
- tools: setup
--	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
--		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
-+		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr \
-+		-cargs $(ADAFLAGS)
- 
- .PHONY: toolsdev
- toolsdev: setup
--	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
--		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=toolsdev build_asis.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
-+		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=toolsdev build_asis.gpr \
-+		-cargs $(ADAFLAGS)
- 
- # The setup target re-generates 4 generated Ada files. We avoid changing the
- # timestamps of unchanged files, to avoid triggering recompilation of
-@@ -34,7 +37,8 @@
- 
- .PHONY: setup-snames
- setup-snames: gnat/snames.ads-tmpl gnat/snames.adb-tmpl gnat/xutil.ads gnat/xutil.adb
--	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) gnat/snames.gpr
-+	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) gnat/snames.gpr \
-+		-cargs $(ADAFLAGS)
- 	cd gnat ; ./xsnamest$(exe_ext)
- 	if cmp --quiet gnat/snames.ns gnat/snames.ads; then \
- 	  echo "snames.ads unchanged"; \
-@@ -52,7 +56,8 @@
- .PHONY: setup-factory
- setup-factory:
- 	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) \
--		tools/tool_utils/generate_factory.gpr
-+		tools/tool_utils/generate_factory.gpr \
-+		-cargs $(ADAFLAGS)
- 	cd tools/tool_utils ; \
- 		./ada_trees-generate_factory$(exe_ext)
- 	if cmp --quiet tools/tool_utils/ada_trees-factory.ns tools/tool_utils/ada_trees-factory.ads; then \
diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml
deleted file mode 100644
index bc4e76a04d38..000000000000
--- a/dev-ada/asis/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		ASIS is a library that gives applications access to the complete
-		syntactic and semantic structure of an Ada compilation unit. This
-		library is typically used by tools that need to perform some sort of
-		static analysis on an Ada program.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index fac031cc8a1c..cc6637a63815 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,6 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
 DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
-EBUILD aunit-2020.ebuild 1152 BLAKE2B 02f0e97a436b42824cc3232faeb655669be1834ba43cfdb5b163e1bd5f738e25e8a8f86c01740d6ae3f0367fdc1280607c606abccd2a101452a97880b2282ea2 SHA512 6612fb1260c5ddba710d5f1c450887098d38b6be78edee3bfa9a45f2264b7a404573313fe48747fa65c5478f7fc0d8e53effac55a710b09698c1437a0fefa523
-EBUILD aunit-2021.ebuild 1200 BLAKE2B 0d1f32cda4c0b5cfe40feb02c614a266abffbabf3ea9eb822b698ed79850385739153eabbbe65f7b283800feab59e1f568ffdfcb256605abcca03c57cbf999fa SHA512 e4828ffb77d40ed4e6ce5a03062f3859071437cff1785b657afef55a22b32b2fceb1e3ed7321d7fc2f9f7c3eb36c50c8c5c1f103b509f01da648e1944e4ca6c8
+DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
+EBUILD aunit-2021.ebuild 1190 BLAKE2B e8d14f637bb9a81854016d234ba37621dc1d445cef33b9b9b6fce55531522db424267095fcf4e1fa27d1512d1f58a41fee793a97bd516df5d576392d495acce4 SHA512 40201e1765a2d8bb568543c05b3a4181877cbc03c1711b90f8b45c5447cfdc183a8e722cb92acd74ceae8b44afef60e87a6220a9a287e9d48d963561ee496024
+EBUILD aunit-22.0.0.ebuild 955 BLAKE2B 32eb431a1f3d4b866bd8a47a7a9bf919fbdb636638c724a8384c4f80d21e0843e5e2b991a428a48e7da6cf4e2d6aa7dff8f4007596ec5c794c5e6a88afca86ad SHA512 12185559a5fafe5cfad83b3ad2c9ba5f3d0904e946867fd61c70905e57460d18654272e6cc2c6e78c42784fef2e9198ea275d47289595975749eda3aafd9da75
 MISC metadata.xml 765 BLAKE2B 2c88223f93f67e6e6568faf85d8c7319f06d238dd7697bd0c0c505100a398445b9eb4853e0b270f9422215d16f9c24144cdc5385416b8a5160342921f3fdb1d8 SHA512 6aa62fa9278a592b7a2d175ef785e9a6d9da6d39f9e0a1019d8c1b2d1a483c894f4b9989ec2b194ec42c70d159ff06040cdc4a4f3c285566db697641a5f3cbff
diff --git a/dev-ada/aunit/aunit-2021.ebuild b/dev-ada/aunit/aunit-2021.ebuild
index cddcfaa703b0..3bf9f54c6dc4 100644
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ b/dev-ada/aunit/aunit-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19DC5-src
diff --git a/dev-ada/aunit/aunit-2020.ebuild b/dev-ada/aunit/aunit-22.0.0.ebuild
index af6cc9bb9aa5..78a102da278f 100644
--- a/dev-ada/aunit/aunit-2020.ebuild
+++ b/dev-ada/aunit/aunit-22.0.0.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
-MYP=${P}-20200429-19B6C-src
-
 DESCRIPTION="Ada unit testing framework"
 HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
@@ -24,8 +22,6 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}
-
 PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_compile() {
@@ -35,8 +31,6 @@ src_compile() {
 src_install() {
 	emake INSTALL="${D}"/usr install
 	einstalldocs
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-	rmdir "${D}"/usr/share/doc/${PN} || die
 	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
 	rmdir "${D}"/usr/share/examples || die
 	rm -r "${D}"/usr/share/gpr/manifests || die
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 43d564bfb468..2e194a6af58d 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,7 +1,8 @@
 AUX aws-2020-gentoo.patch 450 BLAKE2B db6858688b2a9237efea0bf82f39d62855a0d126f3be7174981700bf4964e053c0715cd2e5f9f0cc98c5a884a89af47b7f83e6a7ce89d491073bf4c2370ee91f SHA512 80862c07fec63999ff531981c843e463888bb2f78310e28fa9ade6814553cb3cadad548d896a643a819bd5904b7056486ff372ad101c6919919fcc6895f14d02
-DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
+AUX aws-22.0.0-gentoo.patch 1120 BLAKE2B 4cb809bd0c1771bbd15ab1e70ebb7c0f8d523c6f167f5e72906abef73c492889ce75de7d40d781f9e69b97a82eccebe5cb3bb2df40c387a7b5321c4dcbb0ed03 SHA512 a272aa69d2d19b2cf79f2eb42e81a0659dfad1cf94b5d44c032243c30774fa8f428eb8512c9b8667297429d50c00bd1484c360cded113c10957b53f42b85611a
 DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
-EBUILD aws-2020-r1.ebuild 949 BLAKE2B 4e1c7cb3283d45871e84b3eb13d92e2dcf1a20ae3bf49c69fe1e028fa9f570e18e62238f62070c685695b5ef2ce1113caf3b66e8dec1a3a3cea0e03a04c07b64 SHA512 c72b085268de15d8373f1bb270f9171e483056532f90e79d1ae259943baa0354f37a6f31ee4fa11c8dc950cae830c689205451cc7990a4ead4a7176e78b2253c
-EBUILD aws-2020.ebuild 900 BLAKE2B 4e8e25a6008bab2738c23883c55680c99e068604f00f6f1900bb03e410295c6a591fc8ddc728d19f376c2539f0d6f31bce4bcb438c3b349b9b50bccdf55f18d9 SHA512 125aa34b8f5046cdd56e7111dbd2a53bd39b46ee2e6ead82fdbf04d0e62d1d62d570494fc6fb803e8f8864b443f8c1ea8b14b356be2b8e518b1aa1951ec8db60
+DIST aws-22.0.0.tar.gz 2356886 BLAKE2B 3f0a36ce23ed50855dddeb8ecc1888d51c4c7368990124c3d55f240c8b07cc72b59b4c172cad05d282de0ff4cd348ff912315d8cfad1582b2bbb049ad5fcea12 SHA512 6baeff7fa8012cb155bd3964177368f4ccd0bb367abaa66d44c0ffbcd4145f3930fe2e0fe5cfbeb41adccb7395d46c49acffc502878e9b83ecb5e2de597b897b
+DIST templates-parser-22.0.0.tar.gz 224473 BLAKE2B c0c0d6feada3d0e54ee0456b48979e1f436c2bdf7210aeb061640c3128294b243ac21c29ef538b055871315b567640e37782b28057954bf4d43473d372c7d983 SHA512 9ce512e41bf3e682f1671d3ed931830d2279da9bef58f9997e430f4852cebb6119cabf0fde7dfaf999586155c13472ab258a0e0f3d885522aeb86d8acb4a2d4f
 EBUILD aws-2021.ebuild 944 BLAKE2B 9380715d4fd6011d36f87675cc1a5ad9ffc4eeae9218636068c35e7f74cd1aa33830e9eac4b8cca8c9eeb76f2dceb2bb2c6a7cc9ce3b0712253f4fb6c2fed967 SHA512 97dc2eebf62c2c25ed1ded30eb536f152199192aed8dcba8939de8c747b62ae1ede6ca3380b3bedebe399ffb7473b469674464cd6ee9d252391600dc16df746f
+EBUILD aws-22.0.0.ebuild 1308 BLAKE2B 42063749241f3c6d53abb70ccb56cedee454d62725fad8e552f413775832274de42d90f59c4afb6687314d336b589a9b9f958025bf9037615205e2fb408ded24 SHA512 1d663bbb6ff420f4b63dccedb58bdd8dbd5cfc12af04306097f5e2af0af1eae7088f765dbb54e8d676ed13bf076296ed5e90d4b253a2b7c146fd1e4a81628b76
 MISC metadata.xml 660 BLAKE2B 0b78458e2f5278c613f8af931d3b6e3f14475444eff8337c9b64fef5bd3d3bf62ac1feea01c29013fdeecbf3d5a24c709522d4dbee55f3613542bd91dc9e2e67 SHA512 3c8c25d7cb779b766d0be613563eaa57463e574f41d0accf912f05ebc9e6e29b28062b1505af007c898ac2e329913762dfe2c718cd8f811c850e447cb122dc9d
diff --git a/dev-ada/aws/aws-2020-r1.ebuild b/dev-ada/aws/aws-2020-r1.ebuild
deleted file mode 100644
index a831ab9427ea..000000000000
--- a/dev-ada/aws/aws-2020-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0429-19A9F-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=c1b0f6863d1a30acaee1df022a65ad11d5737a84
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-2020.ebuild b/dev-ada/aws/aws-2020.ebuild
deleted file mode 100644
index c566cbadf06d..000000000000
--- a/dev-ada/aws/aws-2020.ebuild
+++ /dev/null
@@ -1,42 +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=${P}-20200429-19A9F-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-22.0.0.ebuild b/dev-ada/aws/aws-22.0.0.ebuild
new file mode 100644
index 000000000000..2ad9894c2821
--- /dev/null
+++ b/dev-ada/aws/aws-22.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz
+	https://github.com/AdaCore/templates-parser/archive/refs/tags/v${PV}.tar.gz
+	-> templates-parser-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs]
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	rmdir templates_parser || die
+	mv ../templates-parser-${PV} templates_parser || die
+}
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		ZLIB=true SOCKET=openssl \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRINSTALL="/usr/bin/gprinstall -v"
+	einstalldocs
+}
diff --git a/dev-ada/aws/files/aws-22.0.0-gentoo.patch b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
new file mode 100644
index 000000000000..868345504240
--- /dev/null
+++ b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/Makefile	2021-11-18 21:58:13.144841987 +0100
++++ b/Makefile	2021-11-18 21:59:15.974876738 +0100
+@@ -185,10 +185,9 @@
+ #  build
+ 
+ build-tools-native:
+-	$(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
++	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
+ 
+ build-lib-native:
+-	$(GPRBUILD) -p $(GPROPTS) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
+ endif
+@@ -259,15 +258,15 @@
+ 	--build-var=LIBRARY_TYPE --build-var=AWS_BUILD
+ 
+ install-lib-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_DEFAULT) \
+-		--build-name=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
+ 		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
++		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) ssl/ssl.gpr
+ endif
+ 
+ install-tools-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_STATIC) --mode=usage \
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_SHARED) --mode=usage \
+ 		--build-name=$(DEFAULT_LIBRARY_TYPE) \
+ 		--install-name=aws tools/tools.gpr
+ 
diff --git a/dev-ada/e3-core/Manifest b/dev-ada/e3-core/Manifest
new file mode 100644
index 000000000000..ec93792eb752
--- /dev/null
+++ b/dev-ada/e3-core/Manifest
@@ -0,0 +1,5 @@
+AUX e3-core-22.1.0-distro.patch 1143 BLAKE2B ebe7fd0b37ed6dbbe506f4bb86aa8b3bbf59b5e1475b65db07b2a8b28ab86f30998f381c976e9b1eb0f5222171a3c6a592bf7d6a3364a0a0a6c1eb307c0261ef SHA512 16ba2640ecb260702272da1d87b92ce779459da47ef4c1cdc6ad4f5fe98740501df88bc2ef849c55f0eb482a99ab376876af1f5a38a02fe0aeef085c190ecba0
+AUX e3-core-22.1.0-test.patch 1057 BLAKE2B 4a8d5ea01e2cd51c297f58db18a25844197bdbaa725260de3eeace06dc3afa74332f10df685947b8bb21e4554920c72eb2c5d08d334d2f77989241510ee00098 SHA512 0771e4d08c611c3b39a695830a30b279470a97e0ccc4c2d6ef0ed184bcbc784240231a93942b89919b4718ed8ede1d3e7b9ff9acf66b547b369fa702cc05f384
+DIST e3-core-22.1.0.tar.gz 442938 BLAKE2B b207a09d8b97f707e8b3a6255b9ef7161e40f716a8bcd853923df2310f2413689ddadf9db98e90f103f8a93813eec20bf462e47541d6f409df5966b0b1d9fca7 SHA512 e887fea2140bb42ebc9d8596b87dc077f8da6a0ed4178081aedaaf3f462b76a431c53e6e56bcb7efee2ed3854c50d7b989819b469b394977d6d25f644368f12d
+EBUILD e3-core-22.1.0.ebuild 1291 BLAKE2B 2f8fa7f274a58af1bd73c6350b3747b9634401613cdcdb02227979e5b800935d2fd98d1042ccbe856d437ca99e494ace29f6b65223a5dd0241859f3fccde6b77 SHA512 3c7762983509600465a6470de4e3586faf29b3740b3e7d785887c49c5f1c36873d5f509967634b509b0942370702a5c6bf62ccb3c6848293251062c8e4c7ca58
+MISC metadata.xml 1257 BLAKE2B c5170ed783bde8d288632069c3e5496d50dfd77a0f7fb62e00964660bd7b3c482509bdf8983af16d1aa7be6bd9ee20708711fc688f002d5bace078c93c4ed212 SHA512 d7fd1018cb701d777e3246fe91b018ea25ebd5bc641e6897d683dee0fcfdd1841d13f9701212d15e81cde531f8e26d10cc156c9ed47125dfbcbc6bd5bacf18af
diff --git a/dev-ada/e3-core/e3-core-22.1.0.ebuild b/dev-ada/e3-core/e3-core-22.1.0.ebuild
new file mode 100644
index 000000000000..80324535319e
--- /dev/null
+++ b/dev-ada/e3-core/e3-core-22.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Ease the development of portable automated build systems"
+HOMEPAGE="https://www.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	!app-editors/e3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/httpretty[${PYTHON_USEDEP}]
+		dev-vcs/subversion
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-distro.patch
+	"${FILESDIR}"/${P}-test.patch
+)
+
+distutils_enable_tests --install pytest
+
+src_compile() {
+	local PLATFORM=x86_64-linux
+	rm src/e3/os/data/rlimit* || die
+	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} tools/rlimit/rlimit.c ${LDFLAGS}
+	distutils-r1_src_compile
+}
diff --git a/dev-ada/e3-core/files/e3-core-22.1.0-distro.patch b/dev-ada/e3-core/files/e3-core-22.1.0-distro.patch
new file mode 100644
index 000000000000..05942a8f8e7d
--- /dev/null
+++ b/dev-ada/e3-core/files/e3-core-22.1.0-distro.patch
@@ -0,0 +1,30 @@
+--- a/src/e3/os/platform.py	2021-11-23 08:50:05.077801145 +0100
++++ b/src/e3/os/platform.py	2021-11-23 08:50:40.646227489 +0100
+@@ -85,12 +85,12 @@
+ 
+         # Fetch linux distribution info on linux OS
+         if cls.uname.system == "Linux":  # linux-only
+-            import ld
++            import distro
+ 
+             cls.ld_info = {
+-                "name": ld.name(),
+-                "major_version": ld.major_version(),
+-                "version": ld.version(),
++                "name": distro.name(),
++                "major_version": distro.major_version(),
++                "version": distro.version(),
+             }
+ 
+         # Fetch network interfaces
+--- a/setup.py	2021-11-23 20:36:57.056478696 +0100
++++ b/setup.py	2021-11-23 20:36:03.371303043 +0100
+@@ -18,7 +18,7 @@
+     platform_string = ":sys_platform=='%s'" % p
+     extras_require[platform_string] = ["psutil"]
+     if p in ("linux", "linux2"):
+-        extras_require[platform_string].append("ld")
++        extras_require[platform_string].append("distro")
+ 
+ # Get e3 version from the VERSION file.
+ version_file = os.path.join(os.path.dirname(__file__), "VERSION")
diff --git a/dev-ada/e3-core/files/e3-core-22.1.0-test.patch b/dev-ada/e3-core/files/e3-core-22.1.0-test.patch
new file mode 100644
index 000000000000..84250e1379c8
--- /dev/null
+++ b/dev-ada/e3-core/files/e3-core-22.1.0-test.patch
@@ -0,0 +1,28 @@
+--- a/tests/tests_e3/main/main_test.py	2021-11-23 21:43:12.376707596 +0100
++++ b/tests/tests_e3/main/main_test.py	2021-11-23 21:45:08.653856916 +0100
+@@ -15,6 +15,7 @@
+     )
+ 
+ 
++@pytest.mark.xfail(reason="does not work on sandbox")
+ def test_main_config():
+     os.environ["E3_CONFIG"] = "e3.toml"
+     assert "pretty: True" in e3.os.process.Run(["e3", "--show-config"]).out
+--- a/tests/tests_e3/sys/main_test.py	2021-11-23 21:51:32.633747623 +0100
++++ b/tests/tests_e3/sys/main_test.py	2021-11-23 21:51:43.977567183 +0100
+@@ -10,6 +10,7 @@
+ import pytest
+ 
+ 
++@pytest.mark.xfail(reason="does not work on sandbox")
+ def test_filtering_import():
+     script = """
+ import a, b, c
+--- a/tests/tests_e3/system/main_test.py	2021-11-23 22:16:33.776844819 +0100
++++ b/tests/tests_e3/system/main_test.py	2021-11-23 22:17:38.292817661 +0100
+@@ -4,5 +4,3 @@
+ 
+ def test_main():
+     e3_tool = e3.sys.python_script("e3")
+-    assert e3.os.process.Run(e3_tool + ["--version"]).status == 0
+-    assert "Everything OK!" in e3.os.process.Run(e3_tool + ["--check"]).out
diff --git a/dev-ada/e3-core/metadata.xml b/dev-ada/e3-core/metadata.xml
new file mode 100644
index 000000000000..bfc1b11cee7c
--- /dev/null
+++ b/dev-ada/e3-core/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		This present project (e3) is a Python framework to ease the
+		development of portable automated build systems (compilation,
+		dependencies management, binary code packaging, and automated
+		testing).
+		The e3 framework is split across multiple Python packages named
+		e3-name and sharing the same namespace: e3.
+		e3-core contains several packages that help writing portable code
+		running on both Windows and UNIX systems. It also contains Anod, a
+		build and test driver based on Anod specification files that handle
+		dependencies management, create binary packages, and execute test
+		suites. The driver inputs are Python files ending with .anod called
+		Anod specification files describing:
+		dependencies (either for building, installing, or testing a product)
+		required Git or Subversion repositories
+		list of action to execute for each of the Anod actions or primitives
+		(build, install, test, …)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">adacore/e3-core</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ada/e3-testsuite/Manifest b/dev-ada/e3-testsuite/Manifest
new file mode 100644
index 000000000000..fac713ae172c
--- /dev/null
+++ b/dev-ada/e3-testsuite/Manifest
@@ -0,0 +1,3 @@
+DIST e3-testsuite-24.0.tar.gz 103595 BLAKE2B c41360aeb9243810fb3fe26c567430365c09823430927cb1e5e04e4fc0e3b28727a7fe3e286b1fe135ce32e2cc85821994804695a23f6fddcfc4f4bb8f57661b SHA512 1460b3611b863d0311960702fd684612f32cd876fa1864feae39b16251677ee25f4f29c1f749d2eeb93d0306dc3c130e424e11c6d5561f01482a065f239de170
+EBUILD e3-testsuite-24.0.ebuild 529 BLAKE2B d638e6ccaf6727f7d14bd7b2a1d9e6118ff52e8c00cc02636a2bb4cb39f518cfa99aa8c0b4a33cb0ac9f0720365e6d012a3535ff62df303e1895d950ef66f91c SHA512 5ea636ceb1ec7f1d563d04bda214355816942a1c35bac2acfb4efbc494ca08cbf17894c13214936e49f7589e3e6026dc693359b021202b2f0eb454259deb9ff3
+MISC metadata.xml 664 BLAKE2B f7ac98a78cd187aa5e84b564d59982bfeb21d992a309803fcd747242e9373d7aa5cfa648a06ae5442c843f136a76929c34e5c28ea03c6bdd1d94e6c1a10ee226 SHA512 62123c662e3dc67a8d55d5ea6e88207c63df0dc4a0dd314c2e9f708360485997613913a54617c24adf9b26caf4202c04c069fa8bfe8ee3ba906e245da311a40b
diff --git a/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
new file mode 100644
index 000000000000..c6b5d11be99f
--- /dev/null
+++ b/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Generic testsuite framework in Python"
+HOMEPAGE="https://www.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+distutils_enable_tests --install pytest
diff --git a/dev-ada/e3-testsuite/metadata.xml b/dev-ada/e3-testsuite/metadata.xml
new file mode 100644
index 000000000000..f3087502d4c9
--- /dev/null
+++ b/dev-ada/e3-testsuite/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		This present project (e3) is a Python framework to ease the
+		development of portable automated build systems (compilation,
+		dependencies management, binary code packaging, and automated
+		testing).
+		The e3 framework is split across multiple Python packages named
+		e3-name and sharing the same namespace: e3.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">adacore/e3-testsuite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
deleted file mode 100644
index 0224f2d6377f..000000000000
--- a/dev-ada/gnat_util/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0dbba2280ecee060a690f8c06104a7224192045bf4b43d2028cb25d9b336e085968169b3d79d10767ce0694ec8b042 SHA512 b1ba5dbbfa86c943143e570a3ac871935e1e6f6104883abc56d1f8b9395d0e2b5e6317356b309497c6fa942e30f25f2f2f1b8cfd7cf801f40b5b1b64b036154b
-DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
-EBUILD gnat_util-2019-r1.ebuild 1243 BLAKE2B 1eae3fa58005af2b3f61c606f894433882f1daad8b38a96316afc0ec843f506b86aad3016eada750bcf33f9ab2fff6c9d60f1a2a0ee54bb01c4336dad2b4a75d SHA512 20a84b7a46541e838d476ececd6b0825e7fc8e335df44ba5e806730ade5933b0aad4909d9e1cbbb37c8fc7122444bfce1c3a7964233e7e71be44e08a41a8380e
-MISC metadata.xml 922 BLAKE2B 2c9337d3cb0b8289bf47ec558e1aa8199fc524d02a7e4fa50fe2e4cb50d8612a4c31ba593448c743d5bb28a63b47a801f4cf3c2bc25ffdfef4b93a403028e4f1 SHA512 00f10156833dad1e5e5768909aef76e50ab18c19a2ea16e84051370912461722017986da73dd7c6a595c89c26421cd8013c4c4011a8976bdb3263e12fdf30722
diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
deleted file mode 100644
index 59cb7cf66467..000000000000
--- a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- gnat_util-gpl-2014-src/Makefile.old	2016-12-28 09:56:49.378950217 +0100
-+++ gnat_util-gpl-2014-src/Makefile	2016-12-28 09:57:12.301562519 +0100
-@@ -21,21 +21,30 @@
- 
- .PHONY: all
- all: generate_sources
--	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=static -Pgnat_util -p
-+	$(MAKE) build-static
- ifeq ($(ENABLE_SHARED), yes)
--	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=relocatable -Pgnat_util -p
-+	$(MAKE) build-shared
- endif
-+	$(MAKE) build-static-pic
-+build-static:
-+	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-+		-XLIBRARY_TYPE=static -Pgnat_util -p -XCC=${CC} \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
-+build-shared:
-+	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-+		-XLIBRARY_TYPE=relocatable -Pgnat_util -p -XCC=${CC} \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
-+build-static-pic:
- 	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=static-pic -Pgnat_util -p
-+		-XLIBRARY_TYPE=static-pic -Pgnat_util -p -XCC=${CC} \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- 
- .PHONY: generate_sources
- generate_sources:
- 	$(MKDIR) $(SRC)
- 	$(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC)
- 	(cd $(SRC) && \
--	   gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
-+	   ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
- 	   ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb)
- 	$(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb
- 
-@@ -47,6 +56,12 @@
- 
- .PHONY: install
- install: install-clean
-+	${MAKE} install-static
-+ifeq ($(ENABLE_SHARED), yes)
-+	${MAKE} install-shared
-+endif
-+	${MAKE} install-static-pic
-+install-static:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=static \
- 		--prefix=$(prefix) \
-@@ -54,7 +69,7 @@
- 		--lib-subdir=lib/gnat_util/static \
- 		--project-subdir=lib/gnat \
- 		--build-var=LIBRARY_TYPE --build-name=static -Pgnat_util
--ifeq ($(ENABLE_SHARED), yes)
-+install-shared:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=relocatable \
- 		--prefix=$(prefix) \
-@@ -62,7 +77,7 @@
- 		--lib-subdir=lib/gnat_util/relocatable \
- 		--project-subdir=lib/gnat \
- 		--build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util
--endif
-+install-static-pic:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=static-pic \
- 		--prefix=$(prefix) \
diff --git a/dev-ada/gnat_util/gnat_util-2019-r1.ebuild b/dev-ada/gnat_util/gnat_util-2019-r1.ebuild
deleted file mode 100644
index 16d0964668a7..000000000000
--- a/dev-ada/gnat_util/gnat_util-2019-r1.ebuild
+++ /dev/null
@@ -1,54 +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=${P}-20190517
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e5031e87a8f1d425090
-	-> ${MYP}-18c94-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-194CA-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	emake GNATMAKE="gnatmake ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
deleted file mode 100644
index 6b4152f4af37..000000000000
--- a/dev-ada/gnat_util/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="shared">Build gnat_util shared library</flag>
-		<flag name="static-pic">Build gnat_util static library with pic code</flag>
-	</use>
-	<longdescription lang="en">
-		Gnat_Util is a library uniting a number of GNAT sources that are used by
-		different tools. At the moment Gnat_Util provides GNAT sources needed by ASIS,
-		GNATCOLL and Gprbuild. Its main purpose is allowing to simultaneously use
-		tools like ASIS and GNATCOLL (and other ones based on GNAT sources, if they
-		are to come), which would normally cause name conflicts between the same GNAT
-		sources that they use. Building both of them using same set of sources that
-		is Gnat_Util solves this problem.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 3c29a4d2e0c9..14b16375253a 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,5 @@
-DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
-EBUILD gnatcoll-bindings-2020-r1.ebuild 1927 BLAKE2B a51c29508961f0d088352e5e873f09db02049e9918bf98ada681bcf2ca70c23bf936120c2c603f63194ad9803d308e6f13948d446983f525f91b6dda71e290a8 SHA512 cbd7bd02d2489450f1d92315f6d514c5ed31df442b54603055694095e55977fbe4c4433574efcf748c904443ab6fd9769a419e0e2a873c067cf80ee319f6f82b
-EBUILD gnatcoll-bindings-2020-r2.ebuild 1944 BLAKE2B 9dba24ec94b42ae34d4170b37d6b08de7da200cbb1e37ff29de0fe8f3947f265485a861cbf9e9a684128da4064907ece4bb7aedceaccac8dd52d60719ce611d2 SHA512 dbed3391c529efb37cd321a7d97cec5f01af7708ab6595c4c28e47143af493cacfc2e48b5525dca31f27a2b5fc0a2d6fadadb11c7a7b614b6a326dae8f632033
-EBUILD gnatcoll-bindings-2021.ebuild 2378 BLAKE2B 2bb0f2e36a966a0c9976602318e6f232cbf50395adeaad7b192284572a9bda179de4389c86f120c7073167f07bbc33ea58d1daed47149163b0bb366998c593fa SHA512 554d34fc258f86960cf79d173bedd3280876d21957b3f1df5d39159f04ab8c852f7f9f58bb7246cb2c572e4f3f75f64da3fe03f265b0f623342a3bdc2867f813
+DIST gnatcoll-bindings-22.0.0.tar.gz 243040 BLAKE2B f6577e6d31362b59ac2bdb8c70772e6783d88f192f63e335082140d143d17be15bb62143174217b2e823e6183e5148725c1d12e4b00c3cc0abfacf3a279d30df SHA512 b8f4184f0992057ea33350e30e007859c5ef3e028d7604c47ae160f3c2ffcc828187ed9c9c3de7c6d2b7b16274714822460dc09d687386035d2773df45e90bf2
+EBUILD gnatcoll-bindings-2021.ebuild 2368 BLAKE2B 06fca9537d21a032cd28fd9ff720443ee57c7d6dfb90180b5b03ca36f95e98e9cd8b8b5a65bfd32304878ba75bfa6aa3449f6043fa84dc2ce65658205798e798 SHA512 51a7f1b86302f3f65c8c3ba4374d709c11fd641540c561f2410c74b8cde3fd0a513fce01b56d1993fee694901231ab60df0c0504d63f844a1a915513b4562f6a
+EBUILD gnatcoll-bindings-22.0.0.ebuild 2485 BLAKE2B a16cb572d954fc46cf029a6150b3ae6b1d7b3ba838956af985862c8af2edfa2d83f3a52721b7cf529a4fdd8e2401ad65dc4b7fc56e9634d5533828816a0ebb10 SHA512 0edef42f78e9694a65c172c4da9562cff2dd5c79f22e98e4d859b4746e2a1027c2e4220efa763c9a5c249a147fd66c432afd12534407a7d0c70f7abee3ea58f5
 MISC metadata.xml 1082 BLAKE2B 81d44f46969b4ebfeb13a2ddfbe086a0b9d59087869dbd5cbda17d923c16d2f6be0f3abe147311e477c6cac66a18b1ea8e41511e289f251ed4029871aeebdefd SHA512 f644094d9fd65a65495dcedb3b6b442193b243aa09a6f893d83ee342623a9e758449fa792470963860db0d24db37fa1304396727c664bcfcbd78238a0391f0f4
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
deleted file mode 100644
index 1b70824a09bf..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ /dev/null
@@ -1,79 +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=${PN}-20.0-20191009-1B2EA
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=${MYP}-src.tar.gz
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp iconv readline +shared static-libs static-pic syslog"
-
-RDEPEND="
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="
-	${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index f563b4f9ac7b..e232eb02e6d5 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing python-single-r1
 
 MYP=${P}-${PV}0518-19B15-src
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
index 5ebbb4aed05c..0e7007193e78 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
@@ -3,50 +3,67 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${PN}-20.0-20191009-1B2EA
+PYTHON_COMPAT=( python3_{7..9} )
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing python-single-r1
 
 DESCRIPTION="GNAT Component Collection"
 HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=${MYP}-src.tar.gz
-	-> ${MYP}-src.tar.gz"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="gmp iconv readline +shared static-libs static-pic syslog"
+IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
 
-RDEPEND="
+RDEPEND="python? ( ${PYTHON_DEPS} )
 	${ADA_DEPS}
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )
+	lzma? ( app-arch/xz-utils )
+	openmp? ( dev-lang/gnat-gpl:=[openmp] )
+	"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}-src
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -r python || die
+	mv python3 python || die
+	default
+}
 
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_VERSION=${PV} \
 			-XGNATCOLL_ICONV_OPT= \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
+			for dir in gmp iconv lzma python readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
 			done
+			if use openmp; then
+				build omp $lib
+			fi
 		fi
 	done
 }
@@ -55,17 +72,21 @@ src_install() {
 	build () {
 		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_VERSION=${PV} \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-			for dir in gmp iconv readline syslog ; do
+			for dir in gmp iconv lzma python readline syslog ; do
 				if use $dir; then
 					build $dir $lib
 				fi
 			done
+			if use openmp; then
+				build omp $lib
+			fi
 		fi
 	done
 	if use iconv; then
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 094b2e397b38..f37b11b9d802 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
-DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
-EBUILD gnatcoll-core-2020-r1.ebuild 1585 BLAKE2B 835b0e6f2dae3a73e4d18554a606c40c088810346df1a5116155c8da39afeb6ffb7ab3815d7223a919e90e34a7ffe9b0557adf9cf13ed36e4dfc4d0916da4f62 SHA512 77a55cb51bd96e189e6abbd9ccc90d1d9dfb0301083539a71969525da9d056e7043a3c36573a8292abf552e625d6c7a08b33789a615fad965c4580ef35a2f44b
-EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B 4e2332ec87600073b8aa9b513d4e1534cd00af5dff7315b845d5b28dc9bc1bd142c7a482a916760ed7848746990f3e03d404327821202bd0aec3c91c541efcdd SHA512 9c5d122937bb63179482f61c0c2dd53e657316506ebd6eaedc4ecbc4122e015af944461957b127eba25ae21f91881b1d217792e36edbbb4e72ea7d2cdf979b6c
+DIST gnatcoll-core-22.0.0.tar.gz 722642 BLAKE2B e9bc6b322866b086f080096457936f66925cb954533acc04265b1e4c7081fe65d420fbc841b9ad5f4932eb43848803c1bf78a37a6fc47c1ac9d30bbb8eb2e0c9 SHA512 ce3aaa90b339a57eedc070e6451ea8782a87d07ece09823c57179a5e44762349458564bf8d007427a7aba795bc05d744056e3defd6b44698bcc0a8af0c5285e9
 EBUILD gnatcoll-core-2021-r1.ebuild 1704 BLAKE2B 97467428c37b61dc0546b8dd9885156492ad404cd7c4b7fc63fd25403174f0bae37103da809bddcdc3fa796deb9bbb363587a486f7353c09bc2a331ed5daa680 SHA512 78e5b08df25c8bfd8c60e8dcbdc7c13f0e6b2f00ba21731723678d28ff1bd5b4488ac24350f5a9efe17341ea2d7b388551b022d7cc6fb77cc068bb175f54d85a
+EBUILD gnatcoll-core-22.0.0.ebuild 1635 BLAKE2B 32321a3423dd622e7661847a11765f2432fdef469c5dd3a2b0c3c35add9ba54ee3863dbb197ab87ee4eaa571bf3a41c82a28dfadcd80d4dc3b382e982471f241 SHA512 5ab6a31c1160eb1f129c2d2ca3792ee9961582113df6b733d386e833770591acf76fd4bdcfe2ad469b1a6cc8fe5d1ad575701f8da2f9e337bc66e4e7165dda23
 MISC metadata.xml 1096 BLAKE2B 138ba19dde84f957c6494fc1971672c8adc96feb4af484296aae720aa860132b0b709a9e5fc8ae8d391604dd8fd0c8d3f34fb11e836629a837463d311c68f677 SHA512 3bfb17c3531f6c3f66047534316bbb906214067208695b2e61594649f51842de82e6f2340d59acb2da9d8ac401cfcf95f8e9326b5ab07db5f794a4fe7a4898a7
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
deleted file mode 100644
index 6599a50b8f7b..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ /dev/null
@@ -1,74 +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=${P}-20200429-19B7C
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=${MYP}-src.tar.gz
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="
-	>=dev-ada/libgpr-2020[${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 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 prefix="${D}"/usr install-relocatable
-	fi
-	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
-	fi
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
index 11d0ca89579c..58f464be487e 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
@@ -2,31 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_2019 gnat_2020 )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
-MYP=${P}-20200429-19B7C
-
 DESCRIPTION="GNAT Component Collection Core packages"
 HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=${MYP}-src.tar.gz
-	-> ${MYP}-src.tar.gz"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
-	>=dev-ada/libgpr-2020[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	|| (
+		>=dev-ada/libgpr-2021
+		~dev-ada/libgpr-22.0.0
+	)
+	dev-ada/libgpr:=[${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() {
@@ -60,14 +60,15 @@ src_compile() {
 }
 
 src_install() {
+	local GNATCOLL_VERSION=${PV}
 	if use shared; then
-		emake prefix="${D}"/usr install-relocatable
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-relocatable
 	fi
 	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static-pic
 	fi
 	if use static-libs; then
-		emake prefix="${D}"/usr install-static
+		emake GNATCOLL_VERSION=${PV} prefix="${D}"/usr install-static
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
new file mode 100644
index 000000000000..7d927ae4357b
--- /dev/null
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -0,0 +1,4 @@
+AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
+DIST gnatcoll-db-22.0.0.tar.gz 2648812 BLAKE2B 5c1be4fb9973aa99ecdc37ca0335981f61581c8d3548d70a0c5ed2c3da8279abf36a204e5f7747a2c3d14648ee33438f027230eba105964c8042aa73b4b57f1a SHA512 a3baf3e2bf09b0407f3ac1323824da54998b79008cb7c2bc3a054e275d7071fd21f364f38b98bda97da9e07ce186e9a1c3bf1bcc25a347e8dc6f64e3f4de65fe
+EBUILD gnatcoll-db-22.0.0.ebuild 2818 BLAKE2B bb1ed64b7d8e7bfd667d787780c4ad3ff67205494421ce681fb31a29cd03f4a1938a50efff4ed7ade6e4126003464d3ae962cd6b7c3dc38b0382919ec3a9de57 SHA512 d51714e0fd5904799bb9b662d25ea5740b24f5cc4011febc6ef889a57d3e1cd9bbac98a61b410da9602435b208a2712e978d435f9043de776631e1f436044394
+MISC metadata.xml 1274 BLAKE2B 4ad9306fe74b983dfc03d23ed61bb9dab8791169bbb33e316514ad6a59ec3b947fade3b61455e8554f1af4721f5647afd9649d06b721349024c0ef2d02de87ba SHA512 bd09add1cc91e61e428a05bcafdbbb23c39bcfab58e42a2e46fd8d6b1df16af2b65ea78bf5a21b74509ed3e498ef257f263c30412e2de7457bb850b5d93be169
diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
new file mode 100644
index 000000000000..9d95a9bfc1c4
--- /dev/null
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/sqlite/gnatcoll_sqlite.gpr	2018-06-24 14:08:52.477478654 +0200
++++ b/sqlite/gnatcoll_sqlite.gpr	2018-06-24 14:08:59.149372684 +0200
+@@ -42,7 +42,7 @@
+    for Library_Name    use Name;
+    for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version;
+ 
+-   for Languages use ("Ada", "C");
++   for Languages use ("Ada");
+ 
+    Thread_Lib := ();
+ 
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
new file mode 100644
index 000000000000..34abd0292198
--- /dev/null
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+ADA_COMPAT=( gnat_202{0,1} )
+
+inherit ada multiprocessing python-single-r1
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref"
+
+RDEPEND="dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	xref? (
+		dev-ada/gnatcoll-bindings:${SLOT}[${ADA_USEDEP},iconv,shared?,static-libs?,static-pic?]
+	)
+	${ADA_DEPS}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="gnatinspect? ( xref )
+	xref? ( sqlite )
+	sqlite? ( sql )
+	db2ada? ( sql )
+	postgres? ( sql )
+	${ADA_REQUIRED_USE}
+	${PYTHON_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_setup
+}
+
+src_compile() {
+	build () {
+		GPR_PROJECT_PATH="${S}"/sql:"${S}"/sqlite:"${S}"/xref \
+			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
+			-XGNATCOLL_VERSION=${PV} \
+			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
+			-P $1/$3.gpr \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	local lib
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	if use gnatinspect; then
+		build gnatinspect ${lib} gnatinspect
+	fi
+	if use db2ada; then
+		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
+	fi
+}
+
+src_install() {
+	build () {
+		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
+			-XBUILD=PROD -XGNATCOLL_VERSION=${PV} \
+			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
+			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
+			-P $1/$3.gpr
+	}
+	local lib
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	if use gnatinspect; then
+		build gnatinspect ${lib} gnatinspect
+	fi
+	if use db2ada; then
+		build gnatcoll_db2ada ${lib} gnatcoll_db2ada
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
new file mode 100644
index 000000000000..b73349412d9b
--- /dev/null
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="db2ada">Build gnatcoll_db2ada</flag>
+		<flag name="gnatinspect">Build gnatinspect</flag>
+		<flag name="shared">Build shared library</flag>
+		<flag name="sql">Build sql library</flag>
+		<flag name="static-pic">Build shared library</flag>
+		<flag name="xref">Build xref library</flag>
+	</use>
+	<longdescription lang="en">
+		The reusable library known as the GNAT Component Collection (GNATColl)
+		is based on one main principle: general-purpose packages that are part
+		of the GNAT technology should also be available to GNAT user
+		application code. The compiler front end, the GNAT Programming Studio
+		(GPS) Interactive Development Environment, and the GNAT Tracker
+		web-based interface all served as sources for the components.
+
+		The GNATColl components complement the predefined Ada and GNAT
+		libraries and deal with a range of common programming issues including
+		string and text processing, memory management, and file handling.
+		Several of the components are especially useful in enterprise
+		applications.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 356296b60704..e7b52062697a 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,9 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
-AUX gnatmem-2019-bfd.patch 690 BLAKE2B 81fecbd5eb8743a91699b98f73cc63f7e3112544ab42a337d3b2bde09b2bbe3632dee1f35301e758a92acdd98772c555291180d91aedb19c4b1c3905ce58ea96 SHA512 32f9feabfd628e787c4b9be5e8d0fb7b203116a8cdda2a2bca31af6cd83c09b0806d15c2670430983d6602846c3c257c5d648f40d93ce5b49a8c75d93ca1c722
-DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85
-DIST gnatmem-2020-20200429-19911-src.tar.gz 80400 BLAKE2B 0367e4b40a3d0cde1002b49a330db3b5c27a08074bf9687699d0fe6b3f046562c4758865fd30a3f99703d209e24b0b5b72902cc4bcd4fd1c54576a0aa082b0fa SHA512 9d5e2bfab73ff2f9b6864bd8b1f2844587a21352a782f1dd52a17eb911d4791d93806a423c702979636dd402e372ed7954ffd33d3882c8703d0f6e8fc056babc
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2019-r1.ebuild 963 BLAKE2B c789717934dbfb1740be8ae3834b1e05aedf7861ac197b87805c14c69ff7ae77748ef8a52ed62dfcf6518e9368882ef23f1ac9c54a24303543080bf0ebad4388 SHA512 70470635549aee72ca64604bcc7ba604325e194758f8555a66348d27b4457c0b2d531914859c4e61f428eb784c307b4db334a1ec198396ac6303d72d217c07e4
-EBUILD gnatmem-2020.ebuild 996 BLAKE2B 4b36c0bdb9db4ff2667353e71884e3586934519000f3b2d0fd3b4782ab1c7db3beb6c5844d622379aae3fcf3e7a2190d397d9c34192eb0e62ccf63f9cea3b952 SHA512 df454f56ed340b86f444360afc706e88d19ec1ff1011aab5085f5602b43592ca58a7d5da69d42622c8bf79f6c665e44e751fd6bd8efa5d09c4e675681fe1010d
-EBUILD gnatmem-2021.ebuild 1030 BLAKE2B 56f69a410ab8ffcc6e5583350818a8515e7fe45b3cd259341d7fd7c591876c9c716a4cd16a3a5df576505826f711721ee31f98f1fe1a54bef60875f012d7e6e8 SHA512 52d0a960051f8318cb6ecbe4bb73c2181d3e21cef7c84f7a5ebddb0a3d599cb34e5f3281baa974ca74fbd41bfb4cc898709e04bbf0e8d7e2abf6f0fa65d4e52c
+EBUILD gnatmem-2021.ebuild 1020 BLAKE2B 3a4bb932c43be0c97caba2e40b77bd07bc2d5f3bd93997b3feea34a1c73a1401555ecd8d0dc14a4369c537be71307adb138e78562cb910f3d2cae444e0222719 SHA512 c88c4827106462cdc9aeccce3db546cbe33a8f36df217fb46060ee1e64e0678ee6f6efc375e4ae0f334cda0f4a690637bae5f10e5d6967f14232fbcae6bbcb8a
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch b/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch
deleted file mode 100644
index 007d217cf247..000000000000
--- a/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/libaddr2line.c	2020-08-04 22:41:04.670046491 +0200
-+++ b/src/libaddr2line.c	2020-08-04 22:44:55.560802332 +0200
-@@ -55,14 +55,26 @@
-   if (found)
-     return;
- 
-+#if defined(bfd_get_section_flags)
-   if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
-+#else
-+  if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
-+#endif
-     return;
- 
-+#if defined(bfd_get_section_vma)
-   vma = bfd_get_section_vma (abfd, section);
-+#else
-+  vma = bfd_section_vma (section);
-+#endif
-   if (pc < vma)
-     return;
- 
-+#if defined(bfd_get_section_size)
-   size = bfd_get_section_size (section);
-+#else
-+  size = bfd_section_size (section);
-+#endif
-   if (pc >= vma + size)
-     return;
- 
diff --git a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
deleted file mode 100644
index d320637c28c3..000000000000
--- a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+++ /dev/null
@@ -1,50 +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 autotools
-
-MYP=${P}-20190429-19745-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	sys-libs/binutils-libs:="
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-	"${FILESDIR}"/${P}-bfd.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2020.ebuild b/dev-ada/gnatmem/gnatmem-2020.ebuild
deleted file mode 100644
index 2d88a77686a3..000000000000
--- a/dev-ada/gnatmem/gnatmem-2020.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada multiprocessing autotools
-
-MYP=${P}-20200429-19911-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://community.download.adacore.com/v1/77354fedca0441f882e17b6a73ac5631bff26237?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	sys-libs/binutils-libs:="
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
index 8c1cd4d4e6c4..a20826c8c122 100644
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-${PV}0518-19F7B-src
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 7d6a67687f6d..30e5c71f2802 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,7 +1,3 @@
-DIST gnatsymbolize-2019-20190429-19761-src.tar.gz 14297 BLAKE2B 8ea689266abc485632c04a696c0d30632fdfcc123153ae006158700514ebedd6d067124e59e519a0ebe35569eb0e2fad8dd48a33d49551ba608e14d3ec73d636 SHA512 68e8c9bb2880738160722a2c413c6146c86efd0822236019ca5824eed4a2b392252676d0f96c035830b80068b82344b44953006fc96ea208f6bde6618190336c
-DIST gnatsymbolize-2020-20200429-19987-src.tar.gz 14121 BLAKE2B f67e3735cacc56eacf9f7c9972f9108f95b3fbc3dbac14043356dd3da5dbd9548b1b41063465e025c9616bc059c39021999b1790b8f2cda2b9199ffd8154943b SHA512 839ac0ca514123261e8dc379484195eda3c0bed3509aecc9919ed9710c3fe3478b398697483085de69d0435728b9bf1dc60e6c7c1a51252f5629ed9e1b222739
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2019-r1.ebuild 654 BLAKE2B e7df873a536710d44ebe8155487495da953b0be4bab6c8e52e8f6840e067dd903f114ecad13f98c3481eb117f88ce0a6e7d3687382255cee4a2054b21a67c514 SHA512 8c0c6197dea96a93f206e08b6b40707cd227d2b21eed4dc719e5ba8059d445f20177ef518e28eefc1c0dfeeae6ac87e381e172e8853ee51828db55442c1e18ef
-EBUILD gnatsymbolize-2020.ebuild 805 BLAKE2B 6e5d15ff7f9c9d1d6d82821377086cae4b7fc305db0b1d2dcf075b376bb81e5da740ed22228d39266d9f294d8f0250aafdaae607a2de0f50f6c6c2afee29810f SHA512 91c2fdc9cdd40edc9730d74da6e00cd55db367881917d267bc8f759009bc2a5a486539453b2970739f2aee963f9b4b9ace27973072b414108b4bc31fc51e5568
-EBUILD gnatsymbolize-2021.ebuild 748 BLAKE2B 33f11ac54f310fa3f0f81d1e029aa7746b9b672d970287892ccc871ca655a8f9052fc7ec824474a16c6f3b4d5fa6ba6df9a9b273a9aad8ae07d6f169544e0d63 SHA512 752a3e0f1a591f0779a3e6d37d364639af7dce0d87a4fbe0579fcfb6c11a16b277ca93269e75919e6fcd08330416e89fb7c758ffc033347c9b0788297d4a586a
+EBUILD gnatsymbolize-2021.ebuild 738 BLAKE2B b32d03557f38a6b3d40d262b3ba60eff41f7fe4e0a8493d406f0cf82bae0d5930e6f7b2c3f1b41a900107e4136219b3a92d9dea890c58c414baae61e3fad8fd6 SHA512 bb1ce4431a5636f0e4897673c07b7c30a8f947ffa973715d60ea605f1a5f140f47e7d3f907ac533d9e975e9b958737ece0e801b8dbc8c061f6879cb6203ed75a
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
deleted file mode 100644
index 4f35033568b2..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MYP=${P}-20190429-19761-src
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cc7d5e431e87a23952f18c4 ->
-	${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-src_compile() {
-	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
deleted file mode 100644
index 67ff105637bb..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada
-
-MYP=${P}-20200429-19987-src
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cc7d5e431e87a23952f18c4 ->
-	${MYP}.tar.gz"
-SRC_URI="https://community.download.adacore.com/v1/ebef002ce60066e3befdd1a4a0980f3ab8f1b551?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-src_compile() {
-	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
index f04d557b48f4..7e763d16a016 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada
 
 MYP=${P}-${PV}0518-19D3B-src
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 3117a2dfe480..f6b5ce1ea762 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,15 +1,10 @@
-AUX gprbuild-2020-gentoo.patch 11688 BLAKE2B 698f203f1a4b6086b1cc20300506db4d10e62bbade354891404fb8ac1e828370992e6e85cdb6777c6d1ae5831a2a65a1f7483ccb8a3b065c83233162055c1c8d SHA512 ec9c99db6fcd26b6971754dbab9187e6589a1bbc2e513cb205b37519c21296a91678aac09833839256cd6558d9e228878e63e264658b32b1b9403e40a61f02ab
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
 AUX gprbuild-22.0.0-gentoo.patch 11712 BLAKE2B 77088bba7bc022db46e122ea20af0372c7cde4acb4fb4991313306f8e179910ccc428933f04c78cc57f78ae9b400dbfdddd59328c8e454a40fadde2fdea035a3 SHA512 af8eb69a437b18ce9924f922b4ed1b9a09caf83015936e546e673abd908dc30ee16a94c39b9e45507d9a11e126091e35a6eee78f9d513517e7782fd407b288ed
-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
 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-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 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-2020-r1.ebuild 1923 BLAKE2B 94b007dffd8270920598122d1b2e303d465bb2dff5b7a50a6af3b686d998bea8548fdd23d738853034c02a7398f59a717d24590eea4f318ae3aa04ef8def5700 SHA512 484b6a3a994d291d9b49573f6d45058c641d148bfc2774e5894c08382978941adad3cf480ca679ff6247d436c0dd2efd45ac745a09a79753d675099d44481f03
-EBUILD gprbuild-2020.ebuild 1911 BLAKE2B 4513a765e20e8226476be5ca62e588a4d1a4570ea7e3e1e932ffb7547054ba32e0fca6ba0e09b95a7c65dc2fb2fe47b5b6c87d7d7571abb4653d2c050eaec7b2 SHA512 216a3186f2666c6bcfcae001503d111ef28f74d665a5d00855a7e80de743b37ed0f16052bd8a4d0d65831fff0856372ca88cfd69b2a0c0e6ab50071669b0c349
 EBUILD gprbuild-2021-r1.ebuild 1939 BLAKE2B b8631c09b20aed1bdc9c6fcac21f52a3307595fcc11d296d4819d2c8fd5c5ee046fc7377e30d821a619c0c46017987b946c9ec4de08ceaa9e09954dce348b600 SHA512 f1e5b231152cf236ef00142be869af09c3424c97c65619def0045863c7ac21fffc56bed6f003c0af4e126b82f638304c870bbd45769e9c23edce2e113579ea82
 EBUILD gprbuild-22.0.0.ebuild 2059 BLAKE2B de1269eb15fe3156ea47105fbca074cb5fdc298884ce7daa0b0bb3f3162666c6a9216e041102ab149befb907f708d418e8460f271566d9e3b1cf21565b1d2b69 SHA512 409484b30fec234d91ce1d186c6232ed0554cde0324d55d8c9231ab618496b264d5d2fb8d8e42ad58476b6ecc5f9ba3ef5c72653ff80c5ed6c542aa0a9a639c5
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
deleted file mode 100644
index 9e6040b8ddc9..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
+++ /dev/null
@@ -1,286 +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>
--
-   <!--  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>
- 
---- a/share/gprconfig/linker.xml	2020-06-16 22:13:38.508782578 +0200
-+++ b/share/gprconfig/linker.xml	2020-06-16 22:14:32.693966110 +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=";
diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
deleted file mode 100644
index 0a8c906e76ae..000000000000
--- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 gnat_2020 )
-
-inherit ada 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
-}
-
-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/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
deleted file mode 100644
index 8b3fd0402cc9..000000000000
--- a/dev-ada/gprbuild/gprbuild-2020.ebuild
+++ /dev/null
@@ -1,76 +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=${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
-}
-
-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/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2dc678372fdd..3bcd3534a149 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,10 +1,7 @@
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
-DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
-DIST gtkada-2020-20200429-19B96-src.tar.gz 12232938 BLAKE2B fcd5fdfebced2fc2b4dd1251f81a61b1564a72a3cc1854a78c4d9e32824d55188dd440bceddd4e86f3dc03c455b1db109bc68d5cb29e2a61d62bf59895b68895 SHA512 d9405d03cc3bf375ddddca54f2fb935ecd64cdf6eedb32efbd994a6f8a7693c6ee7aa10d558cbf89e9ad3174a3ac9a0c8f0ea7e444ff5d2a8b9af76a6ff64d4b
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
-EBUILD gtkada-2019-r1.ebuild 1124 BLAKE2B 4b96339a78d35a83e6d1363d4c6b852a1fd7b0d186d6080468a3513cfc2d18409d0b86147b4d013833f32f619cac688df13735c6778db2b4292b3a901191e32a SHA512 f76e0218376a9937b3ec834ba534e77e72ec22e33a1638af2010ed82e8550b3025e1965f766dcdff30ac90c61761fedff2ee24d9c2958c9922b56b9e2d20f403
-EBUILD gtkada-2019-r2.ebuild 1136 BLAKE2B d9598bc658732e4a04e577225e749f1e83a608841cd9882ac7c84368d53e04ba27c709f759b46bca3af50761ad62596ee29977afe2fdd56dfe5d785264006b8a SHA512 7c5b4cf398be8fb1c716639fcdfef761eabc97fc9b574d37d23751a21d812a4fc0d5d9fa91186d5fd69020e25c60f5d991bbfd56e0649c5f56d25ccba026a15e
-EBUILD gtkada-2020.ebuild 1231 BLAKE2B 36e187bacd5d07498c5df71112e22dbd7d3415668f70c325df7cbde798f600bfa96dc890535d1d9a861eb46210ad586e62fef9cac2a8493b1b4510951f9abe29 SHA512 533473a043ae4f9807d15fecf39177f6c526f0f34a2ecf84d6addb1a0a92171d64c73365512c1d5ab6718c865dee0468043e7973068af9e7694e14633ca151c3
-EBUILD gtkada-2021.ebuild 1230 BLAKE2B d40eabb324a62198b8fa4a4110e775b1c0a6bfd6815687dc3be6a7e31bd9a5ecbd9f75264c602572100f7b6d1e272f556997777dc0b38b39eeb04299b6be7b2e SHA512 1b7c35e91616509da839ab01fbc3bfb1b4b2487555cc52b4ff7cbd20029f865f03390dc59060be3fa1a6c9cd7d88c81a3094fc36d39b5c5b9c6fd40a91b79da1
+DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
+EBUILD gtkada-2021.ebuild 1220 BLAKE2B 26eea83f283008167842065ff7581611b1cf84c5295465e37f4e5e8cab98cf72cd1ed045ec1087ba8a1cecd03fba543e887d524b4a6275b83343305486fd66c7 SHA512 b6beb204a96c894b2a87645f6285d5a8badc22e2adc937123c06a2e8ceee98ab22235c42b7e75638a85be5eaeaea9894888fec321985a3bb9f04cd0a4fde57f3
+EBUILD gtkada-22.0.0.ebuild 1094 BLAKE2B a3cc761d4aa6f77cddf49067e6363f8a572b55793db079fcb15f3f6d47e95acd929ecb8d4771840beb6c9c77c58a0747854685ed9a60a30b3d98aaf896b2545b SHA512 7eaade5ae7aa1f7c016e111f06100b51499cedced1ac37271ec5659495596f1ca3a00b7bca8da52f42cbbab355db1e9b9ae395865bd6c923dcc3a7f5e81eb911
 MISC metadata.xml 537 BLAKE2B 2504eb7e8c0fe1a143ea8f6f4ba3ac530245d3781f906536dc7680e775cf8b546e7019d43adbc78e1b7793825eb9bea849d78ef482325ccd16bc30d96691ea7a SHA512 4e683dd78d8d81851116548db6014157fcb363d96fa4df04e45c35705505ed3b3a863a3b082dc4a7e814df8587b7f5fba6e696c8ee12e14d0d04a71199977d17
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
deleted file mode 100644
index f0aff578faf6..000000000000
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ /dev/null
@@ -1,62 +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 autotools multiprocessing
-
-MYP=${P}-20190424-19D98
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}"
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2020.ebuild b/dev-ada/gtkada/gtkada-2020.ebuild
deleted file mode 100644
index 53c519056488..000000000000
--- a/dev-ada/gtkada/gtkada-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 gnat_202{0..1} )
-inherit ada autotools multiprocessing
-
-MYP=${P}-${PV}0429-19B96-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=96f85c875c161c36e7d0edb19aa4dbddf41ea671
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${PN}-2019-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}"
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index 58576d667746..b105da3b0ff7 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada autotools multiprocessing
 
 MYP=${P}-${PV}0518-1A011-src
diff --git a/dev-ada/gtkada/gtkada-2019-r2.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 1943cb59d20b..0d925e9cb301 100644
--- a/dev-ada/gtkada/gtkada-2019-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_2020 )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada autotools multiprocessing
 
-MYP=${P}-20190424-19D98
-
 DESCRIPTION="A complete Ada graphical toolkit"
 HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
-	-> ${MYP}-src.tgz"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -32,16 +30,14 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}-src
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-2019-gentoo.patch
 )
 
 src_prepare() {
 	default
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
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
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 3090a8d0ea60..37d07fd16566 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,6 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
-DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-EBUILD xmlada-2020.ebuild 1978 BLAKE2B 80246ce9388d25e62c38d48b76e404fea38c71865a1fb31710b7caee425dc453139e158243fab8ac65315e2c6bdb6556d6f15f7551fbe04f538c7dfe432890e8 SHA512 7ca808b394c9fd8ef70ec27789513ba315221f1eb472ac8b5f035a6c6bfb21a747e350b26714eceffa01d62f81be0747ebfb314874c45466ec3eae417075ea7e
-EBUILD xmlada-2021-r1.ebuild 1990 BLAKE2B f944e9584c490d6cfd5e39969a2f43b3c51eb760c771367bef89fa869642f3572df19e0e5c271e5bf4b4b18f6cc7f8554d3ad051ee0348058caf7af9810f83ea SHA512 058234e250aa38d808447c19829ea6977a5f4d25c1436d181a76437c18757aa9b11875426388bf6fb55e3e38462e660ce496665db1ca129ce010fb8ee0fafa9d
-MISC metadata.xml 908 BLAKE2B a29e2bb61aeb10e05688b87817fa6ee4d7bea40d1aafc6e417c925237cc499f6688bc0d4d95ddef435ada059df9e982378e82a11069e8fd0037cb03da851837e SHA512 dc34947845e621b35021fa15d049757ea1a48aca68f40126d1dcc3fb50e02a34b5319028946944c4e7f432d4899c701da8c7dad28ea666766ab0197ed196519b
+DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
+EBUILD xmlada-2021-r1.ebuild 1980 BLAKE2B 1e5e65b6506018a4110246c55e51997a3cd81c2a31994b26bd48b8a8b34f66be0cf85b5db0262e0759bb520306ae3fd6900394cc6384be63c61cc98ce1e113d5 SHA512 2adf47283f61526d3cb26b32a0f94c4c65f0562297991e6003a6bdb5b9acb8d893eff734e57025fc400e7d74b2f36e59dcc1cb609e10847704a25c1df3ceab59
+EBUILD xmlada-22.0.0.ebuild 1725 BLAKE2B 5cf13418887df5644005a425d4b19cca6aef61ec40ff1aad7a56649efe67cfc5b0662da3faccc82a1ab9aed05814fdc5c9f224e0326ab1fef8acb9eb4dccb385 SHA512 ce846107bd5156d001b4fcadcd6daa27f21cc19b559c5aac3d0a4cda23cf1c24adc43dbaa356c941f94865eac75522189bd73eabbbdc7575b7605cc9e13534e9
+MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 0feea9d45d0e..e77e1bbcd64f 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -20,4 +20,7 @@
 		In addition, it includes a module to manipulate Unicode streams, since
 		this is required by the XML standard.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">adacore/xmlada</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ada/xmlada/xmlada-2021-r1.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
index c0bf97b6e8e4..a946ece90d98 100644
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19D50-src
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-22.0.0.ebuild
index a91080c028ef..2f9ec8a4c638 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-22.0.0.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 )
+ADA_COMPAT=( gnat_202{0..1} )
 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"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
@@ -24,16 +22,10 @@ RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-S="${WORKDIR}"/${MYP}
-
 PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
 
 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} \
@@ -76,7 +68,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
+	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
 }
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-ada
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)