7 files changed, 22 insertions, 22 deletions
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 56f69bb9e8f9..cbb3f6fbface 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/gnatcoll-db-22.0.0 b/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
index b1a21b6997be..f60de6dd8bba 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-22.0.0
@@ -7,8 +7,8 @@ IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref
 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_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) postgres? ( sql ) ^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) ^^ ( python_single_target_python3_8 python_single_target_python3_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 )
 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	a733cb988a74f3fd4b7c45e9eb9a4fe5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0db495b2806b840f36b51174abdf4917
+_md5_=fbb3a912394cf63cac65ddf8116dffe1
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2021-r2 b/metadata/md5-cache/dev-ada/gprbuild-2021-r2
index 1d4b4dffed91..fe9322e82b6b 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2021-r2
+++ b/metadata/md5-cache/dev-ada/gprbuild-2021-r2
@@ -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	a733cb988a74f3fd4b7c45e9eb9a4fe5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=6f38a6dd11026e63b91e5714d24f4606
+_md5_=a7e18c980cc1df3e1613cec0342f4604
diff --git a/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1 b/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1
index 593277b98eb1..0067a10ec5df 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-22.0.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=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	a733cb988a74f3fd4b7c45e9eb9a4fe5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3ddee0d649cb4ea65b5e7d0b6e7ced2a
+_md5_=7ba076655ae16e5d6a36cd1dff8e1944
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 cbfcd1dfb2fb..0b453caaec23 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/gnatcoll-bindings[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+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
+IUSE=+shared static-libs static-pic python_targets_python3_8 python_targets_python3_9 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/gnatcoll-bindings[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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( shared static-libs static-pic ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) 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 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_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 )
 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_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=aab1c81253511ad27296728c1dbbbd19
+_eclasses_=ada	a733cb988a74f3fd4b7c45e9eb9a4fe5	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=924a1482e59d0e809eced828b1cb8ea9
diff --git a/metadata/md5-cache/dev-ada/libadalang-22.0.0 b/metadata/md5-cache/dev-ada/libadalang-22.0.0
index ec1faca3c9f5..44b87217bc09 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 )
-DEFINED_PHASES=compile configure install 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_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-),shared?,static-libs?,static-pic?] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-),shared?,static-libs?,static-pic?] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+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_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_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(-)?]
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=test shared +static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
+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
 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_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-ada/langkit[python_targets_python3_8(-),shared?,static-libs?,static-pic?] ) python_single_target_python3_9? ( dev-ada/langkit[python_targets_python3_9(-),shared?,static-libs?,static-pic?] )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( 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_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_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 )
 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	a733cb988a74f3fd4b7c45e9eb9a4fe5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=db8014fbea680330c08f6f3f9cbd828a
+_md5_=14b57678fb9f53a0f9320f861b9a2f3c
diff --git a/metadata/md5-cache/dev-ada/libgpr-22.0.0 b/metadata/md5-cache/dev-ada/libgpr-22.0.0
index 541abac0d5fb..8892615f7992 100644
--- a/metadata/md5-cache/dev-ada/libgpr-22.0.0
+++ b/metadata/md5-cache/dev-ada/libgpr-22.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install 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(-)?]
+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
 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 )
+RDEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-)] !net-libs/grpc
+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	a733cb988a74f3fd4b7c45e9eb9a4fe5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3c2450c4e31d7e7e53138a59eaa77503
+_md5_=3d0dec34312ebdb18d2bb5fc4a79211f