gentoo resync : 14.05.2020

31 files changed, 102 insertions, 185 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e4ea18698290..caaa63c0a77d 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/gradle-bin-6.3 b/metadata/md5-cache/dev-java/gradle-bin-6.3
new file mode 100644
index 000000000000..6e73c53d7dd3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-6.3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=7
+HOMEPAGE=https://www.gradle.org/
+IUSE=doc elibc_FreeBSD source
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.3
+SRC_URI=https://services.gradle.org/distributions/gradle-6.3-all.zip -> gradle-bin-6.3.zip
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb
+_md5_=74613c16a7400123d8936295de0c4f3f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.16.0 b/metadata/md5-cache/dev-java/icedtea-3.16.0
new file mode 100644
index 000000000000..d0730a659182
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-3.16.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea:8 dev-java/openjdk:8 dev-java/openjdk-bin:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
+EAPI=6
+HOMEPAGE=https://icedtea.classpath.org
+IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 >=sys-apps/baselayout-java-0.1.0-r1 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) 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
+REQUIRED_USE=gtk? ( !headless-awt )
+RESTRICT=!test? ( test )
+SLOT=8
+SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.16.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/openjdk.tar.xz -> icedtea-3.16-openjdk-bca1f7228ce8.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/corba.tar.xz -> icedtea-3.16-corba-ea3169880d70.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jaxp.tar.xz -> icedtea-3.16-jaxp-883803235596.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jaxws.tar.xz -> icedtea-3.16-jaxws-e5d96dc9988a.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/jdk.tar.xz -> icedtea-3.16-jdk-bb9b9a0ad162.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/hotspot.tar.xz -> icedtea-3.16-hotspot-eeb08cfebded.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/nashorn.tar.xz -> icedtea-3.16-nashorn-1d70dcb4ab53.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/langtools.tar.xz -> icedtea-3.16-langtools-e47d37e5fe0b.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/shenandoah.tar.xz -> icedtea-3.16-shenandoah-e4e81ae21643.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.16.0/aarch32.tar.xz -> icedtea-3.16-aarch32-ecc1eb1dc760.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	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ad0f54cb184bd7a2584835e9d9cf804
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
new file mode 100644
index 000000000000..b93c97d16713
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=app-arch/xz-utils >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.60.7:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/zlib-1.2.11-r2 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.2 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.32.0 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) selinux? ( sec-policy/selinux-java ) virtual/ttf-fonts !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07d8abfa62a257294bed35a3ceda4364
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0-r4 b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
index 6660f821d199..02792c9fd551 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r4
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=test? ( sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Java environment configuration query tool
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
-RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/java-config-2.2.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b9406ace374ca8761c149e98e9eb51f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e2c83527bc3940734bd9bcb3d9ab9b1
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index 5aa774ed0de9..bd59faf60be5 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b271bc6eae91d16bc750eb480560bde2
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
index 2d893ec09de0..ab6ff0b1726f 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.1.tar.bz2
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=917fcd621af483e5352ed066f53388d4
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=63e24bd094b63cef20c557853479204e
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
index 12b2b2b7c49a..fc0984e859e3 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.2.tar.bz2
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8a79981999bccaddfe4222d0250fcd28
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=29e9a755c728f9cb7e08c161a90a9c43
diff --git a/metadata/md5-cache/dev-java/javatoolkit-9999 b/metadata/md5-cache/dev-java/javatoolkit-9999
index 3a42e87b08e1..948fed8f6956 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-9999
+++ b/metadata/md5-cache/dev-java/javatoolkit-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=python_targets_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04d2b6628e60e55f3a3bf5753f9ac7f0
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index dc3114598701..bd9b91e69e30 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r2 b/metadata/md5-cache/dev-java/jython-2.7.0-r2
index 696208c2ed68..29ea47aee6d0 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1a4cb72bf1af61c6e0d5bbb5b792314e
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.6 b/metadata/md5-cache/dev-java/openjdk-11.0.6
deleted file mode 100644
index 723039bab02b..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr 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
-REQUIRED_USE=javafx? ( alsa !headless-awt )
-SLOT=11
-SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.6-ga.tar.bz2 -> openjdk-11.0.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c64cb222ea18bd08d702546286967304
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.7_p10
index 5d034409a006..ac6dbfeefd76 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.7_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.7_p10
@@ -12,4 +12,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.7-ga.tar.bz2 -> openjdk-11.0.7_p10.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fce358867b05304985779aab2cbb7fb5
+_md5_=e8bc388967910bbdead0613f721a043a
diff --git a/metadata/md5-cache/dev-java/openjdk-8.242 b/metadata/md5-cache/dev-java/openjdk-8.242
deleted file mode 100644
index 5e7ff6f8485f..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.242
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart elibc_FreeBSD
-KEYWORDS=amd64 ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-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=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u242-ga.tar.bz2 -> openjdk-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u242-ga.tar.bz2 -> openjdk-corba-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u242-ga.tar.bz2 -> openjdk-hotspot-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u242-ga.tar.bz2 -> openjdk-jaxp-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u242-ga.tar.bz2 -> openjdk-jaxws-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u242-ga.tar.bz2 -> openjdk-jdk-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u242-ga.tar.bz2 -> openjdk-langtools-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u242-ga.tar.bz2 -> openjdk-nashorn-8.242.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=349ec9e11e798f3089d3aa8fd44a637d
diff --git a/metadata/md5-cache/dev-java/openjdk-8.252_p09 b/metadata/md5-cache/dev-java/openjdk-8.252_p09
index 27028cac9d47..765d976f8e3a 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.252_p09
+++ b/metadata/md5-cache/dev-java/openjdk-8.252_p09
@@ -4,11 +4,11 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
 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=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u252-ga.tar.bz2 -> openjdk-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u252-ga.tar.bz2 -> openjdk-corba-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u252-ga.tar.bz2 -> openjdk-hotspot-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u252-ga.tar.bz2 -> openjdk-jaxp-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u252-ga.tar.bz2 -> openjdk-jaxws-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u252-ga.tar.bz2 -> openjdk-jdk-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u252-ga.tar.bz2 -> openjdk-langtools-8.252_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u252-ga.tar.bz2 -> openjdk-nashorn-8.252_p09.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=256bee4ae086239951b460c4198880aa
+_md5_=dcafb1b51936eb1725c7e3135f46dc4b
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.6_p10
deleted file mode 100644
index 66228a3d3d4d..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.6_p10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6+10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6+10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6+10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=280a9f60f99685a71da0c59a2e803455
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.242_p08 b/metadata/md5-cache/dev-java/openjdk-bin-8.242_p08
deleted file mode 100644
index afddd5f9089c..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.242_p08
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups examples headless-awt nsplugin selinux source webstart
-KEYWORDS=amd64 ~arm arm64 ppc64
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u242-b08.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u242b08.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0730c239f0f2eb148c5944677263b90b
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09 b/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
index 28e7a8952477..66db940dd9c9 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
@@ -4,7 +4,7 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
 EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups examples headless-awt nsplugin selinux source webstart
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=GPL-2-with-classpath-exception
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
 RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
@@ -12,4 +12,4 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e45fabafcc4c57899953dc340ed82e3a
+_md5_=14a7135afcee0e805e9c3a59f8de9758
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.6_p10
deleted file mode 100644
index 575d6bac12d8..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.6_p10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups +gentoo-vm headless-awt nsplugin selinux webstart
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4886ffc076f90812109ec4a142268db
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08-r1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08-r1
deleted file mode 100644
index 404ffb717ff6..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups headless-awt nsplugin selinux webstart
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs splitdebug
-SLOT=8
-SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b1b18b90697f0c35841d61bb7443b44
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09
index e7299e862746..7806184ca0ab 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09
@@ -4,7 +4,7 @@ DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
 EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups headless-awt nsplugin selinux webstart
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-classpath-exception
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
 RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
@@ -12,4 +12,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a5f6fb5bbaf363fcb7345c5c2ed13fb
+_md5_=9b1b18b90697f0c35841d61bb7443b44
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.6_p2 b/metadata/md5-cache/dev-java/openjfx-11.0.6_p2
deleted file mode 100644
index e52eb995d3bd..000000000000
--- a/metadata/md5-cache/dev-java/openjfx-11.0.6_p2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) app-arch/unzip app-arch/zip >=dev-java/ant-core-1.10.7-r1:0 dev-java/antlr:0 dev-java/antlr:3.5 dev-java/hamcrest-core:0 dev-java/stringtemplate:0 virtual/ttf-fonts virtual/pkgconfig >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java OpenJFX client application platform
-EAPI=6
-HOMEPAGE=https://openjfx.io
-IUSE=cpu_flags_x86_sse2 debug doc source +media elibc_FreeBSD
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=11
-SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.6+2.tar.bz2 -> openjfx-11.0.6_p2.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.8-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d8055a61e723599a30ef283ae5f95343
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.7_p0 b/metadata/md5-cache/dev-java/openjfx-11.0.7_p0
deleted file mode 100644
index 8008bd3a43fb..000000000000
--- a/metadata/md5-cache/dev-java/openjfx-11.0.7_p0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) app-arch/unzip app-arch/zip >=dev-java/ant-core-1.10.7-r1:0 dev-java/antlr:0 dev-java/antlr:3.5 dev-java/hamcrest-core:0 dev-java/stringtemplate:0 virtual/ttf-fonts virtual/pkgconfig >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java OpenJFX client application platform
-EAPI=6
-HOMEPAGE=https://openjfx.io
-IUSE=cpu_flags_x86_sse2 debug doc source +media elibc_FreeBSD
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 media-libs/fontconfig:1.0 media-video/ffmpeg:0= x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/cairo[glib] x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/jpeg virtual/opengl || ( dev-java/openjdk-bin:11[doc?] dev-java/openjdk:11[doc?] ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=11
-SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.7+0.tar.bz2 -> openjfx-11.0.7_p0.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.8-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00b699a0c154dd91a0ac5d43faae8ab3
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.7_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.7_p1
index ab45fcca8b5c..5f835fddda29 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.7_p1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.7_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.7+1.tar.bz2 -> openjfx-11.0.7_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.8-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00b699a0c154dd91a0ac5d43faae8ab3
+_md5_=1374ba6976bdfc114dd2be26502d9cbc
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.24 b/metadata/md5-cache/dev-java/tomcat-native-1.2.24
new file mode 100644
index 000000000000..8e31275decfa
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Allows Tomcat to use certain native resources for better performance
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-src.tar.gz
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=38e20351abf2cc2d5662dcc017a74880
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.100 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.100
deleted file mode 100644
index 1063216f5ee7..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.100/src/apache-tomcat-7.0.100-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91b6b1b364e80bc512a4733227ef6e6b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
deleted file mode 100644
index 70ca9bd75751..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~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=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.53/src/apache-tomcat-8.5.53-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c72b057c284f2e143d5e59e9b106f917
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.54 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.54
index 56da1f7317cc..7426e395d20b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.54
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.54
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~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=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.54/src/apache-tomcat-8.5.54-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ddbacae0e101eae5dbe81c3b764a0100
+_md5_=c72b057c284f2e143d5e59e9b106f917
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.51 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55
index 5f9ae6d263dc..589778d995c7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.51
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~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=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c72b057c284f2e143d5e59e9b106f917
+_md5_=ddbacae0e101eae5dbe81c3b764a0100
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.34
index 199b2081b919..e9b6c85952c1 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.34
@@ -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 elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~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.34/src/apache-tomcat-9.0.34-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=016c0fca135aa60fbcecf7096105aea4
+_md5_=786ffb9481259c86d0142ae7e03b3581
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.33 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.35
index 96619f4fb134..424ed91be09f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.33
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.35
@@ -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 elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~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.33/src/apache-tomcat-9.0.33-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.35/src/apache-tomcat-9.0.35-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=786ffb9481259c86d0142ae7e03b3581
+_md5_=016c0fca135aa60fbcecf7096105aea4