gentoo resync : 20.03.2022

16 files changed, 80 insertions, 66 deletions

diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 9235c65ed2dd..58e65f653dc7 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/ada_language_server-22.0.0 b/metadata/md5-cache/dev-ada/ada_language_server-22.0.0
index 0da0444d3fce..40fa06edc3e3 100644
--- a/metadata/md5-cache/dev-ada/ada_language_server-22.0.0
+++ b/metadata/md5-cache/dev-ada/ada_language_server-22.0.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] test? ( dev-ada/e3-testsuite )
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/libadalang[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/libadalang-tools[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/spawn[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/VSS[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/libadalang[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/libadalang-tools[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/spawn[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=an implementation of the Microsoft Language Server Protocol for Ada/SPARK
 EAPI=7
 HOMEPAGE=https://github.com/AdaCore/ada_language_server
 IUSE=test ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/libadalang[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/libadalang-tools[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/spawn[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/VSS[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/libadalang[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] dev-ada/libadalang-tools[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] dev-ada/spawn[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/ada_language_server/archive/refs/tags/v22.0.0.tar.gz -> ada_language_server-22.0.0.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=a689ff42733325332790714b134370a3
+_md5_=33403327da40e79122825565633fd0d4
diff --git a/metadata/md5-cache/dev-ada/ada_libfswatch-20201105 b/metadata/md5-cache/dev-ada/ada_libfswatch-20201105
index 380492b515ca..1c74f321a590 100644
--- a/metadata/md5-cache/dev-ada/ada_libfswatch-20201105
+++ b/metadata/md5-cache/dev-ada/ada_libfswatch-20201105
@@ -5,10 +5,10 @@ DESCRIPTION=Ada binding to the libfswatch library
 EAPI=7
 HOMEPAGE=https://github.com/AdaCore/ada_libfswatch
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
 RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared] sys-fs/fswatch
 SLOT=0
 SRC_URI=https://github.com/AdaCore/ada_libfswatch/archive/94c0a5f137b88113a791a148b60e5e7d019d6fa1.tar.gz -> ada_libfswatch-20201105.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc
-_md5_=e9348d5d3245d8232566a0483fd0a38a
+_md5_=9abb1e2bac5022063614a9353555dbcd
diff --git a/metadata/md5-cache/dev-ada/e3-core-22.1.0 b/metadata/md5-cache/dev-ada/e3-core-22.1.0
index cf7344dc7b1c..c1d1436ec295 100644
--- a/metadata/md5-cache/dev-ada/e3-core-22.1.0
+++ b/metadata/md5-cache/dev-ada/e3-core-22.1.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/httpretty[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/subversion dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !app-editors/e3 >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/httpretty[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/subversion dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-editors/e3 >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !app-editors/e3
+DEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-editors/e3
 DESCRIPTION=Ease the development of portable automated build systems
 EAPI=8
 HOMEPAGE=https://www.adacore.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !app-editors/e3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-editors/e3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/e3-core/archive/refs/tags/v22.1.0.tar.gz -> e3-core-22.1.0.tar.gz
-_eclasses_=distutils-r1	242601d395f54f27cfbc76e53f5e0203	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2ac90c51a3139428f73dc3b2d0ee3bbd
+_eclasses_=distutils-r1	d540d96908dd5622f3dfa41d167e632d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=d7d6ad8188aa3b0613cb791accc3ca2c
diff --git a/metadata/md5-cache/dev-ada/e3-testsuite-24.0 b/metadata/md5-cache/dev-ada/e3-testsuite-24.0
index c6eb6984b449..8cf379736a28 100644
--- a/metadata/md5-cache/dev-ada/e3-testsuite-24.0
+++ b/metadata/md5-cache/dev-ada/e3-testsuite-24.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Generic testsuite framework in Python
 EAPI=8
 HOMEPAGE=https://www.adacore.com/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/e3-testsuite/archive/refs/tags/v24.0.tar.gz -> e3-testsuite-24.0.tar.gz
-_eclasses_=distutils-r1	242601d395f54f27cfbc76e53f5e0203	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=177f86483111cf0417be3cea433bf2e1
+_eclasses_=distutils-r1	d540d96908dd5622f3dfa41d167e632d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=11d98809482f05410329d01cf1a39bad
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
index 5bd351044ddd..c2063f3edf5f 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
+IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz -> gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
-_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=57a48b660b5b3344de62f05e8c91edff
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=919a2eb6f486060c1d95e0bb39aefb4e
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1
index 6e77f7489119..f561912cdf68 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-22.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv lzma openmp python readline +shared static-libs static-pic syslog ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
+IUSE=gmp iconv lzma openmp python readline +shared static-libs static-pic syslog ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] )
-REQUIRED_USE=|| ( shared static-libs static-pic ) || ( gmp iconv lzma openmp python readline syslog ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-core:=[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) lzma? ( app-arch/xz-utils ) openmp? ( dev-lang/gnat-gpl:=[openmp] )
+REQUIRED_USE=|| ( shared static-libs static-pic ) || ( gmp iconv lzma openmp python readline syslog ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz -> gnatcoll-bindings-22.0.0.tar.gz
-_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=484f58d0a8d52e800f3440d11ceffacc
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=995e5571989220f19738e09054dd8ffc
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0 b/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
index 1b2ca2e635fd..4c3575dd6b14 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=dev-ada/gnatcoll-core:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=dev-ada/gnatcoll-core:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
+IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/gnatcoll-core:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) postgres? ( sql ) || ( shared static-libs static-pic ) || ( sql sqlite xref postgres gnatinspect db2ada ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ada/gnatcoll-core:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings:0/22.0.0[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) postgres? ( sql ) || ( shared static-libs static-pic ) || ( sql sqlite xref postgres gnatinspect db2ada ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gnatcoll-db/archive/v22.0.0.tar.gz -> gnatcoll-db-22.0.0.tar.gz
-_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fbb3a912394cf63cac65ddf8116dffe1
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ed701c86dfe761b21d05c1a0ac04d4b4
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2021-r2 b/metadata/md5-cache/dev-ada/gprbuild-2021-r3
index 4dbee32d0f20..7c9bca953288 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2021-r2
+++ b/metadata/md5-cache/dev-ada/gprbuild-2021-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=a7e18c980cc1df3e1613cec0342f4604
+_md5_=159f170f0cad89122aadf0b962a420bd
diff --git a/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1 b/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r2
index 7d4f247789de..f4a70d16adbf 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
+DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
 DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
-REQUIRED_USE=ada_target_gnat_2021
+RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v22.0.0.tar.gz -> gprbuild-22.0.0.tar.gz https://github.com/AdaCore/xmlada/archive/refs/tags/v22.0.0.tar.gz -> xmlada-22.0.0.tar.gz https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v22.0.0.tar.gz -> gprconfig_kb-22.0.0.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=7ba076655ae16e5d6a36cd1dff8e1944
+_md5_=1805a73067092a856188399d53a51c9b
diff --git a/metadata/md5-cache/dev-ada/langkit-22.0.0-r2 b/metadata/md5-cache/dev-ada/langkit-22.0.0-r2
index 8f2e1f832954..e562c54b69a4 100644
--- a/metadata/md5-cache/dev-ada/langkit-22.0.0-r2
+++ b/metadata/md5-cache/dev-ada/langkit-22.0.0-r2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=A Python framework to generate language parsers
 EAPI=7
 HOMEPAGE=https://www.adacore.com/community
-IUSE=+shared static-libs static-pic python_targets_python3_8 python_targets_python3_9 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64
+IUSE=+shared static-libs static-pic python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ada_target_gnat_2020 ada_target_gnat_2021
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs static-pic ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs static-pic ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/langkit/archive/refs/tags/v22.0.0.tar.gz -> langkit-22.0.0.tar.gz
-_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	distutils-r1	242601d395f54f27cfbc76e53f5e0203	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=924a1482e59d0e809eced828b1cb8ea9
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	distutils-r1	d540d96908dd5622f3dfa41d167e632d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1187023f6fa43e49900f0d249af6ea0d
diff --git a/metadata/md5-cache/dev-ada/libadalang-22.0.0 b/metadata/md5-cache/dev-ada/libadalang-22.0.0
index 0a6a0b39a0fb..976224570e26 100644
--- a/metadata/md5-cache/dev-ada/libadalang-22.0.0
+++ b/metadata/md5-cache/dev-ada/libadalang-22.0.0
@@ -1,16 +1,16 @@
 BDEPEND=test? ( dev-ml/dune dev-ml/zarith dev-ml/camomile dev-ml/ocaml-ctypes dev-ada/e3-testsuite )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared,static-libs?,static-pic?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-ada/langkit[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs?,static-pic?] python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-)] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared,static-libs?,static-pic?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-ada/langkit[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs?,static-pic?] python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=test +static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
+IUSE=test +static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared,static-libs?,static-pic?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-ada/langkit[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs?,static-pic?] python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,gmp,iconv,shared,static-libs?,static-pic?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-ada/langkit[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs?,static-pic?] python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 RESTRICT=!test? ( test )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/libadalang/archive/refs/tags/v22.0.0.tar.gz -> libadalang-22.0.0.tar.gz
-_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=14b57678fb9f53a0f9320f861b9a2f3c
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=87dd2a2dc820348e9af3224f23120449
diff --git a/metadata/md5-cache/dev-ada/libadalang-tools-22.0.0-r1 b/metadata/md5-cache/dev-ada/libadalang-tools-22.0.0-r1
index 35bb9df782a2..a5b696a88776 100644
--- a/metadata/md5-cache/dev-ada/libadalang-tools-22.0.0-r1
+++ b/metadata/md5-cache/dev-ada/libadalang-tools-22.0.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Libadalang-based tools: gnatpp, gnatmetric and gnatstub
 EAPI=7
 HOMEPAGE=https://www.adacore.com/community
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ada_target_gnat_2021
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdaCore/libadalang-tools/archive/refs/tags/v22.0.0.tar.gz -> libadalang-tools-22.0.0.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=9fae3d99a25b6163e1634f6e76606357
+_md5_=07b977083a8fef0aac4a1d961a17398f
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021-r1 b/metadata/md5-cache/dev-ada/libgpr-2021-r1
new file mode 100644
index 000000000000..d0158ee106ed
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libgpr-2021-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DESCRIPTION=Ada library to handle GPRbuild project files
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] !net-libs/grpc
+REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs static-pic )
+SLOT=0
+SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz
+_eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=511128c29f3ea4a4107a302952092a99
diff --git a/metadata/md5-cache/dev-ada/libgpr-22.0.0 b/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1
index 8ac18480e19d..127650b6ef90 100644
--- a/metadata/md5-cache/dev-ada/libgpr-22.0.0
+++ b/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=ada_target_gnat_2021 || ( shared static-libs static-pic )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v22.0.0.tar.gz -> gprbuild-22.0.0.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3d0dec34312ebdb18d2bb5fc4a79211f
+_md5_=1322a3356c268c3d3f148f2be7bfb702
diff --git a/metadata/md5-cache/dev-ada/spawn-22.0.0 b/metadata/md5-cache/dev-ada/spawn-22.0.0
index 3c8745536dd6..98ee5be007c4 100644
--- a/metadata/md5-cache/dev-ada/spawn-22.0.0
+++ b/metadata/md5-cache/dev-ada/spawn-22.0.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) glib? ( dev-ada/gtkada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] dev-libs/glib )
+DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) glib? ( dev-ada/gtkada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic(-)?] dev-libs/glib )
 DESCRIPTION=Simple API to spawn processes
 EAPI=7
 HOMEPAGE=https://github.com/AdaCore/spawn
 IUSE=glib +shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) glib? ( dev-ada/gtkada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] dev-libs/glib )
+RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) glib? ( dev-ada/gtkada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic(-)?] dev-libs/glib )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/spawn/archive/refs/tags/v22.0.0.tar.gz -> spawn-22.0.0.tar.gz
 _eclasses_=ada	dd7d6e1357088d74546d8e11f7f485fc	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=7828480e27d268b6e5419e405c4d2fe9
+_md5_=425098b0491151b2eb65f3f3a87ea026