gentoo resync : 12.03.2021

34 files changed, 210 insertions, 141 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 04078aaf7611..82f3111c934c 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/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
deleted file mode 100644
index a33ed2904234..000000000000
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit:0 ) dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=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=Ivy is a free java based dependency manager
-EAPI=5
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b0977a1c761f8d1d5021dae83b38ab1
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r2 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r2
new file mode 100644
index 000000000000..85502ee395c6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=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=Ivy is a free java based dependency manager
+EAPI=7
+HOMEPAGE=https://ant.apache.org/ivy/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e50b16c69bea67395114d6ad149471cc
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
deleted file mode 100644
index 973e23ad560a..000000000000
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=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=Ivy is a free java based dependency manager
-EAPI=5
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c412b9a7d86fc8ee751b9dbbb3f3d66
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3
new file mode 100644
index 000000000000..b9d1ca043a96
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=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=Ivy is a free java based dependency manager
+EAPI=7
+HOMEPAGE=https://ant.apache.org/ivy/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0 dev-java/bcpkix:1.50 dev-java/bcprov:1.50 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ebca6278a48a239b4a0d275013662ae2
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0 b/metadata/md5-cache/dev-java/bcel-6.5.0
new file mode 100644
index 000000000000..30bb82d53371
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Apache Commons Bytecode Engineering Library
+EAPI=7
+HOMEPAGE=https://commons.apache.org/proper/commons-bcel
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~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=0
+SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=7edf1376f72a74b69300c08a82e3691e
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
new file mode 100644
index 000000000000..22b33c17833b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Brotli decompressor
+EAPI=7
+HOMEPAGE=https://github.com/google/brotli
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=855be18d925ea38747d986df28f7d782
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
deleted file mode 100644
index 70898f6484a3..000000000000
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 dev-java/commons-codec:0 >=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=The Jakarta Commons HttpClient library
-EAPI=5
-HOMEPAGE=http://hc.apache.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8c90d4b4f2fc1b3ca8c1baa2c3e52e6
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
new file mode 100644
index 000000000000..4db7b114a09b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 dev-java/commons-codec:0 >=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=The Jakarta Commons HttpClient library
+EAPI=7
+HOMEPAGE=https://hc.apache.org/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=3
+SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c95a0b16a3977ed71bf05c794cd2bb39
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r7 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r7
deleted file mode 100644
index bcdd8b81884a..000000000000
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 test? ( dev-java/xalan:0 dev-java/ant-junit:0 dev-java/junitperf:0 ) >=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=XML Java library
-EAPI=6
-HOMEPAGE=http://dom4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=dom4j
-PDEPEND=dev-java/jaxen:1.1
-RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f17464cbf4f41a9e75abc1d0333c1605
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r8 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r8
new file mode 100644
index 000000000000..29b06dd62efd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 test? ( dev-java/xalan:0 dev-java/ant-junit:0 dev-java/junitperf:0 ) 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=XML Java library
+EAPI=7
+HOMEPAGE=http://dom4j.sourceforge.net/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=dom4j
+PDEPEND=dev-java/jaxen:1.1
+RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=215cc2f2f52c831ad0342af4d6f96874
diff --git a/metadata/md5-cache/dev-java/java-config-2.3.1 b/metadata/md5-cache/dev-java/java-config-2.3.1
index e8dfad481817..350fffcea4d4 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=210d5b2b442929480c4cf07ae3629c8a
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index da0cf2c35563..a6fb1bf92e19 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -11,5 +11,5 @@ RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7463979478606ab021643d50eb0cfd28
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.5 b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
index fc60ac3eed80..bb471995f5fb 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.5
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.5.tar.bz2
-_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8d93ce5ba68a58cb642197df026bb2b8
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
deleted file mode 100644
index c8cd5b5fddba..000000000000
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Clean room implementation of the JCIP Annotations
-EAPI=5
-HOMEPAGE=https://github.com/stephenc/jcip-annotations
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=405cbba190600574bf7ce5b27660c741
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
new file mode 100644
index 000000000000..a1e1c16968cc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Clean room implementation of the JCIP Annotations
+EAPI=7
+HOMEPAGE=https://github.com/stephenc/jcip-annotations
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=78785c64a3c1068823508bd3117b2dcf
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3 b/metadata/md5-cache/dev-java/jformatstring-2.0.3
deleted file mode 100644
index 6024ff7f3c2e..000000000000
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compile time checking for Java format strings
-EAPI=5
-HOMEPAGE=https://code.google.com/p/j-format-string
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0fbc4fea60468f05f99ba648a302d97
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
new file mode 100644
index 000000000000..25942fdd1503
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Compile time checking for Java format strings
+EAPI=7
+HOMEPAGE=https://code.google.com/p/j-format-string
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 9d7d24ca4adc..99517ed8765c 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Simple framework to write repeatable tests
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.junit.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dacb8dbd4ad560e87ad87ba82bade419
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=2cb66bdc1fddf90655369bf84c447628
diff --git a/metadata/md5-cache/dev-java/junit-4.12-r1 b/metadata/md5-cache/dev-java/junit-4.12-r1
index 315ea7f52d94..89fc63f9aae4 100644
--- a/metadata/md5-cache/dev-java/junit-4.12-r1
+++ b/metadata/md5-cache/dev-java/junit-4.12-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/r4.12.tar.gz -> junit4-r4.12.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fce2f1cd3c9af833667e53a9f89d5c44
+_md5_=e221689a92fadb882579224a14ff9f6e
diff --git a/metadata/md5-cache/dev-java/junit-4.13.1 b/metadata/md5-cache/dev-java/junit-4.13.1
index 65ab5ab6a776..ae0df9de11cb 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.1
+++ b/metadata/md5-cache/dev-java/junit-4.13.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/r4.13.1.tar.gz -> junit4-r4.13.1.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=b358b592b8d460476afa65224375e5d4
+_md5_=e7f70e0dbff9cfe95cc833c2e0504358
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 517ca809f38e..7a29d4644766 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=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9146b361b1282323dfc5dc8500c35f72
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
index 501ebf3e0fb1..834ec4cc040f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
@@ -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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.108/src/apache-tomcat-7.0.108-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=139762c83db71a533cfa073e0e85b25c
+_md5_=1e93f0acdcc090b1f60bf29d1ad8091e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
index 2e6914a256b8..034f869bcefd 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.63
@@ -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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.63/src/apache-tomcat-8.5.63-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3adc7d5dd8dd9afcc811f2acdcca923e
+_md5_=1eda22f51882d56462271be395aaf816
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64
new file mode 100644
index 000000000000..b2a7625fcfe9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.64/src/apache-tomcat-8.5.64-src.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=041a2bc5c1231962ec4cfaf942924a30
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44
new file mode 100644
index 000000000000..75a111ad7d9c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.44/src/apache-tomcat-9.0.44-src.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c3069b971d949c8f5e15335c5f092adc
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2 b/metadata/md5-cache/dev-java/xalan-2.7.2
deleted file mode 100644
index eadc2ca06642..000000000000
--- a/metadata/md5-cache/dev-java/xalan-2.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jdk-1.3 doc? ( app-arch/unzip ) >=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=Transforming XML documents into HTML, text, or other XML document types
-EAPI=5
-HOMEPAGE=http://xalan.apache.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.3 ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dda028ecf0626cdff4b91ff046331819
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
new file mode 100644
index 000000000000..a0184a612177
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-arch/unzip )
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/javacup:0 dev-java/bcel:0 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=Transforming XML documents into HTML, text, or other XML document types
+EAPI=7
+HOMEPAGE=https://xalan.apache.org/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=51cdba989588670e28fdb87cf8f67551
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
deleted file mode 100644
index effc656af178..000000000000
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.3 test? ( dev-java/junit:4 ) dev-java/xerces:2 >=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=A streaming pull XML parser used to quickly process input elements
-EAPI=5
-HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1 IBM
-RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=63e78589b1bb2588c4df0c188a1f9319
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
new file mode 100644
index 000000000000..5aa0771fad2f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/xerces:2 >=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=A streaming pull XML parser used to quickly process input elements
+EAPI=7
+HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
+IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-1.1 IBM
+RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
+_eclasses_=java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=83f4d3e2f6f852899e446eb81c137759
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
index 5501fea2cdb5..4e10736fd9b4 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Sun XML Datatypes Library
 EAPI=7
 HOMEPAGE=http://msv.java.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD Apache-1.1
-RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
-_md5_=b8d933aaae6d6cfafdbd87af4897fa4b
+_md5_=aba5170b678be1c19fbc6892bfa59c5b
diff --git a/metadata/md5-cache/dev-java/xz-java-1.8 b/metadata/md5-cache/dev-java/xz-java-1.8
deleted file mode 100644
index c9c9e8e33767..000000000000
--- a/metadata/md5-cache/dev-java/xz-java-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Implementation of xz data compression in pure java
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/java.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-java-1.8.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd30796338c0bddb3fb5b2fb7b4758e0
diff --git a/metadata/md5-cache/dev-java/xz-java-1.8-r1 b/metadata/md5-cache/dev-java/xz-java-1.8-r1
new file mode 100644
index 000000000000..b962ae3ab898
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xz-java-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=app-arch/unzip >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Implementation of xz data compression in pure java
+EAPI=7
+HOMEPAGE=https://tukaani.org/xz/java.html
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-java-1.8.zip
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c
+_md5_=f1356a24e35d53befcd5efdca3e82dd7
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1 b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
new file mode 100644
index 000000000000..e104917a2caa
--- /dev/null
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=JNI bindings for Zstd native library
+EAPI=7
+HOMEPAGE=https://github.com/luben/zstd-jni
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/luben/zstd-jni/archive/v1.4.9-1.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0700841ecba1bd175f9582147592235d