gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /metadata/md5-cache/dev-java
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
107 files changed, 153 insertions, 1168 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 185edc188fb1..e59844e8b632 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/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index afa7845af7fa..8280faee4475 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=d8fade192eda8ecb0e0d73fb744ab0de
+_md5_=fe0bcbdb000bddc76b2de27cb78214e8
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
deleted file mode 100644
index 589f5829e255..000000000000
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/xerces:2 dev-java/nekohtml: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=Boilerplate Removal and Fulltext Extraction from HTML pages
-EAPI=5
-HOMEPAGE=https://github.com/kohlschutter/boilerpipe
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a43ddeafcc79f17afb6c6068f3b23f6f
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index 06f8e8c0d0f3..11e689597e73 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=Brotli decompressor
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 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	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=02c1dc8707e83c100acc9329f6881928
+_md5_=cac1466dad52f56f79649c933cdb9091
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
deleted file mode 100644
index 59a4969a5377..000000000000
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=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=OO database written in Java
-EAPI=6
-HOMEPAGE=http://www.cdegroot.com/software/db/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3753eaa1cfbc636eb50e8d6922ae9fa8
diff --git a/metadata/md5-cache/dev-java/codemodel-2.6 b/metadata/md5-cache/dev-java/codemodel-2.6
deleted file mode 100644
index 4a72ba75344b..000000000000
--- a/metadata/md5-cache/dev-java/codemodel-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library for code generators
-EAPI=5
-HOMEPAGE=https://codemodel.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.6/codemodel-2.6-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30e4e07e17e09986fa58741e384bb0ba
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.3.1 b/metadata/md5-cache/dev-java/commons-cli-1.3.1
deleted file mode 100644
index 416904f21d57..000000000000
--- a/metadata/md5-cache/dev-java/commons-cli-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for working with the command line arguments and options
-EAPI=6
-HOMEPAGE=http://commons.apache.org/cli/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.3.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c578985ddf72f1bd8dfa202f91c3b39e
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.10 b/metadata/md5-cache/dev-java/commons-compress-1.10
deleted file mode 100644
index a963b5d5156b..000000000000
--- a/metadata/md5-cache/dev-java/commons-compress-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xz-java:0 >=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/ant-junit:0 dev-java/hamcrest-core:1.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=Java API for working with archive files
-EAPI=5
-HOMEPAGE=https://commons.apache.org/proper/commons-compress/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xz-java:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.10-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4cc4ca6d29c0329282ff4f21ec471188
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.20 b/metadata/md5-cache/dev-java/commons-compress-1.20
index 2ce53e64aa30..2bad4e5972b7 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.20
+++ b/metadata/md5-cache/dev-java/commons-compress-1.20
@@ -4,10 +4,10 @@ DESCRIPTION=Java API for working with archive files
 EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-compress/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz -> commons-compress-1.20-sources.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=f979ee0fd6c9054b47d2c2f30f20f71e
+_md5_=62e9d82eb2fe095f75fadda9ccf57acd
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
deleted file mode 100644
index 3ea8f7ed8f94..000000000000
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=java-virtuals/servlet-api:2.5 >=virtual/jdk-1.4 >=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=EL is the JSP 2.0 Expression Language Interpreter from Apache
-EAPI=5
-HOMEPAGE=http://commons.apache.org/el/
-IUSE=elibc_FreeBSD source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-osgi	303099c377fa3ce30c97f39ebecb351f	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f48a1c3c1222fea9287b84c00aa91073
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
deleted file mode 100644
index 53a084e3d883..000000000000
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=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=High-performance file upload capability to your servlets and web applications
-EAPI=5
-HOMEPAGE=http://commons.apache.org/fileupload/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e39d999c61c6f1a87873b82806d074b4
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r2 b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
deleted file mode 100644
index 958131e7e867..000000000000
--- a/metadata/md5-cache/dev-java/dtdparser-1.21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java DTD Parser
-EAPI=5
-HOMEPAGE=http://www.wutka.com/dtdparser.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 Apache-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.21
-SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79c69f1cb540858d8a00ffff3a5d1b8d
diff --git a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1 b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
deleted file mode 100644
index 5fc6eb3ea81f..000000000000
--- a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+++ /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/easymock:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
-EAPI=5
-HOMEPAGE=http://www.easymock.org/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.2
-SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf4caf79ecb9f26a3ebe8ffe6d08d16d
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
deleted file mode 100644
index 207753bc0d41..000000000000
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-EAPI=5
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caf26105df05ffa3d1617b0f514733c2
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
deleted file mode 100644
index d67f8fed5758..000000000000
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-EAPI=5
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7cc952bdade3ab476bdf21bdbb01484
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.11 b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
deleted file mode 100644
index 7f034f002395..000000000000
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Specifies a standardized binary encoding for the XML Information Sets
-EAPI=5
-HOMEPAGE=https://fi.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=com/sun/xml/fastinfoset/FastInfoset/1.2.11/FastInfoset-1.2.11-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79d458e29c6e1e67787b4196f2777e0b
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
deleted file mode 100644
index 6e1619153ca0..000000000000
--- a/metadata/md5-cache/dev-java/fscript-1.17-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 >=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=Java based scripting engine designed to be embedded into other Java applications
-EAPI=5
-HOMEPAGE=http://fscript.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=22a0d89e6aea64cac26a60944f326b4a
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
deleted file mode 100644
index 56449c6c237c..000000000000
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.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=Integration library of hamcrest
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=506784f7f4caf627bcb75869ac92a9ec
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
deleted file mode 100644
index 324ab4de5167..000000000000
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 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=HelpGUI is a simple library which develop a help viewer component
-EAPI=5
-HOMEPAGE=http://helpgui.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef598257f02533d00890e1da479afe60
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r2 b/metadata/md5-cache/dev-java/higlayout-1.0-r2
deleted file mode 100644
index 8b2bc549704d..000000000000
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Swing layout manager that's powerful and easy to use
-EAPI=5
-HOMEPAGE=http://www.autel.cz/dmi/tutorial.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8623e7b9fcd7dd820ae90fe3a86f7d77
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r3 b/metadata/md5-cache/dev-java/higlayout-1.0-r3
deleted file mode 100644
index 25ffc5342ce0..000000000000
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Swing layout manager that's powerful and easy to use
-EAPI=6
-HOMEPAGE=http://www.autel.cz/dmi/tutorial.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/higlayout-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=039fbd726995ea02761efe1cce04cd84
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
deleted file mode 100644
index c417f6a49863..000000000000
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/mockito:0 ) dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.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 low level toolset of Java components focused on HTTP and associated protocols
-EAPI=5
-HOMEPAGE=http://hc.apache.org/index.html
-IUSE=elibc_FreeBSD source examples doc test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4.5
-SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c8b31d4c4453d34be180112b7d8b807
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
deleted file mode 100644
index 5d23a757009b..000000000000
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=test? ( dev-java/commons-logging:0 dev-java/ant-junit:0 dev-java/mockito: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=A low level toolset of Java components focused on HTTP and associated protocols
-EAPI=5
-HOMEPAGE=http://hc.apache.org/index.html
-IUSE=elibc_FreeBSD source examples test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4.4
-SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d9f791b2d967a5a013d9294bc3ede1d8
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1 b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
deleted file mode 100644
index 6561e3d077ce..000000000000
--- a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/zip dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=IStack Commons - Buildtools jar
-EAPI=5
-HOMEPAGE=https://istack-commons.java.net
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-buildtools/2.22/istack-commons-buildtools-2.22-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d94f07f235f2a273c6a334e3c506c5e
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
deleted file mode 100644
index 5dc65fdab86e..000000000000
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jdk-1.5 >=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=Java implementation of the SSH protocol
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/
-IUSE=elibc_FreeBSD source doc examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=015ae0c581fd4a60f600fb132ad0620b
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.0.1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.0.1
new file mode 100644
index 000000000000..54fe52505d62
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Activation API jar
+EAPI=7
+HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=51d6e880724f88ed0a8e81efb18c2837
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
deleted file mode 100644
index 98b57f89a893..000000000000
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jdk-1.4 >=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=Jar Bundler Ant Task
-EAPI=5
-HOMEPAGE=https://github.com/UltraMixer/JarBundler
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jarbundler-1.8.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=12d3ac4c1906acfb05711d6097720a87
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
deleted file mode 100644
index 686ef6b61b4f..000000000000
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-java/xerces-2.8.1:2 >=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=Jar Bundler Ant Task
-EAPI=5
-HOMEPAGE=https://github.com/UltraMixer/JarBundler
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jarbundler-2.3.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82fd4dcd5dddbe21a3d8d0be31232ce5
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 8207f3bcb618..8bcfae8e4147 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 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	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=210d5b2b442929480c4cf07ae3629c8a
+_md5_=0182b4723fd32b111e4b6d2110e2cc39
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 14e6e159bd86..e30bc99e74d3 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Java environment configuration query tool
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-IUSE=test python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44d8ca396b93962c816cbd33dbab0ade
+_md5_=d31fe9fa08713c44daf1ec7f9f06e9ac
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
deleted file mode 100644
index 714ead3d954b..000000000000
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit: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=A wrapper that makes it possible to install a Java Application as daemon
-EAPI=5
-HOMEPAGE=http://wrapper.tanukisoftware.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=tanuki-community
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e5692b2332ebf6333d79be5fc2aef1c0
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
new file mode 100644
index 000000000000..6c7ceb289966
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
@@ -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/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 wrapper that makes it possible to install a Java Application as daemon
+EAPI=7
+HOMEPAGE=http://wrapper.tanukisoftware.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=tanuki-community
+RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
+_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c0d016bb4392b72627dad9f4dc761472
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
deleted file mode 100644
index 622d329e4809..000000000000
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 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=Java Solution for Real-Time and Embedded Systems
-EAPI=5
-HOMEPAGE=http://javolution.org
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=750f6a87a3738160a99fa049db8104b8
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
deleted file mode 100644
index 858f18a01263..000000000000
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 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=Java Solution for Real-Time and Embedded Systems
-EAPI=5
-HOMEPAGE=http://javolution.org
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=6
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.4 b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
deleted file mode 100644
index fdb01d26e0d3..000000000000
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j: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=JBoss logging framework
-EAPI=5
-HOMEPAGE=https://www.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc0d26aa13a8edfeccec2bab3e19ae75
diff --git a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1 b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
deleted file mode 100644
index c98417775537..000000000000
--- a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JBoss logging framework
-EAPI=5
-HOMEPAGE=https://www.jboss.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jboss-logging/jboss-logmanager/archive/1.5.1.Final.tar.gz -> jboss-logmanager-1.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f23b1447b76e6f483949c7c313729793
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
deleted file mode 100644
index 0084e891044d..000000000000
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 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=Library for parsing/handling of command line parameters
-EAPI=5
-HOMEPAGE=http://jcmdline.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bd6ede50c41436f6e29aa68d14cf807
diff --git a/metadata/md5-cache/dev-java/jcmdline-2.0.0 b/metadata/md5-cache/dev-java/jcmdline-2.0.0
deleted file mode 100644
index 3847f7afd443..000000000000
--- a/metadata/md5-cache/dev-java/jcmdline-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library for parsing/handling of command line parameters
-EAPI=5
-HOMEPAGE=http://jcmdline.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jcmdline/jcmdline-2.0.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce07028ea8fb54c97d457a423b0f3a25
diff --git a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3 b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
deleted file mode 100644
index 9fc4a4402f5f..000000000000
--- a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A standard set of libs for Server-Side JDBC support
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/index.html
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=jdbc2_0-stdext-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=436e2661ec4df7ea08bf18433a2e7fec
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r3 b/metadata/md5-cache/dev-java/jdbm-0.12-r3
deleted file mode 100644
index b2f1a9e48403..000000000000
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.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=Jdbm aims to be for Java what GDBM is for Perl, Python, C, ...
-EAPI=6
-HOMEPAGE=http://jdbm.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8a3aa02f8d09596c43e6117b1ccb8ac
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
deleted file mode 100644
index a37a8c3eeb91..000000000000
--- a/metadata/md5-cache/dev-java/jebl-2013.02.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Evolutionary Biology Library
-EAPI=5
-HOMEPAGE=http://jebl.sourceforge.net/
-IUSE=elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f09f4583807b47004872a3b3b71933b
diff --git a/metadata/md5-cache/dev-java/jettison-1.3.7 b/metadata/md5-cache/dev-java/jettison-1.3.7
deleted file mode 100644
index a6fc77f112fb..000000000000
--- a/metadata/md5-cache/dev-java/jettison-1.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/wstx:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A JSON StAX implementation
-EAPI=5
-HOMEPAGE=https://github.com/codehaus/jettison
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/codehaus/jettison/archive/jettison-1.3.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46414f8b85824dd36f010f6a4484b358
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
deleted file mode 100644
index 03b234300974..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jgoodies-common:1.8 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JGoodies Looks Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgoodies-common:1.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.6
-SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf007ba9c5ed1214242f69eb9eb13bfe
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
new file mode 100644
index 000000000000..b787030b636c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jgoodies-common:1.8 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JGoodies Looks Library
+EAPI=7
+HOMEPAGE=http://www.jgoodies.com/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.6
+SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
deleted file mode 100644
index 7d4f962f1157..000000000000
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( =dev-java/junit-3.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=ID3 Class Library Implementation
-EAPI=5
-HOMEPAGE=http://jid3.blinkenlights.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5001cd1685f984d1b167ab43934d8fd2
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
deleted file mode 100644
index 77b62519abb2..000000000000
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/jutils: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=An implementation of an API for game controller discovery and polled input
-EAPI=5
-HOMEPAGE=https://java.net/projects/jinput
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98f1b796f76ef346da6b7d26c43f6033
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r3 b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
deleted file mode 100644
index 37ba366e63c0..000000000000
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Indexed Serialization Package: A small, embedded database engine
-EAPI=5
-HOMEPAGE=http://www.coyotegulch.com/products/jisp/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=SVFL
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=095f9ce71d109596698ff8134da387a2
diff --git a/metadata/md5-cache/dev-java/jlibeps-0.1-r1 b/metadata/md5-cache/dev-java/jlibeps-0.1-r1
deleted file mode 100644
index 76a32c135ca2..000000000000
--- a/metadata/md5-cache/dev-java/jlibeps-0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library to create EPS graphics from a Graphics2D
-EAPI=5
-HOMEPAGE=http://jlibeps.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jlibeps/jlibeps-0.1-src.zip -> jlibeps-0.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3da1ea2f428d97ca6975c377d8990cd6
diff --git a/metadata/md5-cache/dev-java/jortho-1.0 b/metadata/md5-cache/dev-java/jortho-1.0
deleted file mode 100644
index 17698255b7f9..000000000000
--- a/metadata/md5-cache/dev-java/jortho-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java spell-checking library
-EAPI=5
-HOMEPAGE=https://www.inetsoftware.de/other-products/jortho
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 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/project/jortho/JOrtho%20Library/1.0/JOrtho_1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ecbeff852119e92573e5d5326042d32
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
deleted file mode 100644
index d8fe947f3907..000000000000
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/ant-core:0 source? ( app-arch/zip:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ant Task for build-time creation of Java source file with version or other info
-EAPI=5
-HOMEPAGE=http://jreleaseinfo.sourceforge.net/
-IUSE=source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2ca4a4d61d2b2c2714a757df3476b03
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
deleted file mode 100644
index 261082c87254..000000000000
--- a/metadata/md5-cache/dev-java/jstun-0.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:0 ) dev-java/slf4j-api: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=Java-based STUN implementation
-EAPI=5
-HOMEPAGE=https://jstun.javawi.de/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://jstun.javawi.de/jstun-0.7.3.src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd3cac237e9c6b87e4340f0b841a94d1
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4-r1 b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
deleted file mode 100644
index 1cc143ad2374..000000000000
--- a/metadata/md5-cache/dev-java/junit-addons-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=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=JUnit-addons is a collection of helper classes for JUnit
-EAPI=5
-HOMEPAGE=http://junit-addons.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4d8dfe17f5bdf955a6db9e3120b5934
diff --git a/metadata/md5-cache/dev-java/junrar-0.6 b/metadata/md5-cache/dev-java/junrar-0.6
deleted file mode 100644
index ecc02dee0aa7..000000000000
--- a/metadata/md5-cache/dev-java/junrar-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Unrar java implementation
-EAPI=5
-HOMEPAGE=https://github.com/edmund-wagner/junrar/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=unRAR
-RDEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/edmund-wagner/junrar/archive/junrar-0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=469d45623bcdd9f70abdcb61bcb8af9c
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0-r1 b/metadata/md5-cache/dev-java/jvmstat-3.0-r1
deleted file mode 100644
index 941d2dae85aa..000000000000
--- a/metadata/md5-cache/dev-java/jvmstat-3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Monitoring APIs and tools for monitoring the performance of the JVM
-EAPI=6
-HOMEPAGE=http://java.sun.com/performance/jvmstat/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=sun-bcla-jvmstat
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=jvmstat-3_0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69397e03f957077f8ebdadeceeec8b30
diff --git a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2 b/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
deleted file mode 100644
index a0cbfbc34758..000000000000
--- a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=source? ( app-arch/zip )
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
-EAPI=7
-HOMEPAGE=http://www.jcraft.com/jzlib/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=3a11e7866fa4fdb97c482e41010790c3
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r1 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 491313a80e5b..9a988a4bb466 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -1,14 +1,14 @@
 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 )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
 EAPI=7
 HOMEPAGE=http://www.jcraft.com/jzlib/
 IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=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 )
 RESTRICT=test
-SLOT=1.1.3
+SLOT=0
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=343d31f3b14d60636a31b8e0e8b846c8
+_md5_=45410b9ff0acca48c36cafed7aa672f3
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
deleted file mode 100644
index 9de325e6f069..000000000000
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jreleaseinfo:0 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java/Swing GUI components and libraries for building desktop applications
-EAPI=5
-HOMEPAGE=http://common.l2fprod.com/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c624d87edd8341be30ee1d3a4ce21787
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
deleted file mode 100644
index 07e17e116848..000000000000
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.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=Netscape Directory SDK for Java
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/directory/javasdk.html
-IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.1
-SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d84497b79bbdb7d72722bc7368b1e96
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2
deleted file mode 100644
index b5f9410984fc..000000000000
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A selection of libraries for Java
-EAPI=6
-HOMEPAGE=http://www.matthew.ath.cx/projects/java/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/libmatthew-java-0.7.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b93d7d4185a4cfc5db275a31670ffbca
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
deleted file mode 100644
index 914dbd43f5ca..000000000000
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Generates META-INF/services files automatically
-EAPI=5
-HOMEPAGE=http://metainf-services.kohsuke.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e92fec7a8b8f14f72930580076fb96a
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
index 95b21677f431..2d67168ed638 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7
@@ -4,10 +4,10 @@ DESCRIPTION=Generates META-INF/services files automatically
 EAPI=5
 HOMEPAGE=http://metainf-services.kohsuke.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92307743afd2ceddac394c5d71fce2aa
+_md5_=6e92fec7a8b8f14f72930580076fb96a
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0-r2 b/metadata/md5-cache/dev-java/miglayout-4.0-r2
new file mode 100644
index 000000000000..91081f384484
--- /dev/null
+++ b/metadata/md5-cache/dev-java/miglayout-4.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=swt? ( dev-java/swt:4.10 ) >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Easy to use yet very powerful Java Swing layout manager
+EAPI=7
+HOMEPAGE=http://www.miglayout.com/
+IUSE=swt elibc_FreeBSD doc examples source
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=swt? ( dev-java/swt:4.10 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=3eb487205370c4a84492be9cabc4b1f7
diff --git a/metadata/md5-cache/dev-java/minlog-1.2 b/metadata/md5-cache/dev-java/minlog-1.2
deleted file mode 100644
index 065eb49a1ace..000000000000
--- a/metadata/md5-cache/dev-java/minlog-1.2
+++ /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=Minimal overhead Java logging
-EAPI=5
-HOMEPAGE=https://github.com/EsotericSoftware/minlog/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://minlog.googlecode.com/files/minlog-1.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=552e56123f25f09f775f28c212a7e6f3
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
deleted file mode 100644
index fc858cf439ed..000000000000
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 app-arch/unzip >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
-EAPI=5
-HOMEPAGE=https://msv.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-2.0
-RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2f626e1526e8eab54932645cf3c2a6f8
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
deleted file mode 100644
index 2e32f947a414..000000000000
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/xerces-2.7 >=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 simple HTML scanner and tag balancer using standard XML interfaces
-EAPI=5
-HOMEPAGE=http://nekohtml.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc005ec780604720b069a2105a3ffc34
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-4.0.36
deleted file mode 100644
index 55a52a8b3188..000000000000
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/jboss-marshalling-river:0 dev-java/jboss-marshalling-serial:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=https://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2277fbcb8e92a2a0ab33f9dbaaf17d75
diff --git a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
deleted file mode 100644
index 4cee00997f7a..000000000000
--- a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-handler-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/jboss-marshalling-river:0 dev-java/jboss-marshalling-serial:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=https://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-handler-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55a91a123e6aea3421ff3a0abfd833ed
diff --git a/metadata/md5-cache/dev-java/netty-handler-4.0.36 b/metadata/md5-cache/dev-java/netty-handler-4.0.36
deleted file mode 100644
index db6ecf387669..000000000000
--- a/metadata/md5-cache/dev-java/netty-handler-4.0.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/netty-tcnative:0 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/jetty-alpn-api:0 dev-java/jetty-npn-api:0 test? ( dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Async event-driven framework for high performance network applications
-EAPI=5
-HOMEPAGE=https://netty.io/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/netty-tcnative:0 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/jetty-alpn-api:0 dev-java/jetty-npn-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cf6115b29dc64d2b09cb385bc1a9013
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
index 38a174334a95..c2c81a1ad81d 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
@@ -4,11 +4,11 @@ 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 +pch selinux source systemtap elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= 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.11-ga.tar.bz2 -> openjdk-11.0.11_p9.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-vm-2	1b9686c0df06500159478dfaf5c21338	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=663307081d332907ca8d8747c2949aef
+_md5_=a5047643b0a8a954600ef40894c5775f
diff --git a/metadata/md5-cache/dev-java/openjdk-8.272_p10 b/metadata/md5-cache/dev-java/openjdk-8.272_p10
deleted file mode 100644
index e04bc21b1d9f..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.272_p10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig 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 javafx +jbootstrap +pch selinux source elibc_FreeBSD
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-SLOT=8
-SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u272-ga.tar.bz2 -> openjdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u272-ga.tar.bz2 -> openjdk-corba-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u272-ga.tar.bz2 -> openjdk-hotspot-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u272-ga.tar.bz2 -> openjdk-jaxp-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u272-ga.tar.bz2 -> openjdk-jaxws-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u272-ga.tar.bz2 -> openjdk-jdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u272-ga.tar.bz2 -> openjdk-langtools-8.272_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u272-ga.tar.bz2 -> openjdk-nashorn-8.272_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.272_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u272-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-vm-2	1b9686c0df06500159478dfaf5c21338	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=738c51ee210044ff0a8e0927958bedc7
diff --git a/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1 b/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1
deleted file mode 100644
index cf1c718e4dad..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.282_p08-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig 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 javafx +jbootstrap +pch selinux source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-SLOT=8
-SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u282-ga.tar.bz2 -> openjdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u282-ga.tar.bz2 -> openjdk-corba-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u282-ga.tar.bz2 -> openjdk-hotspot-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u282-ga.tar.bz2 -> openjdk-jaxp-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u282-ga.tar.bz2 -> openjdk-jaxws-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u282-ga.tar.bz2 -> openjdk-jdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u282-ga.tar.bz2 -> openjdk-langtools-8.282_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u282-ga.tar.bz2 -> openjdk-nashorn-8.282_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.282_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u282-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.282_p08.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-vm-2	1b9686c0df06500159478dfaf5c21338	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=893d86a8c1b5cbe4cb0100c6ff47a99d
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
index 8bd6837e39f0..5c09ed79d5a2 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
 EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz >=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=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz )
 _eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8583cdccc66b56ac74aa85884045ed21
+_md5_=3160334f4a81f73b9124ccd9b2aa164c
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.272_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.272_p10
deleted file mode 100644
index 4c3953e6e944..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.272_p10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup unpack
-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 selinux source
-KEYWORDS=amd64 ~arm arm64 ppc64
-LICENSE=GPL-2-with-classpath-exception
-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 ) arm? ( dev-libs/libffi-compat:6 ) 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/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3071b5ad6b147b06352c40e444991530
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08 b/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08
deleted file mode 100644
index 76fa8d31f808..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.282_p08
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup unpack
-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 selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) 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/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c8f1b3551a99491147887ff874976ab
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.10_p9 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.10_p9
deleted file mode 100644
index 16ee45c84e9e..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.10_p9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-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.10+9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz )
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e5bc3b9fa48c1b336deea6d1ab03a4d
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.9_p11 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.9_p11
deleted file mode 100644
index 0922b0b03955..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.9_p11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-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.9+11/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz )
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=652a189898758c88326c8d06071bc425
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.272_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.272_p10
deleted file mode 100644
index 320c97573b16..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.272_p10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups headless-awt selinux
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-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/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e688b6625ebeaecbd9affdc99c9b1217
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.282_p08 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.282_p08
deleted file mode 100644
index 5121ba74dca7..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.282_p08
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups headless-awt selinux
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-classpath-exception
-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/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03f6e5adaef0d61e2916338f6feb2df6
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
index 78066827ae34..557cbc78b361 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
@@ -11,4 +11,4 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.9+0.tar.bz2 -> openjfx-11.0.9_p0.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-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	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a4639f62ab400db2684a3d2f6e7d8a5
+_md5_=19fd42b84358719bcb75fc6361dfc545
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
deleted file mode 100644
index 078bd0234d8c..000000000000
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup test
-DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Enterprise Release 5 Companion Code
-EAPI=5
-HOMEPAGE=http://www.osgi.org/Main/HomePage
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
-RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff0089c6a97dd7bc2378d90db4589730
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
new file mode 100644
index 000000000000..e1e136bf622f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=OSGi Enterprise Release 5 Companion Code
+EAPI=7
+HOMEPAGE=http://www.osgi.org/Main/HomePage
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=Apache-2.0 OSGi-Specification-2.0
+RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=4baa468a51b986fe012d84de7fb32d21
diff --git a/metadata/md5-cache/dev-java/piccolo2d-3.0-r2 b/metadata/md5-cache/dev-java/piccolo2d-3.0-r2
new file mode 100644
index 000000000000..564bb93e5462
--- /dev/null
+++ b/metadata/md5-cache/dev-java/piccolo2d-3.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/swt:4.10 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A Structured 2D Graphics Framework
+EAPI=7
+HOMEPAGE=https://github.com/piccolo2d/piccolo2d.java
+IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD
+RDEPEND=dev-java/swt:4.10 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/piccolo2d/piccolo2d.java/archive/piccolo2d-complete-3.0.tar.gz -> piccolo2d-3.0.tar.gz
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=6382e263a7b8da3dd8e69cd11a001e71
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
deleted file mode 100644
index fc4ac2f929f9..000000000000
--- a/metadata/md5-cache/dev-java/picocontainer-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Small footprint Dependency Injection container
-EAPI=7
-HOMEPAGE=http://www.picocontainer.org
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=1
-SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
-_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=70ef85df3a140059033e0044e69e1cba
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
deleted file mode 100644
index d3ff3b3dd190..000000000000
--- a/metadata/md5-cache/dev-java/prefuse-20071021_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/lucene:1 >=app-arch/unzip-5.50-r1 >=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=UI toolkit for building highly interactive visualizations of un-/structured data
-EAPI=5
-HOMEPAGE=http://prefuse.org
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2006
-SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64d2802bfe9017f233a97e7a884c8292
diff --git a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1 b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
deleted file mode 100644
index 5cc82ba0d34e..000000000000
--- a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4:* =dev-java/commons-logging-1*: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=Radeox Wiki render engine
-EAPI=7
-HOMEPAGE=http://www.radeox.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.4:* =dev-java/commons-logging-1*:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
-_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d76dac2a4bb88aa3a18547c237a56984
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
deleted file mode 100644
index f7762d92a7ed..000000000000
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=virtual/jdk-1.6 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=RELAX NG Compiler Compiler
-EAPI=5
-HOMEPAGE=http://relaxngcc.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e698d05dce2e21199a36dc8008266d62
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
deleted file mode 100644
index 6e305bdfd3c1..000000000000
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.5 test? ( dev-java/ant-junit ) >=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 WBEM services client that includes an SLP client for CIM service discovery
-EAPI=5
-HOMEPAGE=http://sblim.wiki.sourceforge.net/CimClient
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b5e39432c071cb1f41ad3dc40d05982
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
deleted file mode 100644
index 23973d5999bc..000000000000
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.5 test? ( dev-java/ant-junit ) >=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 WBEM services client that includes an SLP client for CIM service discovery
-EAPI=5
-HOMEPAGE=http://sblim.wiki.sourceforge.net/CimClient
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8dec0201cb8d61f05f6650cda595956c
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
deleted file mode 100644
index 71e576ac3a51..000000000000
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/laf-plugin:0 dev-java/xalan: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=Skin Look and Feel - Skinning Engine for the Swing toolkit
-EAPI=5
-HOMEPAGE=http://skinlf.l2fprod.com/
-IUSE=elibc_FreeBSD examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=464072f0b55189a5247512d28c7edae6
diff --git a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1 b/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
deleted file mode 100644
index c19a137cd5e7..000000000000
--- a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A simple, asynchronous, single-threaded memcached client written in java
-EAPI=5
-HOMEPAGE=https://code.google.com/p/spymemcached/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8887b00b5d9e64fea0a82e20b4173a2
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r5 b/metadata/md5-cache/dev-java/stax-ex-1.0-r5
deleted file mode 100644
index 45b54134da1a..000000000000
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extensions to complement JSR-173 StAX API
-EAPI=6
-HOMEPAGE=http://stax-ex.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=698dd2e0a756aed4fa0c5472043304df
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.7.6 b/metadata/md5-cache/dev-java/stax-ex-1.7.6
deleted file mode 100644
index 1f65a7000d80..000000000000
--- a/metadata/md5-cache/dev-java/stax-ex-1.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extensions to complement JSR-173 StAX API
-EAPI=5
-HOMEPAGE=http://stax-ex.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CDDL GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://maven.java.net/content/groups/public/org/jvnet/staxex/stax-ex/1.7.6/stax-ex-1.7.6-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59b8a247274e523314de95f61fc3dc79
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0 b/metadata/md5-cache/dev-java/stax2-api-4.0.0
deleted file mode 100644
index 3a267b27b564..000000000000
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=java-virtuals/stax-api:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extended Stax (STandard Api for Xml procesing) API
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/stax2-api
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddb6e90bd4154dafae813c350b6d3474
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1 b/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
deleted file mode 100644
index 134dc86c6760..000000000000
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extended Stax (STandard Api for Xml procesing) API
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/stax2-api
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4289990ce691ba6a0d534d4b2c38e582
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
new file mode 100644
index 000000000000..7206b2d906c0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A Java template engine
+EAPI=7
+HOMEPAGE=https://www.stringtemplate.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-1
+RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=5dafd07eeccdc26af20903dbdfd21c42
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
deleted file mode 100644
index 7e925315cea6..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java template engine
-EAPI=5
-HOMEPAGE=https://www.stringtemplate.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-PDEPEND=>=dev-java/antlr-3.5.2:3.5
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5699e38d2e5b0f2c257e078ebbc31fa7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1
new file mode 100644
index 000000000000..95f939f09543
--- /dev/null
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A Java template engine
+EAPI=7
+HOMEPAGE=https://www.stringtemplate.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+PDEPEND=>=dev-java/antlr-3.5.2:3.5
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=9539f139ec71b53b0c47b9a8ff165b22
diff --git a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1 b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
deleted file mode 100644
index a02a38a3257e..000000000000
--- a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Sun sun.net.httpserver classes
-EAPI=5
-HOMEPAGE=http://jax-ws.dev.java.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=429442c35d45c0cfc34915fd3ec199f9
diff --git a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3 b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
deleted file mode 100644
index ac476e513fd9..000000000000
--- a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Management Extensions for managing and monitoring
-EAPI=7
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html
-IUSE=elibc_FreeBSD doc examples
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=jmx-1_2_1-ri.zip
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=461bc0b3125591c3a0ec68a667234fb6
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4 b/metadata/md5-cache/dev-java/swingx-1.6.4
deleted file mode 100644
index 50ee6791468f..000000000000
--- a/metadata/md5-cache/dev-java/swingx-1.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of powerful, useful, and just plain fun Swing components
-EAPI=5
-HOMEPAGE=https://java.net/projects/swingx/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.6
-SRC_URI=https://java.net/projects/swingx/downloads/download/releases/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3dfc928408132dcbd5220a51e3d8bfd
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
new file mode 100644
index 000000000000..a185a8b6f33c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A collection of powerful, useful, and just plain fun Swing components
+EAPI=7
+HOMEPAGE=https://java.net/projects/swingx/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.6
+SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
index 6d2c778b5813..6db2c8e5c158 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
@@ -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.109/src/apache-tomcat-7.0.109-src.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=d7c134fb513d398278024da885cff4ba
+_md5_=762814fb31c81990673f362c86590a58
diff --git a/metadata/md5-cache/dev-java/velocity-dvsl-1.0 b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
deleted file mode 100644
index 87757e142aac..000000000000
--- a/metadata/md5-cache/dev-java/velocity-dvsl-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Declarative Velocity Style Language
-EAPI=5
-HOMEPAGE=https://velocity.apache.org/dvsl/devel/
-IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip -> velocity-dvsl-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d2fa766b881e66db4f892c269afd2491
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9-r1 b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
deleted file mode 100644
index 523bc264cadc..000000000000
--- a/metadata/md5-cache/dev-java/wstx-3.2.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 test? ( dev-java/ant-junit:0 ) app-arch/unzip >=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=Woodstox is a high-performance validating namespace-aware XML-processor
-EAPI=5
-HOMEPAGE=https://github.com/FasterXML/woodstox
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/sax:0 dev-java/msv: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 )
-SLOT=3.2
-SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a0c3850b06d8a229e057e76d573bc91c
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
deleted file mode 100644
index de2d215baa3f..000000000000
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A stream-based representation of an XML infoset in Java
-EAPI=5
-HOMEPAGE=https://xmlstreambuffer.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11179c564cf043adabbffbf78259b1b7
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1 b/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
deleted file mode 100644
index 758196d0e23e..000000000000
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.5 >=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=Zeus Java Swing Components Library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/zeus-jscl/
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e215b75af14f3adfb76a4497dd90640
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
index a47d113d9c35..f390701e1dc3 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
@@ -5,10 +5,10 @@ DESCRIPTION=JNI bindings for Zstd native library
 EAPI=7
 HOMEPAGE=https://github.com/luben/zstd-jni
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 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 -> zstd-jni-1.4.9.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82a49043bf26e3f202143037070cd5d2
+_md5_=6d343d2348b8a3f203dbe07234276369
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /metadata/md5-cache/dev-java
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)