gentoo resync : 25.04.2020

29 files changed, 196 insertions, 80 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index edee95654a9b..e4ea18698290 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/core-specs-alpha-0.1.24 b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
new file mode 100644
index 000000000000..99664e149cb3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions.
+EAPI=7
+HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0.1
+SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.1.24.tar.gz -> core-specs-alpha-0.1.24.tar.gz
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c018a587d7dd397f4173182e46e6d319
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
new file mode 100644
index 000000000000..38af3cdb7d8d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions.
+EAPI=7
+HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0.2
+SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.44.tar.gz -> core-specs-alpha-0.2.44.tar.gz
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=84e4ccc5642d4726282d451259a83f70
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 60d976b8752a..6660f821d199 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_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) >=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(-)]
+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(-)]
 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
+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_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) >=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 )
+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(-)]
+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	577e2308f7b36e26062d464f59a5ee6c	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97193768641e6ea8dadb71b5ae148ca3
+_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
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 65d9dad4ac44..5aa774ed0de9 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7[xml(+)] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	577e2308f7b36e26062d464f59a5ee6c	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	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
 _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 2fd37e66d513..2d893ec09de0 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
@@ -1,4 +1,4 @@
-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.6: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_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(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=python_targets_python2_7 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.6: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(-)]
+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 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.1.tar.bz2
-_eclasses_=distutils-r1	577e2308f7b36e26062d464f59a5ee6c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=917fcd621af483e5352ed066f53388d4
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 2189272d80f2..12b2b2b7c49a 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
@@ -1,4 +1,4 @@
-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.6: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(-)] >=dev-python/setuptools-42.0.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_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(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
@@ -6,9 +6,9 @@ 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
 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.6: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(-)]
+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 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.2.tar.bz2
-_eclasses_=distutils-r1	577e2308f7b36e26062d464f59a5ee6c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d24ed70e3ce18a750a494a9e56c1e187
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8a79981999bccaddfe4222d0250fcd28
diff --git a/metadata/md5-cache/dev-java/javatoolkit-9999 b/metadata/md5-cache/dev-java/javatoolkit-9999
index e60d89a2b583..3a42e87b08e1 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-9999
+++ b/metadata/md5-cache/dev-java/javatoolkit-9999
@@ -1,5 +1,5 @@
 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-python/setuptools-42.0.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.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]
 DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
@@ -9,5 +9,5 @@ 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(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	577e2308f7b36e26062d464f59a5ee6c	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	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3848b4040ad167842f1ccef9becadfc8
+_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
+_md5_=04d2b6628e60e55f3a3bf5753f9ac7f0
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 363bc03b5b3e..696208c2ed68 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	6f5996d2ae01e0c6f2869ed18f023239	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	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1a4cb72bf1af61c6e0d5bbb5b792314e
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.7_p10
new file mode 100644
index 000000000000..5d034409a006
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.7_p10
@@ -0,0 +1,15 @@
+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.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
diff --git a/metadata/md5-cache/dev-java/openjdk-8.252_p09 b/metadata/md5-cache/dev-java/openjdk-8.252_p09
new file mode 100644
index 000000000000..27028cac9d47
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-8.252_p09
@@ -0,0 +1,14 @@
+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/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
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10
new file mode 100644
index 000000000000..3e6db270e910
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10
@@ -0,0 +1,15 @@
+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 +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.7+10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82151e020ac380e6197846f227438b80
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09 b/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
new file mode 100644
index 000000000000..28e7a8952477
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
@@ -0,0 +1,15 @@
+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/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
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10
new file mode 100644
index 000000000000..ee34dd7b0297
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10
@@ -0,0 +1,15 @@
+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.7+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fdf187ced39844d2700209876d45f017
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08-r1
index d202de95002b..404ffb717ff6 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.242_p08-r1
@@ -12,4 +12,4 @@ 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_=0754969451f7b2b5866bafbc4d17cbf5
+_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
new file mode 100644
index 000000000000..e7299e862746
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09
@@ -0,0 +1,15 @@
+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/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
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.7_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.7_p1
new file mode 100644
index 000000000000..ab45fcca8b5c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.7_p1
@@ -0,0 +1,14 @@
+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+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
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.1.4 b/metadata/md5-cache/dev-java/sbt-bin-1.1.4
deleted file mode 100644
index 377bec8bb68a..000000000000
--- a/metadata/md5-cache/dev-java/sbt-bin-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=6
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=da6c27df3e0c974a7f246b51a9018358
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.1.5 b/metadata/md5-cache/dev-java/sbt-bin-1.1.5
deleted file mode 100644
index f86d188f3fbd..000000000000
--- a/metadata/md5-cache/dev-java/sbt-bin-1.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=6
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/sbt/sbt/releases/download/v1.1.5/sbt-1.1.5.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=da6c27df3e0c974a7f246b51a9018358
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.2.8 b/metadata/md5-cache/dev-java/sbt-bin-1.2.8
deleted file mode 100644
index c743e580dfd2..000000000000
--- a/metadata/md5-cache/dev-java/sbt-bin-1.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=6
-HOMEPAGE=https://scala-sbt.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/sbt/sbt/releases/download/v1.2.8/sbt-1.2.8.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bed256c78701246fec05785ff4bd555d
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.10 b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
new file mode 100644
index 000000000000..8d557277e044
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=sbt, a build tool for Scala
+EAPI=7
+HOMEPAGE=https://scala-sbt.org
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb
+_md5_=ed5c0d9ba3515bbf495ea011a782277a
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.2 b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
index dbd3b6aad68c..5c137b103574 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.2
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=sbt, a build tool for Scala
 EAPI=7
 HOMEPAGE=https://scala-sbt.org
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.2/sbt-1.3.2.tgz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb
-_md5_=97788c81c647e4da3f5647de5e10bf09
+_md5_=9e74c2dc0e226b9dacf531839775e184
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.1.143 b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
new file mode 100644
index 000000000000..1668ae583e96
--- /dev/null
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Clojure library to describe the structure of data and functions.
+EAPI=7
+HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0.1
+SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.1.143.tar.gz -> spec-alpha-0.1.143.tar.gz
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e9559de2f1c8f08be1b0c5cb9d1f0a80
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.176 b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
new file mode 100644
index 000000000000..3ce8535e16ac
--- /dev/null
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Clojure library to describe the structure of data and functions.
+EAPI=7
+HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0.2
+SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.176.tar.gz -> spec-alpha-0.2.176.tar.gz
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2a37c81df7ad753ca138382a31d6b4ce
diff --git a/metadata/md5-cache/dev-java/swt-4.10 b/metadata/md5-cache/dev-java/swt-4.10
index ff862248d52d..67efc360d423 100644
--- a/metadata/md5-cache/dev-java/swt-4.10
+++ b/metadata/md5-cache/dev-java/swt-4.10
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-l
 SLOT=4.10
 SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=65638667563c41d5f931a6fa7ba72ecd
+_md5_=baa3a04896a9d0462433c2dce606450b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.103 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.103
index 031593d81bfe..d9c357011614 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.103
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.103
@@ -4,10 +4,10 @@ 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
+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.103/src/apache-tomcat-7.0.103-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4fe8db64e5ea2372194e9d8e2bac64d8
+_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
index 97e97801a696..70ca9bd75751 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
@@ -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.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_=ddbacae0e101eae5dbe81c3b764a0100
+_md5_=c72b057c284f2e143d5e59e9b106f917
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.31 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.31
deleted file mode 100644
index 35f60b204867..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.31
+++ /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 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
-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.31/src/apache-tomcat-9.0.31-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
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.33
index 5cf6164431c4..96619f4fb134 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.33
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.33
@@ -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
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=016c0fca135aa60fbcecf7096105aea4
+_md5_=786ffb9481259c86d0142ae7e03b3581