11 files changed, 36 insertions, 51 deletions
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 3754d300527f..c7b15e5fd51a 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/aunit-2021 b/metadata/md5-cache/dev-ada/aunit-2021
index bd5b974ab1a7..466c20784ea9 100644
--- a/metadata/md5-cache/dev-ada/aunit-2021
+++ b/metadata/md5-cache/dev-ada/aunit-2021
@@ -1,5 +1,5 @@
 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] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-),-ada_target_gcc_12_2_0(-)]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
@@ -7,9 +7,9 @@ INHERIT=ada multiprocessing
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
+REQUIRED_USE=ada_target_gnat_2021
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c8eadafc40c016859e127cd0e82411fcd8f3e749?filename=aunit-2021-20210518-19DC5-src.tar.gz -> aunit-2021-20210518-19DC5-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7fbba2db117cd0ab7acd6980d3fc54ce
+_md5_=7930f92cdfff28b970e76dc9ed3e8417
diff --git a/metadata/md5-cache/dev-ada/aunit-22.0.0 b/metadata/md5-cache/dev-ada/aunit-22.0.0
index 8707ca23e08f..d347e8d08111 100644
--- a/metadata/md5-cache/dev-ada/aunit-22.0.0
+++ b/metadata/md5-cache/dev-ada/aunit-22.0.0
@@ -1,5 +1,5 @@
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2020(-)]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
@@ -7,9 +7,9 @@ INHERIT=ada multiprocessing
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/aunit/archive/refs/tags/v22.0.0.tar.gz -> aunit-22.0.0.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=49d1d1e37ffa93296f2e8429bbdc108e
+_md5_=a47954a47da9d1835047a11ea3b1a6c8
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2021 b/metadata/md5-cache/dev-ada/gnatmem-2021
index 9c29910cd0fe..4a6065371c48 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2021
+++ b/metadata/md5-cache/dev-ada/gnatmem-2021
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare 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/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-),-ada_target_gcc_12_2_0(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -8,9 +8,9 @@ INHERIT=ada multiprocessing autotools
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
+REQUIRED_USE=ada_target_gnat_2021
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3ddb98c0c8854dc7631bebd673ac7bc53038d4b7?filename=gnatmem-2021-20210518-19F7B-src.tar.gz -> gnatmem-2021-20210518-19F7B-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c89a6a590e090834b9b77278eb685b38
+_md5_=41b09e8778d5312328f916305b6987e0
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2021-r1 b/metadata/md5-cache/dev-ada/gnatmem-2021-r1
index d6670907f34a..59734e50d0a7 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2021-r1
+++ b/metadata/md5-cache/dev-ada/gnatmem-2021-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2020(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -8,9 +8,9 @@ INHERIT=ada multiprocessing autotools
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3ddb98c0c8854dc7631bebd673ac7bc53038d4b7?filename=gnatmem-2021-20210518-19F7B-src.tar.gz -> gnatmem-2021-20210518-19F7B-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=823aeed95850974ed3c3abd7f37906c1
+_md5_=79d861c49070650eabfff390f477d43d
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2021 b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
index 2599041adf17..f0bd5cf74901 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2021
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
@@ -1,5 +1,5 @@
 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] )
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
 DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -7,9 +7,9 @@ INHERIT=ada
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
+REQUIRED_USE=ada_target_gnat_2021
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/884f3b229457c995ddebb46a16a7cc50ed837c90?filename=gnatsymbolize-2021-20210518-19D3B-src.tar.gz -> gnatsymbolize-2021-20210518-19D3B-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9
-_md5_=9bc6b928259028ce0efbd29f6c427374
+_md5_=5c80819e7ee7d12d8da450fd421606b9
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1 b/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
index f25f01761893..58946462fcac 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2021-r1
@@ -1,5 +1,5 @@
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
 DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -7,9 +7,9 @@ INHERIT=ada
 IUSE=ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/884f3b229457c995ddebb46a16a7cc50ed837c90?filename=gnatsymbolize-2021-20210518-19D3B-src.tar.gz -> gnatsymbolize-2021-20210518-19D3B-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9
-_md5_=fe50d50a1f036c1ac20bea892d529a7b
+_md5_=f03ba05b73441a174a871e73917e0ba9
diff --git a/metadata/md5-cache/dev-ada/gtkada-2021 b/metadata/md5-cache/dev-ada/gtkada-2021
index fd66d0706a0b..d586aa26f85f 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2021
+++ b/metadata/md5-cache/dev-ada/gtkada-2021
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare 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-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-),-ada_target_gcc_12_2_0(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
@@ -8,9 +8,9 @@ INHERIT=ada autotools multiprocessing
 IUSE=+shared static-libs ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=ada_target_gnat_2021 || ( shared static-libs )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/8f1daefcb56e3ee7feaad67bac66deb0f7c37a82?filename=gtkada-2021-20210518-1A011-src.tar.gz -> gtkada-2021-20210518-1A011-src.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=48bf47404ac404ae797c9b3ee643465f
+_md5_=60a36df6bd06fe4a79e2c2b2ea76a6e5
diff --git a/metadata/md5-cache/dev-ada/gtkada-22.0.0 b/metadata/md5-cache/dev-ada/gtkada-22.0.0
index 23c26b8f7b4b..44125f77c826 100644
--- a/metadata/md5-cache/dev-ada/gtkada-22.0.0
+++ b/metadata/md5-cache/dev-ada/gtkada-22.0.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1[ada] ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2020(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
@@ -8,9 +8,9 @@ INHERIT=ada autotools multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 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] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gtkada/archive/refs/tags/v22.0.0.tar.gz -> gtkada-22.0.0.tar.gz
 _eclasses_=ada	7bd0959fb6eeede6d82f6923c8ccfca9	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ca32f95b28e64f3145e3691065608409
+_md5_=379984485eae7bc02e340372d4b9530b
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021 b/metadata/md5-cache/dev-ada/libgpr-2021
index d79bc9cdab27..7ee3a9451d02 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2021
+++ b/metadata/md5-cache/dev-ada/libgpr-2021
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-),-ada_target_gcc_12_2_0(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2020(-),-ada_target_gcc_12_2_0(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -7,9 +7,9 @@ INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)] !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(-),-ada_target_gcc_12_2_0(-)] !net-libs/grpc
+REQUIRED_USE=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	7bd0959fb6eeede6d82f6923c8ccfca9	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=154edec8b69e42d36b5d44d03d86359b
+_md5_=0abdbcd07b74009377f7a113f21acd10
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021-r1 b/metadata/md5-cache/dev-ada/libgpr-2021-r1
deleted file mode 100644
index 6ac6a5b09f73..000000000000
--- a/metadata/md5-cache/dev-ada/libgpr-2021-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
-DESCRIPTION=Ada library to handle GPRbuild project files
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-INHERIT=ada multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
-REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ada_target_gcc_12_2_0 ) || ( 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	7bd0959fb6eeede6d82f6923c8ccfca9	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ba5874be19668b3910d98bd72bc3f374