gentoo resync : 20.03.2022

30 files changed, 200 insertions, 45 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 986120573d94..d896143ec9c2 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/ada_language_server/Manifest b/dev-ada/ada_language_server/Manifest
index 02d470bd7932..b7667e0fb30c 100644
--- a/dev-ada/ada_language_server/Manifest
+++ b/dev-ada/ada_language_server/Manifest
@@ -1,3 +1,3 @@
 DIST ada_language_server-22.0.0.tar.gz 791594 BLAKE2B 9effdf8376e00fe838be7b53c5756dc0d325e36eae780642d79483d6fcead9019cab41e228fe2313d6f31e06895e2d41feef194cb24ac50f02d6dd066774b642 SHA512 ef4bdf41315aad09750e85521657aefaaee419739aac4dec6e182691b8b5282face19481a113e710f7c4b21f6e6f51296d1872aaf5c1c3ab19b6774d142c021c
-EBUILD ada_language_server-22.0.0.ebuild 1981 BLAKE2B e81d9828304f52cc0742bb4666e3c44b92163e076ad347aef104acd5bbe85ff6a6f8461fdd6279ae54930823a6b5b8aa4e638d1cf2c88d7710149eb8bdb78a81 SHA512 c6a73fc3a07e1432a3db4563a2a7a7a4af049d748be414649129748baf01cf5fa91b472f6140e0cb56b5dcd995c638562dcdb22cd414c2aa88f2c490f4454289
+EBUILD ada_language_server-22.0.0.ebuild 1991 BLAKE2B ba2449ce368f085f8f4edc5de11387e494f3b7598a1a003d6622b0d1e4150d46ce55b19ba1fac8ac1d08c0c834c3bc3daf07bd8efea150d4cd88777e69080493 SHA512 4cc25b1caf95228338ba934324a0ed80f1af72e99f6a622c4fa66509442ffed294e2f0a5f0acde938e43e2537d04818cc1daef91907ceca08323de256729d722
 MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild b/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild
index 065884930e2a..42dbadb2cd65 100644
--- a/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild
+++ b/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild
@@ -15,14 +15,14 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${ADA_DEPS}
 	dev-ada/ada_libfswatch[${ADA_USEDEP}]
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
 	dev-ada/libadalang[${ADA_USEDEP}]
 	dev-ada/libadalang-tools[${ADA_USEDEP},shared]
-	dev-ada/spawn[${ADA_USEDEP},shared]
+	dev-ada/spawn[${ADA_USEDEP},shared,glib]
 	dev-ada/VSS[${ADA_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
diff --git a/dev-ada/ada_libfswatch/Manifest b/dev-ada/ada_libfswatch/Manifest
index e1739d06572a..022e07227e29 100644
--- a/dev-ada/ada_libfswatch/Manifest
+++ b/dev-ada/ada_libfswatch/Manifest
@@ -1,4 +1,4 @@
 AUX ada_libfswatch-20201105-link.patch 340 BLAKE2B d83ed866777df9e0ceab5e8ce6fcd606ed784c346cba2623f444b3553c67a6314031d614d06224cf13663af5d3a1d437549465e95a6ceb9a420a4d3237b39b9a SHA512 3033f2a06314801ca7141585ba6e3b4605b68d55dfbcc446d3a6ea2008d6763fe5aca1b5ee5c808c4e50fe2ee8237ea17a2db62abbb563f6fc48bc59d3e6cbcb
 DIST ada_libfswatch-20201105.tar.gz 20473 BLAKE2B cfa200f3276da5372df83038fe7a11224a4938d750207f17769ff21ce2c0780e5ef3111a5564cdabde2155fb7579c437e34061cd8654358d04f55bd0af1f1b02 SHA512 71ec7584ad4c9d06939d4cde858c40016b629a76edf6392287140aaabbc588b82c7abf980ab75888763ebaf721b51e1163cf362512788b7559e20d11051a95ed
-EBUILD ada_libfswatch-20201105.ebuild 1230 BLAKE2B f34a71285c0c2744dd92d6a8b738a602b2c81e6b87a6b77a3920f503dd8760b6be0e97eaecd3371e68d666414e84e6b39fbad1a819f6c521ae461b6436564dd4 SHA512 5efe18ea81ca410ea8cb317a865872a2066e8e4ca088bc3ab7e134bdc4dc6c80eb526bc8d533e5384f59f2d69afc26a19a5f4cc2e156f3b02826d09ad0a4a415
+EBUILD ada_libfswatch-20201105.ebuild 1235 BLAKE2B 0b81bdc82fec5128f541e881cb689a8289d7184216845e32d5f320818cf9b9cd4716fff248abf869d94c24098e1d32680e9fcc8f8956e45eb6c3f074cc3350d8 SHA512 afb1ed66bfa44188f5a2db3fba702a69aaa8c5c8df76387f047aee181d267621d06507e7aa75525ac8d5372505c8b81a8e936520d810c9881aa2e3356762ba32
 MISC metadata.xml 303 BLAKE2B dcdf1d7460015304bd2c84cf1e8ed8b23d22abbbac6f6d630709742425f15a0589dfe173cbb7cf259ca19fe342692f7e6db773ec2995c446d4a90b1f1566cf16 SHA512 54c9c050abba868d5b42049835e9ebf64b0d5a5f1f165e153ae8e60a013ba9e29d747454e5d032cb713aeed1283863d52fe46a9466166a15f7090537e48d5ea0
diff --git a/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild b/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild
index b8ab12fe324a..2653cf5e29c8 100644
--- a/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild
+++ b/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${ADA_DEPS}
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
diff --git a/dev-ada/e3-core/Manifest b/dev-ada/e3-core/Manifest
index ec93792eb752..1ddee914bab2 100644
--- a/dev-ada/e3-core/Manifest
+++ b/dev-ada/e3-core/Manifest
@@ -1,5 +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
+EBUILD e3-core-22.1.0.ebuild 1369 BLAKE2B 0fe38a5082e6b54dcc9a2ae14d550fa445b5d4979f82093cbb919d69c227e6a954358114784625d0a528d3dfbf52e267fe09906a009b2a45a7a2cf5345443e1d SHA512 ec65eb803ffe961969b01035e706362016bdf598437c1cdaaf12f3fb3a22ed05eb73b6d1dfae6aa2fde313b162fe0c8e0125d16568e079e45a6f26245aec864e
 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
index 80324535319e..98ae628c722e 100644
--- a/dev-ada/e3-core/e3-core-22.1.0.ebuild
+++ b/dev-ada/e3-core/e3-core-22.1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Ease the development of portable automated build systems"
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
@@ -39,7 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-test.patch
 )
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 
 src_compile() {
 	local PLATFORM=x86_64-linux
@@ -47,3 +48,7 @@ src_compile() {
 	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} tools/rlimit/rlimit.c ${LDFLAGS}
 	distutils-r1_src_compile
 }
+
+python_test() {
+	epytest -p no:markdown
+}
diff --git a/dev-ada/e3-testsuite/Manifest b/dev-ada/e3-testsuite/Manifest
index fac713ae172c..6ed02e37a2e5 100644
--- a/dev-ada/e3-testsuite/Manifest
+++ b/dev-ada/e3-testsuite/Manifest
@@ -1,3 +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
+EBUILD e3-testsuite-24.0.ebuild 564 BLAKE2B 64041042a975cb1fd0d5bf9c5dd12fc5f34acd65ffab0d170a188662950cc345090a19314223b9846d27b398a3d65d90e613aae5f39e845d5cbe6e3eb7fbb587 SHA512 7b844a5134ee78c81d63aeb483e3a8056599edbb37d24f6b2935d1998487a769ed5756602d0e365901e83184db9fbd80f676da055dc0f00606948fa299bd6ceb
 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
index c6b5d11be99f..b2607be1e326 100644
--- a/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
+++ b/dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Generic testsuite framework in Python"
@@ -13,11 +14,11 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND=""
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index fb31d4bf0d83..ab367b4bc98f 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
 DIST gnatcoll-bindings-22.0.0.tar.gz 243040 BLAKE2B f6577e6d31362b59ac2bdb8c70772e6783d88f192f63e335082140d143d17be15bb62143174217b2e823e6183e5148725c1d12e4b00c3cc0abfacf3a279d30df SHA512 b8f4184f0992057ea33350e30e007859c5ef3e028d7604c47ae160f3c2ffcc828187ed9c9c3de7c6d2b7b16274714822460dc09d687386035d2773df45e90bf2
-EBUILD gnatcoll-bindings-2021.ebuild 2254 BLAKE2B 86f295e0a2174d8c904ae4804891485fb78a473e64e14dc45c4c883f4a27b04e1253739fc7f524b1e17adce9013bd989d87ebdd9afa404d82306945f0fc3f0ef SHA512 c3db61663a7c0706ffa3b29651a3e13fe4d6ee1f4fe87afd433cd42bac49c1e923b1038492bcf75f4ba6138b52d8e6763dc71b7b8bfced9907b16a28ddcb7cab
-EBUILD gnatcoll-bindings-22.0.0-r1.ebuild 2471 BLAKE2B 7566ee61ad046ab8034ea281abebab1f1912cf3857825574328d736b9388c0a4e3aab275dd1905689e029b0fd419e17c160db3c3f7549f70e28b4f1f8fc95ca6 SHA512 0a4253a1723d462820ea89048c4cc3343805cbfa5a8c43c9b84f16aa8fc8df71ec5a032362521bf34f922503d8dc2e60c2e5f7abeddb727f7d4f5d8ffe606512
+EBUILD gnatcoll-bindings-2021.ebuild 2258 BLAKE2B 93b049d3bd7ea8b4da04b35fa4c5597db4ab3484b3ee443d4fdab630bfc23c7faed5f66478bdecaae405a8dc00a68359815d6669d31c89c484fed6ee1f252ce9 SHA512 225599cc2be90ce2dbd400b9de202de202b4d4190237e9a9970717463b36f7a2d0f63f584a3dd59bd1c72db2abfad2341c075a616132a9bc9da1e527ab05c5b2
+EBUILD gnatcoll-bindings-22.0.0-r1.ebuild 2475 BLAKE2B 5c0c9be7b118d7581727da9dd2bae04043857c871462b6f4c64889ac704fa7dd6ec2a96a55fd4c49b1e73cc0446f57ad4655bc860ebc53e03f571c2e26f6c536 SHA512 48498aeddb1f8129e6c1715563cd6655cc048f0326daac83a96ad23b318f06b8eb9d36660cf5572520314dbe573ca82db1a1fe1a06d836c22530a88386759687
 MISC metadata.xml 1082 BLAKE2B 81d44f46969b4ebfeb13a2ddfbe086a0b9d59087869dbd5cbda17d923c16d2f6be0f3abe147311e477c6cac66a18b1ea8e41511e289f251ed4029871aeebdefd SHA512 f644094d9fd65a65495dcedb3b6b442193b243aa09a6f893d83ee342623a9e758449fa792470963860db0d24db37fa1304396727c664bcfcbd78238a0391f0f4
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index b37ed6806642..7c56ccc0a5b1 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing python-single-r1
 
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
index 2f979894c8c7..d43b0468c639 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing python-single-r1
 
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 89c59fd4e658..2f6a9aef2cc5 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +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 2908 BLAKE2B 18359bf6454e6bb1d31e99f57755a09e5c2dc8d29c2f6965c4560cdac274b3d1bb2ab3fda827acc9ba4c2a637719a8aff1d6490ee38c01d88d9d7333e0f98619 SHA512 d5a634b706b4dbb52bca4b25536941821751b2d0ffbffc785e0bce9f280ade937f1a93acb32698d8873ceb4b5cf8b46f737cfa9ff3fc73f56f2949933357c344
+EBUILD gnatcoll-db-22.0.0.ebuild 2911 BLAKE2B da0d22e27869d7628275f26898ce200bef417a4444d731d68b3c7a0b098664f750d3fdad48a5fa1ef8d420df4a6e2240dc9271772f15afb18b8bf63f0899a046 SHA512 bb6eff07d1e22b6733659cb06e8d720b7a2d1ec6fd7d9b74e14e984c2ab0d61041c6fe4fdfc39fee1b0f510709cea8045b6ce0c7b8a67724f041c47dc61d9160
 MISC metadata.xml 1275 BLAKE2B dfaae98f7c3c52a61b88445387d6b6637a8a1bc54a5239be59ac92b45316218aa66b8d65a45bc598521dcbc0303fc1bee239e1627e8e8e1405140f62676c2878 SHA512 81050b93f80c2349cfff1c40349b52f0710b8b16a7e088d9d14f710c814086ef0cd34611006bce72c3af1854ee377485e80a708c6a87bda3fb49e48a31a41a53
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
index 71c9e6e6a913..ab3f78f91ff7 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 ADA_COMPAT=( gnat_202{0,1} )
 
 inherit ada multiprocessing python-single-r1
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index feeee00e6acb..f78312c7c73b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,5 +1,7 @@
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
 AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011
+AUX gprbuild-2021-runpath.patch 303 BLAKE2B c70fc64c1e4d361cb72910dbab2d8a7652f0c054da7f9a707fa81ea049fb8f2e6272b1d87bb1a177ecae821cc4fb0ebff197b4527c494893cc6f9f11f37220c0 SHA512 1fd8058bbb8c37654337528856c5b5f3538f2e893a4b6da844d661bd25695dc33304648da8c6f38df7d66019e0a616ae1b705035cdcfa48750df69925eb91655
+AUX gprbuild-22.0.0-2020.patch 1185 BLAKE2B 8932d43f342dd99b8b788de4a3bdc04e10a4326b438e2524b1279cc370fb68f1804af3049975086ecdcaaf0932a4a79c7de863b662a46481d773bd92844e7ec5 SHA512 fbae2ffe6566c70c479e2ba1359b6038f2b811e02bbc2e359f4957b0db5f755fd586b15acda4a4c4f5c9520afcb346d325c9d82ddb89c5d3fcf1d80c0b745b2c
 AUX gprbuild-22.0.0-ar.patch 468 BLAKE2B 8cf38d8632123623ff369e6bf0d96c9ca37e828e71e8445ac46ccfb1636ae8676146a61934c0db915c5b1235a4b9bdc899502b3c71cabae2dae2b69082c87b4e SHA512 e1d66c86b1eeea36a84114bf4993eceeef64541c207d8e11318d842648eaead40675f90b2d16ddb27a68088d6f6bcf4b803c5f8b8c282e73453f76f9b99eb773
 AUX gprbuild-22.0.0-gentoo.patch 11712 BLAKE2B 77088bba7bc022db46e122ea20af0372c7cde4acb4fb4991313306f8e179910ccc428933f04c78cc57f78ae9b400dbfdddd59328c8e454a40fadde2fdea035a3 SHA512 af8eb69a437b18ce9924f922b4ed1b9a09caf83015936e546e673abd908dc30ee16a94c39b9e45507d9a11e126091e35a6eee78f9d513517e7782fd407b288ed
 AUX gprbuild-22.0.0-nm.patch 410 BLAKE2B 71e0a87cce757f934392188d26b7b2e1a8d2adb84afd1ef775b547c90af38eb9390472df593456ff1bb8e29b2959cfd58ceeb91d33154d026efbf08bb3c7b16f SHA512 d560bf2a969018b81deb787e158bd7e408d07138f468ad29fd0d2aae9ea3c9c10d88a3da538b65274e1aa665047b16c86f679d8f5ea5a4f4613b14f588fc6974
@@ -9,6 +11,6 @@ DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a48
 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-2021-r1.ebuild 1938 BLAKE2B 058a58dbd77220c11c1627867c758dec00df0727b4d2a9d2ebb94db71e466d39821b7bd084ffcaca41808f0dba30b4227f3353892206d9ef58cd9a89c513acad SHA512 7e825debb60ef8f8c9936ea1a3b8b8ca6987aa201c219ce18c404616150035e46a8860ce2a16a0db9d84b660c4bd62fcec6f4e5b858da532d8735040eebcb6ec
-EBUILD gprbuild-2021-r2.ebuild 2007 BLAKE2B 69fff8e5b76aa67822269d7b15f4d4c1aafd5ab90dec76719965204b9c5b0fcf41097522f17caf65a2e55eb172731ed44ebca5b51566c5464e62335f2b349159 SHA512 a5f9976cc00148098fac0e6c56387821c842e5e0150590468e7edb162f643788475e4f7ceb7dcb192368dba0d10380e7f860bb8d8bc575e79ee9e500bf4f8145
-EBUILD gprbuild-22.0.0-r1.ebuild 2118 BLAKE2B 1740daa9ef09b57b8b8833f348392be26cd43cbc381bc8a4b80287bff976eed77dd0e3613b4f45152b910389d9f8952ba9a7a22dcdd745d522e72fd20164022c SHA512 f1940bac00deb3a0c00c368fa7ced127d7ee4e4be33a7d4bc045ca5323f8a22bf476a475e5d0eb7ddeb22172111fabf40a11e8d9a89200403ee180539fe44533
+EBUILD gprbuild-2021-r3.ebuild 2041 BLAKE2B ddc4b54d33e3af69f73d91d866db78801843f0848084b97e753fa11e27c54a44b574d0bc0b0d7cc3d2d7c8756b357d659b332fa18ccc0e4ba66776d8e190e2c1 SHA512 272b8a3279be5312b81387525c455064f8e6ce4df725450042e4db0190e85b8a1139039288b8e9d3abcf73d6d06ba3f668bb49c94f412111dab873481fa69d35
+EBUILD gprbuild-22.0.0-r2.ebuild 2468 BLAKE2B 740ffc8709841a6973610e3b0db8e01b9db23a5d1081ae33a39c283918e50ce4fa49e5ae05fadd11fc8764c1c57900c16312514542ad7f9ab79da5d81bf13307 SHA512 727c9ee2d49d76e84b74a9a3220623d3d69436f98a0860f373cd94a1900ceae3491ab3d80cd93c0557caafd731705cd4234fc43e38cefe5ee96cf413b3093b9d
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
new file mode 100644
index 000000000000..9224a09f9049
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-util.adb	2022-03-19 22:41:32.372348082 +0100
++++ b/gpr/src/gpr-util.adb	2022-03-19 22:41:54.325010633 +0100
+@@ -3634,7 +3634,7 @@
+             end if;
+          end loop;
+ 
+-         return Ret;
++         return Ret(1 .. Length - Separator'Length);
+       end;
+    end Concat_Paths;
+ 
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
new file mode 100644
index 000000000000..ba5c2f858de7
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
@@ -0,0 +1,47 @@
+--- a/gpr/src/gpr_imports.c	2022-02-27 10:10:34.053638209 +0100
++++ b/gpr/src/gpr_imports.c	2022-02-27 10:12:03.898276758 +0100
+@@ -114,6 +114,44 @@
+ const char *__gnat_default_libgcc_subdir = "lib";
+ #endif
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <unistd.h>
++
++  extern long long __gnat_file_time(char* name)
++  {
++    long long result;
++
++    if (name == NULL) {
++      return LLONG_MIN;
++    }
++    /* Number of seconds between <Jan 1st 1970> and <Jan 1st 2150>. */
++    static const long long ada_epoch_offset = (136 * 365 + 44 * 366) * 86400LL;
++    struct stat sb;
++    if (stat(name, &sb) != 0) {
++      return LLONG_MIN;
++    }
++
++    //  return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9
++    //  + sb.st_mtim.tv_nsec;
++    // with check overflow below
++
++    if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset, &result)) {
++      return LLONG_MIN;
++    }
++
++    if (__builtin_smulll_overflow(result, 1E9, &result)) {
++      return LLONG_MIN;
++    }
++
++    if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, &result)) {
++      return LLONG_MIN;
++    }
++
++    return result;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
index 8bfc6af4419b..3aeaaf969f80 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${PN}-22.0.0-ar.patch
+	"${FILESDIR}"/${P}-runpath.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
index 06eb16e01235..63740fc4c7a9 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_202{0,1} )
 
 inherit ada multiprocessing
 
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
 	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${PN}-2021-runpath.patch
 )
 
 src_prepare() {
@@ -53,6 +54,18 @@ src_prepare() {
 		-e "s:@GNATBIND@:${GNATBIND}:g" \
 		src/gprlib.adb \
 		|| die
+	if use ada_target_gnat_2020; then
+		sed -i \
+			-e "s:Append_Vector:Append:g" \
+			-e "s:Insert_Vector:Insert:g" \
+			src/gprbuild-link.adb \
+			src/gprinstall-install.adb \
+			src/gprlib.adb \
+			src/gprlib-build_shared_lib.adb \
+			src/gprbind.adb \
+			|| die
+		eapply "${FILESDIR}"/${P}-2020.patch
+	fi
 }
 
 bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index e030a0009b32..e0ce71db85c1 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,3 +1,3 @@
 DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
-EBUILD langkit-22.0.0-r2.ebuild 2272 BLAKE2B caea170c1de4c3000e3fc1a5dae6303a11f61b44bc9ab86c58ba5d006381f58db56accb8df32df07501e1bd629020c93b18911fdbd6d0a629beb9c8d5f43483b SHA512 7a7fc6a299f41c0479d6b151465a7ebb50be1d734a01511b1c311ae20c8f82fffd867a6e5636df89946a1b9b285bbbb275a657035b3272fd1ddb5d0b89b82a4a
+EBUILD langkit-22.0.0-r2.ebuild 2280 BLAKE2B eefdb7caa8e08586098b2d9f3be6021171f827cc22972479fb4bdfe9feea2414baa9a4b0db91fecfcfce1e635fd5acc83bf4171d3c39906bdac966ed24aa5c2a SHA512 616486671ae8ee0ffd37cab607c9a548d3c7a6512dd04122634894b59dec3e189e26205aae0462e31db31854487fa34f7a4ebb7630a78cedb543eff272af63e2
 MISC metadata.xml 850 BLAKE2B b7710a9fee6e662eb2b84db763574557d7aab3d089ed589fb2d05e0ffe48367e42cb6def1abc5565aff06138de7bcf08c9087e82eba4c243238c5e15d365456a SHA512 e2abdab196f73f3c64edaf1bba302175d28b5b99b2beb21f75802c23633b5437060ad6b0e64e3493babe0217d7e47b333c63f350b8241b8018dc8da67696a7e8
diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
index ba69bb3b62b6..041b256514f9 100644
--- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild
+++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 ADA_COMPAT=( gnat_202{0,1} )
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 4747b5014450..2479f39319ec 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-tools-22.0.0.tar.gz 892619 BLAKE2B 5ba3cc91c0cd251ade396eda1d8de4244712905ef33ec9bb68a76ab20908d4034b78989dc051b2e47a2fd37e41ae49bf46b1459a74742205750c8a60697e27cc SHA512 c9028428379e68644dee140b76c6806b15561484bdc77a8c85c88c1ae4de512b6252f41b415fe767c5c7ae533fba1583e075620bd222a7be240d6cd1130d25bd
-EBUILD libadalang-tools-22.0.0-r1.ebuild 1625 BLAKE2B ba195a9c92b03cfa2d0aad2b71f59399550b88103eabbd446076cd86be95ba7bf5158fa1c90249e57bf3bb3ecb837e83c71f23b36bc9649f6505ada9d588d444 SHA512 55d8187f205cc138b1d296a497970e1208b2bba732e32fc6423c0c296d973dc39239fafb1733ad02a8acb42465630d0f438f3238968a1cc6e6ce8981e1d81974
+EBUILD libadalang-tools-22.0.0-r1.ebuild 1630 BLAKE2B 3ce27745f572b68cb9a73ded538403230788818d54c7c5c1b8d75178dbd3f2536d41d26709887197623a19fb7b0238e296ede08d7a757de91b99e811592c9ec8 SHA512 9b58879f982ea3b90d204472a555c598d163498906f684cc3635b04cde795166059886ad93c8b92be4d2f5948b5848387522e4b78ae08735942a6ed0ff773470
 MISC metadata.xml 349 BLAKE2B 03f70c99b25cc9f9b8be3015256c53a33ac164efe2d7ad8a966edf5937591fe026ad2a0b71a9681a71abf4eafb9f3fe0f797e22d4c0e9202421b52dedcc16940 SHA512 0e4cbd9ab757593d6cbd733d458dfb84d5a40fe96d3b75fa207dc2f8d9efd556fbbd77d64e57b5fb8d85855f5dbe79fe2fa1d3f6fcf7e3cd015a488d73c240ae
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
index 2b008feb5445..ff5f14bd876e 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RESTRICT="test"
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index d74aae3a3958..6d0c6deaf554 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
-EBUILD libadalang-22.0.0.ebuild 2317 BLAKE2B 08bcf967bc32983d252806c96d5a1b22e42f622c637db3e4f4ec7c0d21ed90e74e060a337c9ba744d134e5e6355844b8ddf57ee477d6dc4b9631231f52347a0d SHA512 3ad37b2fa779a44f4c5c3f7dd6cd237bcebf001f0ce1f017a69a3c767075db57ccf087df75aba4253f2cd718c2091ac31ed0573360b3577938d65cdfa13a43f5
+EBUILD libadalang-22.0.0.ebuild 2325 BLAKE2B c9ba61350c5d24201ac2b8e0d38becef241897f5816f91246349d415bbf1e5393f726f82471fb0d6f6d36848986f1f6fed0b15865ae43dd1b24191fea836c9ea SHA512 4516c4df07401d5cb97c8fe2c68e6bdebe7615c3c2ca5effb923010071a78cb9f7afd68116c40bbaec96c89277a74c89eb332ac949be784ac2e61ee4b7303141
 MISC metadata.xml 593 BLAKE2B 071bd53cf7e7cf9355eb149d326c208cd63abcee3a690417737c28c26fb6c53b4c7c274029249d9904817b9a4447fa5bcc7f4b7998c1d6cbb4019a00405d085f SHA512 46f32c45534ebf33f69526c239e6832d2a412878d772a8e7d19377d90b49d5850bf42561d853e2a540e50ed9cf759a237b8bdf4d1947ab782081e35323176b20
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
index fb13c72f8afe..0dc44b7cc031 100644
--- a/dev-ada/libadalang/libadalang-22.0.0.ebuild
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 ADA_COMPAT=( gnat_202{0,1} )
 
 inherit ada python-single-r1 multiprocessing
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test +static-libs static-pic"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}"
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index b39568025164..255df9b4cad9 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,6 +1,7 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 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
+EBUILD libgpr-2021-r1.ebuild 1584 BLAKE2B f3926e4debe4045dff5c3634fc2b0f5884dd224c1970ba37619cd25ce8821c1cbf8dc4d1a12c41f13e52c81d0560e208ded359c27dcdd18a92005b3ac03f2512 SHA512 e83a6d0cb69ba39427bc45751c0141acf8d45641f2326eaf52796da9783fd1d0e9cbcfa8252a247b90d7fbbfc7b3b4bcdcae5d48be41361d237096474f9e111b
 EBUILD libgpr-2021.ebuild 1493 BLAKE2B eeb451a646144b39ef218eaa5ec0c19fe8e7eef2cc94c761affff9c1fbf27488fb5e018ff432b599b76ab1d5684b993a6585068366b3bc3ffb1853b0b0f2ad68 SHA512 b63cf83d90ccd3d62caa1e758bfe03b2bf5aab199086645817432680bea73625ea3bcfbf2d140d11fd867becd966920f02084dad699e3cb6ddbb7102933f01ac
-EBUILD libgpr-22.0.0.ebuild 1422 BLAKE2B af1ff166e220abc906168b9f902a3edbc13323d7029ecfadeb1504e2f0cd1a20a8eb88c7baaf9288e8b763c471bcd312b4510a2d575a14e05f60952c04a516e6 SHA512 0efc8da09a1736fe55e9d202dcde3211bd8baee1ac679956ab53d0a035d93934bf1ea8440e5d8e43d7b846d0f0c04b52825ce846fcccfdc0e652db5bcbbb1c5b
+EBUILD libgpr-22.0.0-r1.ebuild 1511 BLAKE2B a10ab38f1916e0ccf62c6b4edeba14c4597d5e114461dd299a6e53e780ab34420a9b7a2634ac8f19844b76363ffb41af1a06286c928151bd6bd83d170e344ace SHA512 356a0b5b186d78e157a0ba69aa8eae4c5024825e201f5e5b12b2310e98b8fe3c654e56eaa22447d2a62ee1d1d2b0f12bc6021f965f661e55387e25c369c07971
 MISC metadata.xml 940 BLAKE2B aaa252e5e7455d29591e45927ccbefc9f7a21367af3f1da9a9341695f722dc6cfbf7f52ea6630e392439684fc8ecba06f2de6372c6624c2f53b2712533772490 SHA512 8bc90bfb6ae6ed3847b8809ef1e1d35ec8a1abf4a0b0353dac86c62c5fe5593a9523984988b723a3f9c9424285b2ab30bd45ef3b746956bc8be7751b63a35704
diff --git a/dev-ada/libgpr/libgpr-2021-r1.ebuild b/dev-ada/libgpr/libgpr-2021-r1.ebuild
new file mode 100644
index 000000000000..6f89e775d4eb
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-2021-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+MYP=gprbuild-${PV}-${PV}0519-19A34-src
+ID=23a77a37247ff811609e23a0a271f445c299fc8f
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="${ADAMIRROR}/${ID}?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}"/${PN}-2020-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
+}
+
+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-22.0.0.ebuild b/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild
index 68bf6f6c798f..f613771b4903 100644
--- a/dev-ada/libgpr/libgpr-22.0.0.ebuild
+++ b/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,11 @@ S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
 
+src_prepare() {
+	default
+	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
+}
+
 src_configure() {
 	emake setup
 }
diff --git a/dev-ada/spawn/Manifest b/dev-ada/spawn/Manifest
index d0f263141044..32d9652ee0d1 100644
--- a/dev-ada/spawn/Manifest
+++ b/dev-ada/spawn/Manifest
@@ -1,3 +1,3 @@
 DIST spawn-22.0.0.tar.gz 49836 BLAKE2B 2283eadae1477600934cbecb67e0fa4c0640150c4d05356ec3d047fdd664e68510c99f9e495dc448c83fe0fea25523727ecb45ee6e85a4b205255a9549031110 SHA512 706c53dabe82994a809c33e984d467ff0f72a2ed9566dedc8262b2c908393f241546ce379a03ea50eb73bf2326b52fc4804d6e192810c703695fc32c9da0b530
-EBUILD spawn-22.0.0.ebuild 2685 BLAKE2B a1edf2a868d0842ff38d8663cd344ad0acf7b8e1ab3f97e3ecbab4b31fa50ecdc0e1b2414fc77295b2392913ae6c89ea2c433bd2c5eb98e8de985eb506d9c700 SHA512 5da824b7ae163f1eae827601d08b6b08a7304075e2e5dedebe7999f99136c5525420bb75ebc60ac0484df94cf244843cc294970415a9c67b9eed554d97d11809
+EBUILD spawn-22.0.0.ebuild 2693 BLAKE2B 7a3012a267f5b820c56f212e89a02c1667e588dafa3c93c97a528c5f72d21a8c01c7af5a12f4b38aae05c1b02b6dd6511602d174e44d1a523aa8010410fd5df7 SHA512 f0a88eeec7b12e87ba5ef5a3d3e30da96d4ba2dd03816a38d51fc3ee6bfb7fdf10a350d5b987f4d7cf732587b1e8302f06f4565d153022ff3dea57cb98581bfe
 MISC metadata.xml 679 BLAKE2B fb0964502dfb671ef0168b6111587db4e035c772aadbe3429122ee418884fe06dbbd7a774b3bf2b49ad3ed481a29baef30db2c3fac8044aca55b5bdbb4954950 SHA512 7f421ead1f5ee3d9c18b086bdbbcb8c4987d987079ebfa36249ceb3bc9d9c6e35644278dd085debd05165b7c8fb83be0a57395ebbdf4f2b757b24d89e0321a42
diff --git a/dev-ada/spawn/spawn-22.0.0.ebuild b/dev-ada/spawn/spawn-22.0.0.ebuild
index 2d8433b46e3a..8dadaafbd2ee 100644
--- a/dev-ada/spawn/spawn-22.0.0.ebuild
+++ b/dev-ada/spawn/spawn-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ REQUIRED_USE="|| ( shared static-libs static-pic )
 
 RDEPEND="${ADA_DEPS}
 	glib? (
-	dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?,static-pic(-)?]
 	dev-libs/glib
 )"
 DEPEND="${RDEPEND}"