gentoo resync : 06.04.2022

45 files changed, 44 insertions, 100 deletions

diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 5e68201e9539..807d789dbe16 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/acl-0-r2 b/metadata/md5-cache/virtual/acl-0-r2
index 07ba1a32378d..a7e621b07b11 100644
--- a/metadata/md5-cache/virtual/acl-0-r2
+++ b/metadata/md5-cache/virtual/acl-0-r2
@@ -5,5 +5,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5dca03285caf07699bef420c78ad02c6
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.107 b/metadata/md5-cache/virtual/dist-kernel-5.10.107
deleted file mode 100644
index 7a406d5a32c6..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.107
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.107 ~sys-kernel/gentoo-kernel-bin-5.10.107 ~sys-kernel/vanilla-kernel-5.10.107 )
-SLOT=0/5.10.107
-_md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.108 b/metadata/md5-cache/virtual/dist-kernel-5.10.108
deleted file mode 100644
index 93d34e27ff7a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.108
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.108 ~sys-kernel/gentoo-kernel-bin-5.10.108 ~sys-kernel/vanilla-kernel-5.10.108 )
-SLOT=0/5.10.108
-_md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.106 b/metadata/md5-cache/virtual/dist-kernel-5.10.109
index 89240d5df1c0..421f35ae2614 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.106
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.109
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.106 ~sys-kernel/gentoo-kernel-bin-5.10.106 ~sys-kernel/vanilla-kernel-5.10.106 )
-SLOT=0/5.10.106
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.109 ~sys-kernel/gentoo-kernel-bin-5.10.109 ~sys-kernel/vanilla-kernel-5.10.109 )
+SLOT=0/5.10.109
 _md5_=ddf02afdb52cf37df72ca0278a2d0283
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.31 b/metadata/md5-cache/virtual/dist-kernel-5.15.31
deleted file mode 100644
index 9d6f97c300ee..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.31
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.31 ~sys-kernel/gentoo-kernel-bin-5.15.31 ~sys-kernel/vanilla-kernel-5.15.31 )
-SLOT=0/5.15.31
-_md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.29 b/metadata/md5-cache/virtual/dist-kernel-5.15.32
index cba3e5ceed05..e3c286085f70 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.29
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.32
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.29 ~sys-kernel/gentoo-kernel-bin-5.15.29 ~sys-kernel/vanilla-kernel-5.15.29 )
-SLOT=0/5.15.29
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.32 ~sys-kernel/gentoo-kernel-bin-5.15.32 ~sys-kernel/vanilla-kernel-5.15.32 )
+SLOT=0/5.15.32
 _md5_=ddf02afdb52cf37df72ca0278a2d0283
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.16.16 b/metadata/md5-cache/virtual/dist-kernel-5.16.16
deleted file mode 100644
index bec85d978eaf..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.16.16
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.16.16 ~sys-kernel/gentoo-kernel-bin-5.16.16 ~sys-kernel/vanilla-kernel-5.16.16 )
-SLOT=0/5.16.16
-_md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.16.17 b/metadata/md5-cache/virtual/dist-kernel-5.16.17
deleted file mode 100644
index 26773815221f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.16.17
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.16.17 ~sys-kernel/gentoo-kernel-bin-5.16.17 ~sys-kernel/vanilla-kernel-5.16.17 )
-SLOT=0/5.16.17
-_md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.30 b/metadata/md5-cache/virtual/dist-kernel-5.16.18
index 987131455d42..e86d4f859ffe 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.30
+++ b/metadata/md5-cache/virtual/dist-kernel-5.16.18
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.30 ~sys-kernel/gentoo-kernel-bin-5.15.30 ~sys-kernel/vanilla-kernel-5.15.30 )
-SLOT=0/5.15.30
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.16.18 ~sys-kernel/gentoo-kernel-bin-5.16.18 ~sys-kernel/vanilla-kernel-5.16.18 )
+SLOT=0/5.16.18
 _md5_=a76e7962f2eaf4b2c5a38b02d0c9a670
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.186 b/metadata/md5-cache/virtual/dist-kernel-5.4.186
deleted file mode 100644
index 5bd6d912585e..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.186
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.186 ~sys-kernel/gentoo-kernel-bin-5.4.186 ~sys-kernel/vanilla-kernel-5.4.186 )
-SLOT=0/5.4.186
-_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.187 b/metadata/md5-cache/virtual/dist-kernel-5.4.187
deleted file mode 100644
index 93d8d2ffd2ea..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.187
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.187 ~sys-kernel/gentoo-kernel-bin-5.4.187 ~sys-kernel/vanilla-kernel-5.4.187 )
-SLOT=0/5.4.187
-_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.185 b/metadata/md5-cache/virtual/dist-kernel-5.4.188
index 15684d0c2f55..21b5507abe17 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.185
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.188
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.185 ~sys-kernel/gentoo-kernel-bin-5.4.185 ~sys-kernel/vanilla-kernel-5.4.185 )
-SLOT=0/5.4.185
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.188 ~sys-kernel/gentoo-kernel-bin-5.4.188 ~sys-kernel/vanilla-kernel-5.4.188 )
+SLOT=0/5.4.188
 _md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 3c0c086a6e93..88df0a5b9390 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-admin/fam-2.7.0-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=37f1876011c3c1af21df2547aace661f
diff --git a/metadata/md5-cache/virtual/glu-9.0-r2 b/metadata/md5-cache/virtual/glu-9.0-r2
index cd089545dc1a..68f23afd08fa 100644
--- a/metadata/md5-cache/virtual/glu-9.0-r2
+++ b/metadata/md5-cache/virtual/glu-9.0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/glu-9.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/mingw64-runtime )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4d7eb33632cecc081d27b30f8fdcc685
diff --git a/metadata/md5-cache/virtual/httpd-php-7.3 b/metadata/md5-cache/virtual/httpd-php-7.3
deleted file mode 100644
index 774392173c24..000000000000
--- a/metadata/md5-cache/virtual/httpd-php-7.3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to provide PHP-enabled webservers
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-RDEPEND=|| ( dev-lang/php:7.3[fpm] dev-lang/php:7.3[apache2] dev-lang/php:7.3[cgi] )
-SLOT=7.3
-_md5_=87e209d62472865b4f7f5ba176c2d438
diff --git a/metadata/md5-cache/virtual/jack-2 b/metadata/md5-cache/virtual/jack-2
index 972bf992c3ec..9409b96f177b 100644
--- a/metadata/md5-cache/virtual/jack-2
+++ b/metadata/md5-cache/virtual/jack-2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 RDEPEND=|| ( media-sound/jack2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-video/pipewire[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,jack-sdk(-)] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c0b6a0f3a30d97203cc52443db267b47
diff --git a/metadata/md5-cache/virtual/jdk-11-r2 b/metadata/md5-cache/virtual/jdk-11-r2
index 21dcda8a0a09..c11d3a98b6a7 100644
--- a/metadata/md5-cache/virtual/jdk-11-r2
+++ b/metadata/md5-cache/virtual/jdk-11-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=7
 IUSE=headless-awt
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+),headless-awt=] dev-java/openjdk:11[gentoo-vm(+),headless-awt=] )
 SLOT=11
-_md5_=7c4167ee888e583c309720da0a9225de
+_md5_=5a8cfa8a0040123913f36ba5b45adffd
diff --git a/metadata/md5-cache/virtual/jpeg-100 b/metadata/md5-cache/virtual/jpeg-100-r1
index 1c99bcdbb9ab..02407882a609 100644
--- a/metadata/md5-cache/virtual/jpeg-100
+++ b/metadata/md5-cache/virtual/jpeg-100-r1
@@ -3,7 +3,7 @@ DESCRIPTION=Virtual to select between libjpeg-turbo and IJG jpeg for source-base
 EAPI=7
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-9c:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e91d52a4ffe30ab96f34d6e5c4999ede
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=be9e7c36dc5169cd1967934c6f27914a
diff --git a/metadata/md5-cache/virtual/jpeg-compat-62 b/metadata/md5-cache/virtual/jpeg-compat-62
index 1d90caa6fb15..eb55cdce1ffb 100644
--- a/metadata/md5-cache/virtual/jpeg-compat-62
+++ b/metadata/md5-cache/virtual/jpeg-compat-62
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-6b-r12:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=62
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=143939b0db79192fee29d0a4c3bd1953
diff --git a/metadata/md5-cache/virtual/jre-11-r2 b/metadata/md5-cache/virtual/jre-11-r2
index a5cdc9546247..a9f093fd1c3c 100644
--- a/metadata/md5-cache/virtual/jre-11-r2
+++ b/metadata/md5-cache/virtual/jre-11-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Runtime Environment (JRE)
 EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 RDEPEND=|| ( virtual/jdk:11 dev-java/openjdk-jre-bin:11[gentoo-vm(+)] )
 SLOT=11
-_md5_=6c76dcfe0426a80c36f750fca77036ae
+_md5_=460c7c2318648154fba075182cc89ad3
diff --git a/metadata/md5-cache/virtual/krb5-0-r1 b/metadata/md5-cache/virtual/krb5-0-r1
index 28e43cadc27b..52424c832d3b 100644
--- a/metadata/md5-cache/virtual/krb5-0-r1
+++ b/metadata/md5-cache/virtual/krb5-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=|| ( >=app-crypt/mit-krb5-1.12.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-crypt/heimdal-1.5.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0b35a034c83f157507dc1ed0bb0a7af3
diff --git a/metadata/md5-cache/virtual/libcrypt-1-r1 b/metadata/md5-cache/virtual/libcrypt-1-r1
index 180f7b22b3a1..d32b50d3c8f0 100644
--- a/metadata/md5-cache/virtual/libcrypt-1-r1
+++ b/metadata/md5-cache/virtual/libcrypt-1-r1
@@ -5,5 +5,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] ) elibc_musl? ( sys-libs/musl ) ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
 SLOT=0/1
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2a6d626dd5e6ec8956472ede4963134b
diff --git a/metadata/md5-cache/virtual/libcrypt-2 b/metadata/md5-cache/virtual/libcrypt-2
index ba578cac5915..e73ea2297d9d 100644
--- a/metadata/md5-cache/virtual/libcrypt-2
+++ b/metadata/md5-cache/virtual/libcrypt-2
@@ -5,5 +5,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_musl? ( sys-libs/musl ) ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
 SLOT=0/2
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=202e0fffbdb08dccb88494110a3cfc0b
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2
index fbbe5cc2a0c4..dcc9cd190607 100644
--- a/metadata/md5-cache/virtual/libelf-2
+++ b/metadata/md5-cache/virtual/libelf-2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c55bf46a6dcb584ec070b588c5bfe99e
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3
index 98367baea9dc..b018e53b4c17 100644
--- a/metadata/md5-cache/virtual/libelf-3
+++ b/metadata/md5-cache/virtual/libelf-3
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=>=dev-libs/elfutils-0.155-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/1
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3863f06669afbd18c3bddc50b7dac475
diff --git a/metadata/md5-cache/virtual/libiconv-0-r1 b/metadata/md5-cache/virtual/libiconv-0-r1
index 334ada8e2625..757cdeab9bbf 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r1
+++ b/metadata/md5-cache/virtual/libiconv-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=eab7d78264658a991b9ecf009c67d6e9
diff --git a/metadata/md5-cache/virtual/libiconv-0-r2 b/metadata/md5-cache/virtual/libiconv-0-r2
index 334ada8e2625..757cdeab9bbf 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r2
+++ b/metadata/md5-cache/virtual/libiconv-0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=eab7d78264658a991b9ecf009c67d6e9
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
index 597242619206..56b323b51989 100644
--- a/metadata/md5-cache/virtual/libintl-0-r1
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5459fb21cd1069b25fa13f6d2d05a311
diff --git a/metadata/md5-cache/virtual/libintl-0-r2 b/metadata/md5-cache/virtual/libintl-0-r2
index edb42ad462e6..86c2ea158c68 100644
--- a/metadata/md5-cache/virtual/libintl-0-r2
+++ b/metadata/md5-cache/virtual/libintl-0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fa4c625efbfdada187101ba631968b07
diff --git a/metadata/md5-cache/virtual/libudev-232-r5 b/metadata/md5-cache/virtual/libudev-232-r5
index c5344a98c840..d87da5691045 100644
--- a/metadata/md5-cache/virtual/libudev-232-r5
+++ b/metadata/md5-cache/virtual/libudev-232-r5
@@ -5,5 +5,5 @@ IUSE=systemd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mip
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=!systemd? ( || ( >=sys-fs/udev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/eudev-3.2.9:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( >=sys-apps/systemd-232:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=090e3993c78fe6f522d3c3052567810e
diff --git a/metadata/md5-cache/virtual/libusb-0-r2 b/metadata/md5-cache/virtual/libusb-0-r2
index 311b90e85d97..3ad624b21e3c 100644
--- a/metadata/md5-cache/virtual/libusb-0-r2
+++ b/metadata/md5-cache/virtual/libusb-0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=>=dev-libs/libusb-compat-0.1.5-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cd2972a1b2a04ea6fd3701bb39e1087d
diff --git a/metadata/md5-cache/virtual/libusb-1-r2 b/metadata/md5-cache/virtual/libusb-1-r2
index ef625b4307ef..d2324b602eea 100644
--- a/metadata/md5-cache/virtual/libusb-1-r2
+++ b/metadata/md5-cache/virtual/libusb-1-r2
@@ -5,5 +5,5 @@ IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=>=dev-libs/libusb-1.0.19:1[udev(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bf336442a40b68711b77dd4b6a0b7f7b
diff --git a/metadata/md5-cache/virtual/mpi-2.0-r6 b/metadata/md5-cache/virtual/mpi-2.0-r6
index 6566cdee7c9b..e9f8aad60583 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r6
+++ b/metadata/md5-cache/virtual/mpi-2.0-r6
@@ -5,5 +5,5 @@ IUSE=cxx fortran romio threads nullmpi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mip
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-cluster/openmpi-1.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads(+)?] >=sys-cluster/mpich-3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/nullmpi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx(-)?,fortran(-)?,romio(-)?,threads(-)?] nullmpi? ( sys-cluster/native-mpi ) )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f2b9fb39ae21b445f8e7dd9f5734a3a1
diff --git a/metadata/md5-cache/virtual/opencl-3-r1 b/metadata/md5-cache/virtual/opencl-3-r1
index 77b06b3b73dd..07493151e10a 100644
--- a/metadata/md5-cache/virtual/opencl-3-r1
+++ b/metadata/md5-cache/virtual/opencl-3-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=amd64 x86
 RDEPEND=|| ( dev-libs/opencl-icd-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bcba5900dddcf67a41138cb8b589f03e
diff --git a/metadata/md5-cache/virtual/opengl-7.0-r2 b/metadata/md5-cache/virtual/opengl-7.0-r2
index 18eaaa7a172e..e274a03f89b5 100644
--- a/metadata/md5-cache/virtual/opengl-7.0-r2
+++ b/metadata/md5-cache/virtual/opengl-7.0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/mesa-9.1.6[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/mingw64-runtime )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a3027e8a0814c33545be37d284b13567
diff --git a/metadata/md5-cache/virtual/python-cffi-1 b/metadata/md5-cache/virtual/python-cffi-1
index e299ec5e31bc..46b1f5174ca4 100644
--- a/metadata/md5-cache/virtual/python-cffi-1
+++ b/metadata/md5-cache/virtual/python-cffi-1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) 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 ) python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	dfa3a38467793e97fcf791b156510654	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0e0482f6e3dff263658dc3dc40269582
diff --git a/metadata/md5-cache/virtual/python-greenlet-1.0-r2 b/metadata/md5-cache/virtual/python-greenlet-1.0-r2
index af5c6cf995fc..375f22128162 100644
--- a/metadata/md5-cache/virtual/python-greenlet-1.0-r2
+++ b/metadata/md5-cache/virtual/python-greenlet-1.0-r2
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-li
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) 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 ) python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	dfa3a38467793e97fcf791b156510654	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a24459fbb85b6dae32fda5c583ab0eea
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index 226339802eac..575ee69c1ebe 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-ng	a5a04601c3d6257d7f7a55f7ea6b921a	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a7c9798dab54d218de8fd939a3a2ade0
diff --git a/metadata/md5-cache/virtual/ruby-ssl-12 b/metadata/md5-cache/virtual/ruby-ssl-12
index 5ee8f19e7e16..56a7b7de48da 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-12
+++ b/metadata/md5-cache/virtual/ruby-ssl-12
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-ng	a5a04601c3d6257d7f7a55f7ea6b921a	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=096e1fd18d44ed91e3409a822da8b0c8
diff --git a/metadata/md5-cache/virtual/rubygems-15 b/metadata/md5-cache/virtual/rubygems-15
index f1bdb53cba1c..454c984f5f80 100644
--- a/metadata/md5-cache/virtual/rubygems-15
+++ b/metadata/md5-cache/virtual/rubygems-15
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linu
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-ng	a5a04601c3d6257d7f7a55f7ea6b921a	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9c8214b475ecc672c7a02a764f1a47d9
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index 480a31aa6556..f8d6c5b7852e 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-ng	a5a04601c3d6257d7f7a55f7ea6b921a	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7afbb8422dae1ca0cd3f3912529a4e44
diff --git a/metadata/md5-cache/virtual/rubygems-17 b/metadata/md5-cache/virtual/rubygems-17
index aada0393af96..76b4f08aaf0a 100644
--- a/metadata/md5-cache/virtual/rubygems-17
+++ b/metadata/md5-cache/virtual/rubygems-17
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby31? ( >=dev-ruby/rubygems-3.3.0[ruby_targets_ruby31] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-ng	a5a04601c3d6257d7f7a55f7ea6b921a	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4b0303fc01d1b65a8af5ef87f995325a
diff --git a/metadata/md5-cache/virtual/rust-1.58.1 b/metadata/md5-cache/virtual/rust-1.58.1
index 5852a898272b..ffb848413e6a 100644
--- a/metadata/md5-cache/virtual/rust-1.58.1
+++ b/metadata/md5-cache/virtual/rust-1.58.1
@@ -5,5 +5,5 @@ IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mip
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 RDEPEND=|| ( ~dev-lang/rust-1.58.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.58.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=079ffb9a36587b5b0b550567fc19c39e
diff --git a/metadata/md5-cache/virtual/rust-1.59.0 b/metadata/md5-cache/virtual/rust-1.59.0
index 25d4a439cb51..60d25d091128 100644
--- a/metadata/md5-cache/virtual/rust-1.59.0
+++ b/metadata/md5-cache/virtual/rust-1.59.0
@@ -5,5 +5,5 @@ IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mip
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.59.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.59.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=529d003eb99a95e7c90c8fd970c53b9b