15 files changed, 15 insertions, 55 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 191e3bf49991..270d6453a7c4 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/icedtea-3.18.0 b/metadata/md5-cache/dev-java/icedtea-3.18.0
index 7bb2df2315de..ca15409a01fa 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.18.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/openjdk.tar.xz -> icedtea-3.18-openjdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/corba.tar.xz -> icedtea-3.18-corba-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxp.tar.xz -> icedtea-3.18-jaxp-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxws.tar.xz -> icedtea-3.18-jaxws-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jdk.tar.xz -> icedtea-3.18-jdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/hotspot.tar.xz -> icedtea-3.18-hotspot-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/nashorn.tar.xz -> icedtea-3.18-nashorn-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/langtools.tar.xz -> icedtea-3.18-langtools-3.18.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/shenandoah.tar.xz -> icedtea-3.18-shenandoah-3.18.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/aarch32.tar.xz -> icedtea-3.18-aarch32-3.18.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.19.0 b/metadata/md5-cache/dev-java/icedtea-3.19.0
index 81f0cd623ba2..4ed13e235532 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.19.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz -> icedtea-3.19-openjdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/corba.tar.xz -> icedtea-3.19-corba-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz -> icedtea-3.19-jaxp-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz -> icedtea-3.19-jaxws-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jdk.tar.xz -> icedtea-3.19-jdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz -> icedtea-3.19-hotspot-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz -> icedtea-3.19-nashorn-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/langtools.tar.xz -> icedtea-3.19-langtools-3.19.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/shenandoah.tar.xz -> icedtea-3.19-shenandoah-3.19.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/aarch32.tar.xz -> icedtea-3.19-aarch32-3.19.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
index eee65c407bb3..41ad097ac1fb 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.11-ga.tar.bz2 -> openjdk-11.0.11_p9.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5047643b0a8a954600ef40894c5775f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
index cf51662b7bc0..9b03c6bc43dd 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.12-ga.tar.bz2 -> openjdk-11.0.12_p7.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=663307081d332907ca8d8747c2949aef
diff --git a/metadata/md5-cache/dev-java/openjdk-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-8.292_p10
index 5b1a6d6183df..77d3798d5a39 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.292_p10
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u292-ga.tar.bz2 -> openjdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u292-ga.tar.bz2 -> openjdk-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u292-ga.tar.bz2 -> openjdk-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u292-ga.tar.bz2 -> openjdk-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u292-ga.tar.bz2 -> openjdk-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u292-ga.tar.bz2 -> openjdk-nashorn-8.292_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=56de332b7b59352a2eca762e9fa5504a
diff --git a/metadata/md5-cache/dev-java/openjdk-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-8.302_p08
index 8f6f7dec78d2..59d38e050835 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-8.302_p08
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u302-ga.tar.bz2 -> openjdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u302-ga.tar.bz2 -> openjdk-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u302-ga.tar.bz2 -> openjdk-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u302-ga.tar.bz2 -> openjdk-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u302-ga.tar.bz2 -> openjdk-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u302-ga.tar.bz2 -> openjdk-nashorn-8.302_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fd1bedb174eb9aacc21e9e2072b0002d
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index fda1ff9111e6..6f3e94b18865 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0e221d14370aa5d9e8c4d55781aad51
+_md5_=1c228c933a3611687b7fd1739443d743
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
deleted file mode 100644
index 78312aaf8211..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jdk-1.6 test? ( >=dev-java/junit-4.11:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java template engine
-EAPI=5
-HOMEPAGE=https://www.stringtemplate.org/
-IUSE=test elibc_FreeBSD doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0644286884435754050998591ab04980
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6
deleted file mode 100644
index 7ad816abc7d3..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.6/src/apache-tomcat-10.0.6-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
index 80c60ce79ceb..9373003a00cf 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.7/src/apache-tomcat-10.0.7-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=011f8552e125fa3a698dd42eb5fba8d2
+_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
index 65a1d017eca6..7f55ba7faca6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.8/src/apache-tomcat-10.0.8-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
+_md5_=011f8552e125fa3a698dd42eb5fba8d2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
deleted file mode 100644
index 061499257ecd..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.46/src/apache-tomcat-9.0.46-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
index f4c1cf2b3534..9e75a7a1ff60 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.48/src/apache-tomcat-9.0.48-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=d46a783fc7a67d13ca7e7d74d4a6cd99
+_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
index cc3f116634a8..64ef726d4e74 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.50/src/apache-tomcat-9.0.50-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=5c43d891ab52b7fab53f38a55644b1ce
+_md5_=d46a783fc7a67d13ca7e7d74d4a6cd99