gentoo resync : 22.12.2021

38 files changed, 428 insertions, 58 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 5dc9f89d3e34..aa4d55d476d1 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index cc6637a63815..bfa752f50a62 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-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
 DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
-EBUILD aunit-2021.ebuild 1190 BLAKE2B e8d14f637bb9a81854016d234ba37621dc1d445cef33b9b9b6fce55531522db424267095fcf4e1fa27d1512d1f58a41fee793a97bd516df5d576392d495acce4 SHA512 40201e1765a2d8bb568543c05b3a4181877cbc03c1711b90f8b45c5447cfdc183a8e722cb92acd74ceae8b44afef60e87a6220a9a287e9d48d963561ee496024
+EBUILD aunit-2021.ebuild 1189 BLAKE2B bce26c0cdac638bf24b2c0f6011759d630c0f46d4fd4c1f79bd3f0f386c3088f7f9f7d2f41d5f558bf37bcca1101e316bb7f7fcfa333955b8d7762392074c4f7 SHA512 5925f1fb5f001cc47d8d41b40f216ebb95be32b3fcd4a3b3e4b43a683533c5488a1b57a2d8cce03f3b05bebf8be943911c8df0fe92df49f512ac85cd76307115
 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 3bf9f54c6dc4..b7af4c57327c 100644
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ b/dev-ada/aunit/aunit-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 2e194a6af58d..059ec748ccf1 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -3,6 +3,6 @@ AUX aws-22.0.0-gentoo.patch 1120 BLAKE2B 4cb809bd0c1771bbd15ab1e70ebb7c0f8d523c6
 DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
 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-2021.ebuild 943 BLAKE2B aa258b62f4e41277b337931b1c81626ab6a448840096b942ba9edb715517712acdb655fbafb46c73aad9bbf162ec604455d7c43693e670dfd922c98f075e0920 SHA512 1c9af6960a60ac518fd3cd6360e34836148b7c318c3e5c63288fbd5096ce503fd39466550c51b61180091c3030c0db8a2baed5505c4f35c4e37e21b28bec78dd
 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-2021.ebuild b/dev-ada/aws/aws-2021.ebuild
index a675e9f44099..477eef589545 100644
--- a/dev-ada/aws/aws-2021.ebuild
+++ b/dev-ada/aws/aws-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 14b16375253a..fb31d4bf0d83 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 2368 BLAKE2B 06fca9537d21a032cd28fd9ff720443ee57c7d6dfb90180b5b03ca36f95e98e9cd8b8b5a65bfd32304878ba75bfa6aa3449f6043fa84dc2ce65658205798e798 SHA512 51a7f1b86302f3f65c8c3ba4374d709c11fd641540c561f2410c74b8cde3fd0a513fce01b56d1993fee694901231ab60df0c0504d63f844a1a915513b4562f6a
-EBUILD gnatcoll-bindings-22.0.0.ebuild 2485 BLAKE2B a16cb572d954fc46cf029a6150b3ae6b1d7b3ba838956af985862c8af2edfa2d83f3a52721b7cf529a4fdd8e2401ad65dc4b7fc56e9634d5533828816a0ebb10 SHA512 0edef42f78e9694a65c172c4da9562cff2dd5c79f22e98e4d859b4746e2a1027c2e4220efa763c9a5c249a147fd66c432afd12534407a7d0c70f7abee3ea58f5
+EBUILD gnatcoll-bindings-2021.ebuild 2254 BLAKE2B 86f295e0a2174d8c904ae4804891485fb78a473e64e14dc45c4c883f4a27b04e1253739fc7f524b1e17adce9013bd989d87ebdd9afa404d82306945f0fc3f0ef SHA512 c3db61663a7c0706ffa3b29651a3e13fe4d6ee1f4fe87afd433cd42bac49c1e923b1038492bcf75f4ba6138b52d8e6763dc71b7b8bfced9907b16a28ddcb7cab
+EBUILD gnatcoll-bindings-22.0.0-r1.ebuild 2471 BLAKE2B 7566ee61ad046ab8034ea281abebab1f1912cf3857825574328d736b9388c0a4e3aab275dd1905689e029b0fd419e17c160db3c3f7549f70e28b4f1f8fc95ca6 SHA512 0a4253a1723d462820ea89048c4cc3343805cbfa5a8c43c9b84f16aa8fc8df71ec5a032362521bf34f922503d8dc2e60c2e5f7abeddb727f7d4f5d8ffe606512
 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 e232eb02e6d5..b37ed6806642 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -17,23 +17,25 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="${PYTHON_DEPS}
 	${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="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
 
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
+
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 	ada_pkg_setup
 }
 
@@ -48,7 +50,6 @@ src_compile() {
 		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= \
 			-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"
@@ -70,6 +71,7 @@ src_install() {
 	build () {
 		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
 			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			--build-var=LIBRARY_TYPE \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
@@ -83,12 +85,6 @@ src_install() {
 			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
+	rm -rf "${D}"/usr/share/gpr/manifests
 	einstalldocs
 }
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
index 0e7007193e78..2f979894c8c7 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-22.0.0-r1.ebuild
@@ -16,8 +16,12 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	|| ( gmp iconv lzma openmp python readline syslog )
+	${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+RDEPEND="${PYTHON_DEPS}
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )
@@ -27,8 +31,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	${ADA_REQUIRED_USE}"
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -47,7 +50,6 @@ src_compile() {
 			-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"
@@ -72,7 +74,7 @@ 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_VERSION=${PV} --build-var=LIBRARY_TYPE \
 			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
@@ -89,12 +91,6 @@ src_install() {
 			fi
 		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
+	rm -rf "${D}"/usr/share/gpr/manifests
 	einstalldocs
 }
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index f37b11b9d802..432edcffe908 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,6 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
 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
+EBUILD gnatcoll-core-2021-r1.ebuild 1740 BLAKE2B e01a04c0cd8edbb4f1807de2e2b1b4072e9d1305b92c59fa959509996256e88550f85724dd70b84ffb5325285d3635adb4fe0d760f085ed62a95302f3079e7e0 SHA512 5f52c5f3cb8b3395c18f8d6e866dee7caa3bd4bc8462f5ccf0f1840193455b6d36c56a76c3bd1c2cc1560150509e19e28e171c180a1931f6e620ec9157b7bd20
+EBUILD gnatcoll-core-22.0.0.ebuild 1672 BLAKE2B b46f89865fc7cc67800076b6d7aba149e50d3b687b66b3642f52e41b131c73ad7eff2e7e2a39f7e8ababf45e0b5b764fde207708783ed9293333e85455bc5f6e SHA512 72aad6a2ae9d12891e5e69d05d77933195e54d161ee45852e94961bb2b8d0356274cd1e28104ac07a334b0ae02834e60b0a5fe5c4e289a2b2df606f4bdc76a70
 MISC metadata.xml 1096 BLAKE2B 138ba19dde84f957c6494fc1971672c8adc96feb4af484296aae720aa860132b0b709a9e5fc8ae8d391604dd8fd0c8d3f34fb11e836629a837463d311c68f677 SHA512 3bfb17c3531f6c3f66047534316bbb906214067208695b2e61594649f51842de82e6f2340d59acb2da9d8ac401cfcf95f8e9326b5ab07db5f794a4fe7a4898a7
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
index cb2c0985a82c..5dda64406fd3 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
@@ -15,8 +15,10 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
 
 RDEPEND="
 	>=dev-ada/libgpr-2021[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -24,8 +26,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
index 58f464be487e..3d1edf36345a 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
@@ -14,6 +14,8 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
 
 RDEPEND="
 	|| (
@@ -25,8 +27,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
 PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
 
 src_prepare() {
@@ -51,12 +51,12 @@ src_compile() {
 	if use shared; then
 		build relocatable
 	fi
-	if use static-pic; then
-		build static-pic
-	fi
 	if use static-libs; then
 		build static
 	fi
+	if use static-pic; then
+		build static-pic
+	fi
 }
 
 src_install() {
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index e7b52062697a..d34b79d32c87 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,4 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2021.ebuild 1020 BLAKE2B 3a4bb932c43be0c97caba2e40b77bd07bc2d5f3bd93997b3feea34a1c73a1401555ecd8d0dc14a4369c537be71307adb138e78562cb910f3d2cae444e0222719 SHA512 c88c4827106462cdc9aeccce3db546cbe33a8f36df217fb46060ee1e64e0678ee6f6efc375e4ae0f334cda0f4a690637bae5f10e5d6967f14232fbcae6bbcb8a
+EBUILD gnatmem-2021.ebuild 1019 BLAKE2B b01dc01259f1aa615569312622dd5e13428d28fc324a7c043ccf54e10eb51b9e41b899a9084561a4f4ff3d6b125087a02ab9cdee4cfa6671938ebe225351fa4b SHA512 821e82874b03b9361dec48db4f642a3b9a4c685374ae36dff12106abdc3c6cce233b21ba92bcbec7bd73b0a012c0beccb80e39194744780ee79a2c10c11d29bb
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
index a20826c8c122..29b896a5539e 100644
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 30e5c71f2802..34d1cd268718 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,3 +1,3 @@
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2021.ebuild 738 BLAKE2B b32d03557f38a6b3d40d262b3ba60eff41f7fe4e0a8493d406f0cf82bae0d5930e6f7b2c3f1b41a900107e4136219b3a92d9dea890c58c414baae61e3fad8fd6 SHA512 bb1ce4431a5636f0e4897673c07b7c30a8f947ffa973715d60ea605f1a5f140f47e7d3f907ac533d9e975e9b958737ece0e801b8dbc8c061f6879cb6203ed75a
+EBUILD gnatsymbolize-2021.ebuild 737 BLAKE2B ac938e08632905c51af5b27d2a454a72f436a421bfa0fdb81572b9539ff87fecf7b1bf670b2b8997e438d0bae60d91c3b72e2603d9c2ade5c8b0d1dedbfee971 SHA512 e93a3831ffd788217617a1645c813f3b73a7f6a614a9d867a3251496e3a8174c763d679322dec510e6f2dbb2135f5208d588f7b150edf01ad6f3ff9363a6f9a8
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
index 7e763d16a016..6745bf7aa89d 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index f6b5ce1ea762..6149673f1261 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,10 +1,13 @@
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
+AUX gprbuild-2021-nm.patch 421 BLAKE2B 44b6166e3102df7eafa8af168701d09e2680a91c28cd808414a1073eb84ebfe0c6dc98c53886020d8acb27369b45f5897c7a1f236ad6dfe32ad6feaf0beac76f SHA512 49cf35270e29e3292ac95b23d117aeb3ed1d3ee8c2a9a174a8ba2a2e7270fa56cad2a3edbc548731f2ec8c66d8327ec754fcdb2a6f2e17220d6c649f20741e3d
 AUX gprbuild-22.0.0-gentoo.patch 11712 BLAKE2B 77088bba7bc022db46e122ea20af0372c7cde4acb4fb4991313306f8e179910ccc428933f04c78cc57f78ae9b400dbfdddd59328c8e454a40fadde2fdea035a3 SHA512 af8eb69a437b18ce9924f922b4ed1b9a09caf83015936e546e673abd908dc30ee16a94c39b9e45507d9a11e126091e35a6eee78f9d513517e7782fd407b288ed
+AUX gprbuild-22.0.0-nm.patch 393 BLAKE2B 2ad3e37a5f62e47c2049f88cc0d2378287ec7d33521de73d2680f2b01770b7856bed7dfec26c61a908f68b742caa57405768e7f5881f93efca9ede4ac6ce17a8 SHA512 9011cda1b306647e1d1f38a2a19b601065683ccbce253be0e9c7ecf6dd261b15a9936ec6d619bf71650d8fa5cf6103a1f35d9b0d1dbf0b4d2938cbb5d19a35e7
 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-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 1939 BLAKE2B b8631c09b20aed1bdc9c6fcac21f52a3307595fcc11d296d4819d2c8fd5c5ee046fc7377e30d821a619c0c46017987b946c9ec4de08ceaa9e09954dce348b600 SHA512 f1e5b231152cf236ef00142be869af09c3424c97c65619def0045863c7ac21fffc56bed6f003c0af4e126b82f638304c870bbd45769e9c23edce2e113579ea82
-EBUILD gprbuild-22.0.0.ebuild 2059 BLAKE2B de1269eb15fe3156ea47105fbca074cb5fdc298884ce7daa0b0bb3f3162666c6a9216e041102ab149befb907f708d418e8460f271566d9e3b1cf21565b1d2b69 SHA512 409484b30fec234d91ce1d186c6232ed0554cde0324d55d8c9231ab618496b264d5d2fb8d8e42ad58476b6ecc5f9ba3ef5c72653ff80c5ed6c542aa0a9a639c5
+EBUILD gprbuild-2021-r1.ebuild 1938 BLAKE2B 058a58dbd77220c11c1627867c758dec00df0727b4d2a9d2ebb94db71e466d39821b7bd084ffcaca41808f0dba30b4227f3353892206d9ef58cd9a89c513acad SHA512 7e825debb60ef8f8c9936ea1a3b8b8ca6987aa201c219ce18c404616150035e46a8860ce2a16a0db9d84b660c4bd62fcec6f4e5b858da532d8735040eebcb6ec
+EBUILD gprbuild-2021-r2.ebuild 1970 BLAKE2B 502e146075d047a5b492f2f35503937e3e1f765637f63d8dbd42d3f9c2eceb1f541c73249c1f008c7de621ee7de3ea85aa2ea82bc174b81e1716ee7c12161802 SHA512 4581ff1adedf9ba53b3740a3dc6f7dd203f560f9723483b9c70c17e040c674f3f1d88744c2a28b35991bdc86416bc6c9a955c72062e7b08712c048c2fdeef839
+EBUILD gprbuild-22.0.0-r1.ebuild 2089 BLAKE2B 45dce3b479724a520aaea113d57eec8faa64f3c667c679d213b41a888be4ae887827acb24e38ea3b0f58a8175b4a512ab82ebc085ab362905e3db131e60cb7f2 SHA512 93404c1f91686ff58dc380634999c73bdfc2174bd13eb186b0245e86ded86c9a8676251c71353670481a9731c458a4324d9a0b8976cb1050c46e45f6fd6d767a
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
new file mode 100644
index 000000000000..2bf41a8e1b07
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
++++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
++   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
new file mode 100644
index 000000000000..4455e8befffa
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
++++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
++   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
index 37e819ad2623..c594e0557c65 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 	${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
new file mode 100644
index 000000000000..40a16cb9b2d4
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -0,0 +1,80 @@
+# 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
+
+MYP=${P}-${PV}0519-19A34-src
+ID=23a77a37247ff811609e23a0a271f445c299fc8f
+XMLADA=xmlada-${PV}-${PV}0518-19D50-src
+XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADAMIRROR}/${XMLADAID}?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
+	"${FILESDIR}"/${P}-nm.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-22.0.0.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 6de6ca467e32..2a07d5e4d71d 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${ADA_DEPS}"
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-nm.patch
+)
 
 src_prepare() {
 	kb_src=../${GPRCONFIG_KB}
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 3bcd3534a149..491a533a7d9f 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -2,6 +2,6 @@ AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b0451
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
 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
+EBUILD gtkada-2021.ebuild 1368 BLAKE2B 3e78916675f01a8dd10d44eda38498bb7364636e4c5f2a6c4a15b83d32643e18739a2ee9b6ef505a37216c2789d652a8cba58b3f3dfaa608893583ab1d4cbaa4 SHA512 8282daece575423c55e5cd9a9acab6643e796fc213e768a1391516ad8fa8e3d39278da9b7a5a474c2ac23c5d3ba762d5a80d3cb53995ee90076b236845ab57ed
+EBUILD gtkada-22.0.0.ebuild 1102 BLAKE2B 52776b987a85ec569430d344b3fae9624652de24422e0f896a54bc20d3b99b0bd31e2111e32561fdea388ee9af6bb07cd8600bd765a9ea5e4fede9c62b6c26d7 SHA512 33a315ea324e020edab354b32f3735a3e1c72a93e2780ddefc13375c98d166635b80c6e16015c29b9f354f8b32fddd38b6202955f5455e5cfb9a66c85d0bd978
 MISC metadata.xml 537 BLAKE2B 2504eb7e8c0fe1a143ea8f6f4ba3ac530245d3781f906536dc7680e775cf8b546e7019d43adbc78e1b7793825eb9bea849d78ef482325ccd16bc30d96691ea7a SHA512 4e683dd78d8d81851116548db6014157fcb363d96fa4df04e45c35705505ed3b3a863a3b082dc4a7e814df8587b7f5fba6e696c8ee12e14d0d04a71199977d17
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index b105da3b0ff7..da08ed425283 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs"
 
 RDEPEND="${ADA_DEPS}
@@ -31,7 +31,8 @@ RDEPEND="${ADA_DEPS}
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-REQUIRED_USE="${ADA_REQUIRED_USE}"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs )"
 
 S="${WORKDIR}"/${MYP}
 
@@ -58,6 +59,8 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}"
+	emake -j1 DESTDIR="${D}" install
 	einstalldocs
+	mv "${D}"/usr/share/doc/${PN}/${PN}_* "${D}"/usr/share/doc/${PF} || die
+	rmdir "${D}"/usr/share/doc/${PN} || die
 }
diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 0d925e9cb301..439153321466 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -53,6 +53,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}"
+	emake -j1 DESTDIR="${D}" install
 	einstalldocs
 }
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
new file mode 100644
index 000000000000..401c6ae9522e
--- /dev/null
+++ b/dev-ada/langkit/Manifest
@@ -0,0 +1,4 @@
+AUX langkit-22.0.0-gnarl.patch 349 BLAKE2B f26ff18ef2176a9e5f277e510202c3d87f2e40d29054d78b0d531d22c769ed2c18319dc0198a3f79a048a9f26027710334d80957f635ed05427581245b4d4525 SHA512 9f979f63839fb56a0536bf045b859fadb917177e587debe23c2e142fc05d78b06114e6c93125633aa244ac8e4e8965ce66336eb71099890d063353954c2120d9
+DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
+EBUILD langkit-22.0.0-r2.ebuild 2191 BLAKE2B dce7e7b59ee4227b247d146bcbf8bc113bf8eaece04f660dd6e99a656d8daf63c7dabefecbf9d0e61b30d8936f3f02303ed8c4edbac739c5ae8982751bd5b0a5 SHA512 8d90a2b168d72a868f398b4d5924bcb536f44ebc2873242d773ae574e8f8462a2da1e88707b833228b93d4dbd01968340544f412ad7afb3c08d7f3deaf3ccf41
+MISC metadata.xml 849 BLAKE2B 3d15fb84d68db223622feaffb842e571591ec11e1ac4931d0baecc10b8c58e065283e56bac2be2297c5cd79fb04560ddfafb43fda6bb07b8b738d3c32786e4f5 SHA512 956aaa0b8446a30d6808a066716cf9572d44da813530eb3e5fe28b181b3579b3056b3429856146dae0ca8fb8e4787ee2b83d2d4ce2df9a06d3e835620289bb76
diff --git a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
new file mode 100644
index 000000000000..fb69768dc9de
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
@@ -0,0 +1,10 @@
+--- a/langkit/templates/mains_project_file.mako	2020-06-09 09:34:36.677265457 +0200
++++ b/langkit/templates/mains_project_file.mako	2020-06-09 09:35:30.569451995 +0200
+@@ -40,4 +40,7 @@
+       for Switches ("ada") use ("-E");
+    end Binder;
+ 
++   package Linker is
++      for Switches ("ada") use ("-lgnat", "-lgnarl");
++   end Linker;
+ end Mains;
diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
new file mode 100644
index 000000000000..4e998a1d09a8
--- /dev/null
+++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-bindings[gmp,iconv,shared?,static-libs?,static-pic?]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/funcy[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-ada/e3-core[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	cd testsuite/tests
+
+	# missing gprbuild option to build libraries static/relocatable
+	rm -r {langkit_support,adalog,misc/link_two_libs} || die
+
+	# require railroad-diagrams
+	rm -r contrib/svg_railroad_diagrams || die
+}
+
+python_compile_all() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -p -v \
+			-XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+python_test_all() {
+	export GPR_PROJECT_PATH="${S}"/support
+	${EPYTHON} ./manage.py make --no-langkit-support || die
+	eval $(./manage.py setenv)
+	${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut
+	grep -qw FAIL langkit.testOut && die
+}
+
+python_install_all() {
+	build () {
+		gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \
+			--prefix="${D}"/usr --build-var=LIBRARY_TYPE \
+			--build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
+			--sources-subdir=include/langkit_support \
+			-XLIBRARY_TYPE=$1 --build-name=$1 || 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
+}
diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml
new file mode 100644
index 000000000000..09df5e8fc04c
--- /dev/null
+++ b/dev-ada/langkit/metadata.xml
@@ -0,0 +1,21 @@
+<?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="shared">Build shared library</flag>
+		<flag name="static-pic">Build static library with pic code</flag>
+	</use>
+	<longdescription lang="en">
+		Langkit (nickname for language kit) is a tool whose purpose is to make
+		it easy to create syntactic and semantic analysis engines. Write a
+		language specification in our Python DSL and Langkit will generate for
+		you an Ada library with bindings for the C and Python programming
+		languages.
+		The generated library is meant to provide a basis to write tooling,
+		including tools working on potentially changing and incorrect code,
+		such as IDEs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
new file mode 100644
index 000000000000..75714f352d5b
--- /dev/null
+++ b/dev-ada/libadalang-tools/Manifest
@@ -0,0 +1,3 @@
+DIST libadalang-tools-22.0.0.tar.gz 892619 BLAKE2B 5ba3cc91c0cd251ade396eda1d8de4244712905ef33ec9bb68a76ab20908d4034b78989dc051b2e47a2fd37e41ae49bf46b1459a74742205750c8a60697e27cc SHA512 c9028428379e68644dee140b76c6806b15561484bdc77a8c85c88c1ae4de512b6252f41b415fe767c5c7ae533fba1583e075620bd222a7be240d6cd1130d25bd
+EBUILD libadalang-tools-22.0.0.ebuild 819 BLAKE2B c8d6e1c8b5537468d1563e4d5e2ab83dfe0fdc29a618c3550f1357007565a49b6816bff54482eb11a37d00c692080c566e48b894fa64d88fb2f19ce002c6d155 SHA512 8bb1ab34b636c7aff693792efae32224fb19287cd90438d1310a7024c5ae5b0e972bc10688e877b21572910e96241bfefd2d215f2a8b8bd3b03ea4cc16dcdba5
+MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
new file mode 100644
index 000000000000..9f4a7cad4a24
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
@@ -0,0 +1,35 @@
+# 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="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	gprbuild -v -k -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
+		-XBUILD_MODE=dev -XLALTOOLS_SET=all -P src/build.gpr -p \
+		-j$(makeopts_jobs) || die
+}
+
+src_install() {
+	dobin bin/gnat{metric,pp,stub,test}
+	einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
new file mode 100644
index 000000000000..d2615c1b0e0a
--- /dev/null
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
new file mode 100644
index 000000000000..2be3d38c3b93
--- /dev/null
+++ b/dev-ada/libadalang/Manifest
@@ -0,0 +1,3 @@
+DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
+EBUILD libadalang-22.0.0.ebuild 1957 BLAKE2B 4999606ed4a57777271770236b789d39a139001f13ec785aa3fde289f5832d1351734e45c8f1a44408b1e205c20329aa7c3820612b584b0e8a6f2d61d7c5e382 SHA512 604b37d5fdbc13098ce96945cbbfbc9cc45d1c6dce40bb4a83ae9b503387b0509d74c98c2f4938b6e4fc83f2143a775b2330890e7b58880965a9ef6dd55aadff
+MISC metadata.xml 642 BLAKE2B dbc4f55e5c9dc5fa56d8069493d9fed5041e66e18820b13492d313fb8dbfdfe4d371808ba5f8b614643696505ba8d4dd2804f9ee6047bfd037ea89716c42bea4 SHA512 b8bbf822ce38430142160564385df61f4c85e834109a675fff438771a2aed6843d1d00f6ea6392fbf055719378caf3bc0c40bb2ea25f00f784b000d5b49bc0b9
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
new file mode 100644
index 000000000000..0af159f8bff5
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild
@@ -0,0 +1,82 @@
+# 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 python-single-r1
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test shared +static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
+	${ADA_DEPS}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-ada/langkit[${PYTHON_USEDEP},shared?,static-libs?,static-pic?]
+	')"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+"
+BDEPEND="test? (
+		dev-ml/dune
+		dev-ml/zarith
+		dev-ml/camomile
+		dev-ml/ocaml-ctypes
+	)"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+	libType=''
+	if use static-libs; then
+		libType+=',static'
+	fi
+	if use static-pic; then
+		libType+=',static-pic'
+	fi
+	if use shared; then
+		libType+=',relocatable'
+	fi
+	libType=${libType:1}
+}
+
+src_configure() {
+	${EPYTHON} manage.py generate -v debug || die
+}
+
+src_compile() {
+	${EPYTHON} manage.py build -v \
+		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \
+		--library-types=${libType} || die
+}
+
+src_test() {
+	#eval $(${EPYTHON} ./manage.py setenv)
+	${EPYTHON} manage.py test --restricted-env -j 1 |& > /dev/null
+	${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut
+	grep -qw FAIL libadalang.testOut && die
+}
+
+src_install() {
+	${EPYTHON} manage.py \
+		install "${D}"/usr \
+		--library-types=${libType} || die
+	rm -r "${D}"/usr/python || die
+	python_domodule build/python/libadalang
+	rm -r "${D}"/usr/ocaml || die
+}
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
new file mode 100644
index 000000000000..217288dff7b1
--- /dev/null
+++ b/dev-ada/libadalang/metadata.xml
@@ -0,0 +1,17 @@
+<?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="shared">Build shared library</flag>
+		<flag name="static-pic">Build static library with pic code</flag>
+	</use>
+	<longdescription lang="en">
+		Libadalang is a project to build a high performance semantic engine for
+		the Ada programming language. It is meant to provide a basis to write
+		Ada tooling, including tools working on potentially changing and
+		incorrect code, such as IDEs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 7eb0c994a867..ef55d2a56d3d 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,6 +1,6 @@
 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.ebuild 1494 BLAKE2B be464001890e3ae92f0942ee6f7dbe9f95236236523d2aaaae932dc7924d0470c1fa5af72d651ba6fbdf6b7bdaec1b7f5b4c24fd8d2fbd07ef02c9e9fa632cc3 SHA512 958a45707b2706d25da8cbc6e95223ddd3775fc8e1173b471b9280dbaacf16c33742b68bd43f18625ff698f894c0e380ad66b9ab4096a04666b8e77c918a2513
+EBUILD libgpr-2021.ebuild 1493 BLAKE2B eeb451a646144b39ef218eaa5ec0c19fe8e7eef2cc94c761affff9c1fbf27488fb5e018ff432b599b76ab1d5684b993a6585068366b3bc3ffb1853b0b0f2ad68 SHA512 b63cf83d90ccd3d62caa1e758bfe03b2bf5aab199086645817432680bea73625ea3bcfbf2d140d11fd867becd966920f02084dad699e3cb6ddbb7102933f01ac
 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-2021.ebuild b/dev-ada/libgpr/libgpr-2021.ebuild
index b6291478bec1..5a8a4b5bf7c1 100644
--- a/dev-ada/libgpr/libgpr-2021.ebuild
+++ b/dev-ada/libgpr/libgpr-2021.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 37d07fd16566..1424b198426c 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-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
-EBUILD xmlada-2021-r1.ebuild 1980 BLAKE2B 1e5e65b6506018a4110246c55e51997a3cd81c2a31994b26bd48b8a8b34f66be0cf85b5db0262e0759bb520306ae3fd6900394cc6384be63c61cc98ce1e113d5 SHA512 2adf47283f61526d3cb26b32a0f94c4c65f0562297991e6003a6bdb5b9acb8d893eff734e57025fc400e7d74b2f36e59dcc1cb609e10847704a25c1df3ceab59
+EBUILD xmlada-2021-r1.ebuild 1979 BLAKE2B e932b44dc05adc4ca2812bd2d017c46ea63c02f8524acf00e22926bd5074ab615a6bbbf320f08ebaf7232a4e3f390e682d39d63d05fa60d5663ca03a25bdca52 SHA512 6ff134121e7377750a58c3751e5a35c5169fa61aa2cdea49275e13b854f24b0ad87af4959e286182e3bd944167f2f8b50985ec628e314ad57a0bc378271db4e4
 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/xmlada-2021-r1.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
index a946ece90d98..b13db8333c06 100644
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"