gentoo resync : 16.04.2022

458 files changed, 688 insertions, 607 deletions

diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ddd321e19ebc..acfeb86b3e04 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/android-util-4.1.1.4 b/metadata/md5-cache/dev-java/android-util-4.1.1.4
deleted file mode 100644
index 729303726d9c..000000000000
--- a/metadata/md5-cache/dev-java/android-util-4.1.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Library providing APIs for applications written for Google Android
-EAPI=5
-HOMEPAGE=https://source.android.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fee43c2327f774ac3e3222a715707194
diff --git a/metadata/md5-cache/dev-java/angus-activation-1.0.0 b/metadata/md5-cache/dev-java/angus-activation-1.0.0
index 2b53e066b76b..15d0fc862105 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=dev-java/jakarta-activation-api-2.1.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5a90818da557a849d2bd8941803cedea
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index d659d9b5aafa..9154dfc4d382 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5f4f2d91488556166bdc004714fdf6f6
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.9 b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
index 7fb7fde43a67..63ef79b1a4fd 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e34ccc87a626ad32a574e7078c842e05
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index aeb178efb901..d151df263dc5 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f0a7256c8537cd8896f15a893d4f7793
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
index 5662aa0e2454..3382fc2fe24c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=64a9cc51fd51b815e8d71966014dc957
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 402d2631cce2..6bb0a9d704c7 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=eab333cc6f69a614495b1a4a4eaea139
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index 8d474aa83ef6..a80d626a9b38 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=08992e578bac558a1819b6052b1421a0
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index 331aef839724..3c9a159bc4c6 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9571e66c145abbe89dfc22113a77d6a7
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index 826086dd3428..95a35f89ac16 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b2537452929b04a6bd67a5307b739052
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index b2baf0e9973c..f4b613804aa1 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=afc98c5e4173e64de9682dd8e2046b1d
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index d7cd4c78d89e..1266e24a69c9 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c2fe459a05eca5eb22c32caa6d5c9108
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index 5630fc01ccb6..162c8a5b3c39 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=025960691ea0088b2d386db373a44c46
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index 07d373ebe723..ffa2419f6dc9 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
index 773784246541..06a56ccf6823 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1d13bd87f602ae7cb47269498f3e56ef
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
index a7c3cdc3a56e..6f5b795bed8b 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.10:4.10 >=dev-java/ant-core-1.7 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.10
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/ecjsrc-4.10.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=dcaf97e0850a1440b330a1efd27a1abb
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
index 50e74225cf8c..d677f64761dd 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.13:4.13 dev-java/ant-core:0 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.13
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/ecjsrc-4.13.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=e3d1538495b9fd462d9a0de748c15dd2
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 709cd51196e1..77cd96e0706a 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=61eadcb3163e3944fda9a5f1508226f8
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
index ac84305d1064..8e0aad32060a 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=b88c015ca714491a7ce8e180a62a36cc
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
index 8aa1437b8866..4f196133809e 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=42a68e63a4276ba15c73cee21a0e4704
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0
index 1cee31e7afea..352747930e65 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/commons-h
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7624e0d4156c71de0dce952881cd5e8d
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index ea6ea390dc98..39ed21425ca3 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompo
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a419215d9c92b47df08ee5d73b76aa83
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.9 b/metadata/md5-cache/dev-java/ant-jai-1.10.9
index 86dd3b0357ae..842e60e09f53 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index 902e12147457..85721c9fbd28 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=95696bd61b85b23a07f7eac32f544426
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 11ac19c120cd..0f2c2ca38653 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b76423fd0a062777430f41b4b23d842e
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index b02948e97690..30a3e98187c9 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c4fe3db8e5d90549dce972a29b652884
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index 6ed4ea42c895..a6537e69c514 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9c4d200e9c9ef8a75748a54564700257
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index 67cfdda49927..a70a9741ce8d 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=dca20742a3e7a8b82d9c2538f7d7fda3
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 24c923fbebf5..1504eb31dc56 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index 4a28cc51cb46..a3a4cf95d854 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2e8b698dd0a76f2d77ed62a329ee9334
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index 4b3f9aa4e284..d3567d0efcec 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=dfc1f020d954b249a78fe55fb1a2d3df
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index e55233bc963e..d779ce39061d 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=69983d2e7060871087ab6002b6061112
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index eefe23e158ce..3ed660aae25c 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -9,5 +9,5 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks	bf8953b38a65f5a7d92b8d2ba4efa7f4	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0e3e412509d92ffa578ce37cf810c621
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 db70062e21d3..22f563b9f14f 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7cea84226e935ddb81d4f1d650e012d1
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
index 1da2f504d11e..3828bde1432b 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=030dfc1ef28d4465566f94832b3197fb
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r2 b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
index 8b3ad9e16b8c..8fda79f127ad 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 ~dev-java/antlr-tool-3.5.2:3.5 >=dev-java/java-config-2.2.0-r3
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=848885875eb4a9f31d4c085859c93206
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.3 b/metadata/md5-cache/dev-java/antlr-3.5.3
new file mode 100644
index 000000000000..4a793ee9655c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-3.5.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A parser generator for many languages
+EAPI=8
+HOMEPAGE=https://www.antlr3.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
+SLOT=3.5
+SRC_URI=https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=c4e3209754dcadb728f1686d564f3b8b
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
index 19c4f8adb068..80e0c51d2a60 100644
--- a/metadata/md5-cache/dev-java/antlr-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 ~dev-java/antlr-tool-4.9.3:4 >=dev-java/java-config-2.2.0-r3
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5ee108df70063aee13d8c45f15de7ba9
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
index d049e46d01a2..9971e83fb6e7 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cfafecf65e1496e71c71ae4b45cc9ac3
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
new file mode 100644
index 000000000000..227529701654
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=ANTLR 3 Runtime
+EAPI=8
+HOMEPAGE=https://www.antlr3.org/
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.5
+SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=7a420da2ec9ecfc30440c6972fafefb7
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index 6f5344ed3399..2ca2a3d4d581 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.2 b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
index 6f2b36711e53..c67283df26ca 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 dev-java/stringtem
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2-sources.jar -> antlr-tool-3.5.2-sources.jar https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4c54f231e9ddf173dae022714a684e0d
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
new file mode 100644
index 000000000000..f839b07cfaee
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=The ANTLR 3 tool
+EAPI=8
+HOMEPAGE=https://www.antlr3.org/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3.5
+SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=a83806577ee801b2575b8404d03f7e17
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
index 2a0c120a3d5c..c983bbec4a24 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runti
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ee8dfd42f251eedddfefa85db193a19b
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index 9f34493b8d1d..baf8c6395bb2 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=743c9d116cc847653ea415023904e1e2
diff --git a/metadata/md5-cache/dev-java/apache-rat-core-0.13 b/metadata/md5-cache/dev-java/apache-rat-core-0.13
index 287162c28aa2..3b345234116f 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d22bad28e451f95f75c485378fececf2
diff --git a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13 b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
index 4e1b6d3804d2..a4a9023f391b 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7c5b860615c9f5b27aa0563531da9afa
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
index bc826eb8ba63..3d608172fc9c 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=@org.apiguardian.api.API Java annotation provider
 EAPI=8
 HOMEPAGE=https://github.com/apiguardian-team/apiguardian
 IUSE=doc source
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=202ab9eea33d5ec1cb50349bfad99fdc
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=d76247c95650f65c07f039dba0f75255
diff --git a/metadata/md5-cache/dev-java/asm-5.1-r1 b/metadata/md5-cache/dev-java/asm-5.1-r1
index 0d4f23378690..834d75daf112 100644
--- a/metadata/md5-cache/dev-java/asm-5.1-r1
+++ b/metadata/md5-cache/dev-java/asm-5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=4
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_5_1/asm-ASM_5_1.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=745d811e25a5d9d9425d94e7d00a3d76
diff --git a/metadata/md5-cache/dev-java/asm-9.2 b/metadata/md5-cache/dev-java/asm-9.2
index ec33152d471d..d7b77d434261 100644
--- a/metadata/md5-cache/dev-java/asm-9.2
+++ b/metadata/md5-cache/dev-java/asm-9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4c463e999ec3e798366b448f80c3bc56
diff --git a/metadata/md5-cache/dev-java/asm-analysis-9.2 b/metadata/md5-cache/dev-java/asm-analysis-9.2
index e3b990d61fc7..beca02ffbbcf 100644
--- a/metadata/md5-cache/dev-java/asm-analysis-9.2
+++ b/metadata/md5-cache/dev-java/asm-analysis-9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-tree:9 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=fe7a8408f10d39dd9c2221802762805d
diff --git a/metadata/md5-cache/dev-java/asm-commons-9.2 b/metadata/md5-cache/dev-java/asm-commons-9.2
index 28d5ebdc73b3..e81e7df80bfc 100644
--- a/metadata/md5-cache/dev-java/asm-commons-9.2
+++ b/metadata/md5-cache/dev-java/asm-commons-9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java
 RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=84167a058bc3d43afc79c5294aae4994
diff --git a/metadata/md5-cache/dev-java/asm-tree-9.2 b/metadata/md5-cache/dev-java/asm-tree-9.2
index 7dc34edba381..c156cf750c6e 100644
--- a/metadata/md5-cache/dev-java/asm-tree-9.2
+++ b/metadata/md5-cache/dev-java/asm-tree-9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cbe37d5daaa6d2b184d30aa962ff6b32
diff --git a/metadata/md5-cache/dev-java/asm-util-9.2 b/metadata/md5-cache/dev-java/asm-util-9.2
index 9db173ea489f..adca1a2f5c5a 100644
--- a/metadata/md5-cache/dev-java/asm-util-9.2
+++ b/metadata/md5-cache/dev-java/asm-util-9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java
 RESTRICT=test
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=277b4ea08d1523a6fadcdb08b6847c21
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7 b/metadata/md5-cache/dev-java/aspectj-1.9.7
index 4fdb9868a25a..664140378102 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0 b/metadata/md5-cache/dev-java/assertj-core-2.3.0
index d54f6c3319d6..38aefafc8405 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=dceefdc36e4a1e70030e7697e7490c60
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index c6ff51079021..c6b638e62bd0 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=11cd951842e84c0a7c83bc1ae6e14a1d
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
index ea40aa4abb8b..efa73f8a6f7b 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 >
 RESTRICT=!test? ( test )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a24a1c659a325216db06ccb8934a21df
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
index 91647bb5b82f..59d78a5a8290 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 dev-java/log4j-12-api:2
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5d7c65739477c8cb57c90d4bd7014ae8
diff --git a/metadata/md5-cache/dev-java/batik-1.14 b/metadata/md5-cache/dev-java/batik-1.14
index aef44a4a7b32..a4453aa38742 100644
--- a/metadata/md5-cache/dev-java/batik-1.14
+++ b/metadata/md5-cache/dev-java/batik-1.14
@@ -4,11 +4,11 @@ DESCRIPTION=XML Graphics Batik
 EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/batik/
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.14
 SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fee9a1fc386e6c9416fb6e4725f5ec3b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4ca3a17b8d6d42d0aa8b9ac84af5a82f
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
index e60ce445ee2f..c70bc6a04c4f 100644
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ b/metadata/md5-cache/dev-java/batik-1.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=1.9
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=338e256f593ff733b6548dbe496b7a81
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0 b/metadata/md5-cache/dev-java/bcel-6.5.0
index b7f03d800ec8..1237735daa99 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1b41fb3dc0aebc4198e00ba8011f3914
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0-r3 b/metadata/md5-cache/dev-java/bcel-6.5.0-r3
index f359789786fa..289310a3e02e 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0-r3
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e76cf0726e5f8a5cab751740ddbae2f3
diff --git a/metadata/md5-cache/dev-java/bcmail-1.69-r1 b/metadata/md5-cache/dev-java/bcmail-1.69-r1
index 4ac7ffe4b36f..087675030697 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.69-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.69-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8da5d2d5d95e1f5c896a299d22e38e3f
diff --git a/metadata/md5-cache/dev-java/bcpg-1.69 b/metadata/md5-cache/dev-java/bcpg-1.69
index 6f3fc8aff177..26310e12851a 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.69
+++ b/metadata/md5-cache/dev-java/bcpg-1.69
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c586bb96bc1c8ffda729116f4cd8c46c
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.69 b/metadata/md5-cache/dev-java/bcpkix-1.69
index a8e3688c6cd6..ee3f7e7501c7 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.69
+++ b/metadata/md5-cache/dev-java/bcpkix-1.69
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 >=virtual/jre-1.8:* >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=816bf43cb03d381035ea210f0abc3dc9
diff --git a/metadata/md5-cache/dev-java/bcprov-1.69 b/metadata/md5-cache/dev-java/bcprov-1.69
index ace1ca5d983c..91e92992251d 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.69
+++ b/metadata/md5-cache/dev-java/bcprov-1.69
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=814c5034775a00b7c6f98aa6733bebf7
diff --git a/metadata/md5-cache/dev-java/bcutil-1.69 b/metadata/md5-cache/dev-java/bcutil-1.69
index 8fe7d0c979a4..5c8adafdfe0f 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.69
+++ b/metadata/md5-cache/dev-java/bcutil-1.69
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1daceb77b59371772b191b981754b0e0
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
index 9d3b7a5e4b40..adb32e239199 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jre:1.8 >=dev-java/ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
index db5eb51ae652..a435ba9b4b72 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7c66aa75cfeb1d877ddbc7a33913c75a
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.8.3 b/metadata/md5-cache/dev-java/boot-bin-2.8.3
index 8363bc68f351..1256a1229da2 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.8.3
+++ b/metadata/md5-cache/dev-java/boot-bin-2.8.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.8.3/boot.jar -> boot-2.8.3.jar https://raw.githubusercontent.com/boot-clj/boot/2.8.3/README.md -> boot-2.8.3-README.md https://raw.githubusercontent.com/boot-clj/boot/2.8.3/CHANGES.md -> boot-2.8.3-CHANGES.md
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=22354732b248da37c5382ba6684b680f
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 1a6d14b816fb..0273601ef33d 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -10,5 +10,5 @@ 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5798bdfffc623c3300d063ff927ff233
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
index 366064624128..1f1a752d2b76 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cc5b8ebcc5e25045a3f12f7aa5edd9ed
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index b3d5cccde462..b354aaec9269 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c1e4a62e434ee70ae540e510b0a03b64
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r3 b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
index 00f017a9c615..77e3e939d7d9 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r3
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/commons/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=83c74484161798ef487620a329100b44
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1 b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
index 3e139434e0a3..d690b37086bc 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8 >=dev-j
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.tar.gz -> bsh-2.0b6.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c3a61360fb8c1450e51dc796bf358959
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
new file mode 100644
index 000000000000..347c378e316b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 >=dev-java/jna-5.10.0:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Byte Buddy is a Java library for creating Java classes at run time
+EAPI=8
+HOMEPAGE=https://bytebuddy.net/
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=eed9f343de99ddd49e78f04a346a5875
diff --git a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
new file mode 100644
index 000000000000..a0342707b466
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 dev-java/jna:4 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Offers convenience for attaching an agent to the local or a remote VM
+EAPI=8
+HOMEPAGE=https://bytebuddy.net/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-1.12.8.tar.gz )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=92bc1e8ac4e3b6c2b67e4862e9fa908a
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index e5bfdb6802a4..7269809b6a2e 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f30bf992da1014f795384a7c04867797
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index e253c682f5da..3d1438e0466f 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=java library for writing localized messages using resource bundle
 EAPI=8
 HOMEPAGE=http://cal10n.qos.ch/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 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://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=c6c9bf8ba15b3c20c32e95b57d49b7d7
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
index d2fcade6090a..55b6beda1fcb 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-c
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ce17e92c57e18188a5d7ac54ab915579
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
index e5901bfc0f9e..f3989a8d0f6e 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
index b89ab60f06c0..3b960d9a9d92 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b818ee63d0978430ab19080ede8dc626
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.4 b/metadata/md5-cache/dev-java/commons-cli-1.4
index 21143958be92..7372b5631c55 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.4
+++ b/metadata/md5-cache/dev-java/commons-cli-1.4
@@ -10,5 +10,5 @@ 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.4-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=747c6f20b31bfd0dce15029505d9f123
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15 b/metadata/md5-cache/dev-java/commons-codec-1.15
index a8e6d6aabffd..175fafd20bcb 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a47a1adf4794c5c18b4a5c6a76cd6e2f
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2 b/metadata/md5-cache/dev-java/commons-collections-3.2.2
index 83fead7b1a08..3eadcb7e09e9 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.2-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f48a8926e7069cc3e5324144276913fe
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4 b/metadata/md5-cache/dev-java/commons-collections-4.4
index 15101875c984..d5cd2c01d152 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6b544a7a39e6ff6b3bf2d08b896e9eda
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21 b/metadata/md5-cache/dev-java/commons-compress-1.21
index e342ee8efc37..a8dca13db243 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-java/xz-java-1.9:0 >=dev-java/zstd-jni-1.5.0.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz -> commons-compress-1.21-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cdfe827a2af525dbeea2496338680049
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index 719626c25118..df7d33067a1b 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.2.4 b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
index 8ca0be238d15..27c849884aa3 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.2.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4f2372c98f63944ca12050021f50323c
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index 92c2f2345ce6..ec86b2444e79 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b7bb8f3b2a878f1cb6fe638237ebedbf
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 652696b239eb..959ad28ec2ea 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-ja
 RESTRICT=test !test? ( test )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
index 47c383d70aab..f32f00a19409 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1 b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
index b43f77157efb..f0e33f359ce8 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=0b16d0c37c6db7936e06532fcecc8729
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
index 805f2016cbc2..e2c04f957618 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=56c127c95cb5d5d1dabb2a4f10e036b1
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0 b/metadata/md5-cache/dev-java/commons-io-2.11.0
index 01e1a2c6274d..56f379c0a15b 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9579ab0e9bdfaffa3a66570fc1fb1fbb
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
index 8c7601b44c07..82799c24555e 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/jdom:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f716d2054196f344d86d0761b2f0f844
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r2 b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
index 450507d6f947..5bb56fd4744b 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=af75f2cd4bd2717eb350f17cf86f845a
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index 73b7d24c0b1d..a5302145c316 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8c91cc1d0458203f6d62f3d899d2c212
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r5 b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
index 58e1dc7156c3..1e5ae7cb8c27 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r5
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( avalon-framework avalon-logkit log4j servletapi )
 RESTRICT=!test? ( test ) !servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=43416132fd6c4efd7cf735c6b5aacef9
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
index bd46f6a277d9..2c37a120e997 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar -> commons-math3-3.6.1.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f60b2dc1c2fb0ffa9d56ed8f45448ee1
diff --git a/metadata/md5-cache/dev-java/commons-net-3.8.0 b/metadata/md5-cache/dev-java/commons-net-3.8.0
index 8d4ed8aed94c..ae9460ae3a54 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.8.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/commons-net/commons-net/3.8.0/commons-net-3.8.0-sources.jar -> commons-net-3.8.0.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a03e165ef4bd12b97d0e7520eb7bf586
diff --git a/metadata/md5-cache/dev-java/commons-text-1.9 b/metadata/md5-cache/dev-java/commons-text-1.9
index ba892b16c95c..57a83c3ff36e 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ b/metadata/md5-cache/dev-java/commons-text-1.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7bf149e50a545940e82cce31351cbf86
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.7 b/metadata/md5-cache/dev-java/commons-validator-1.7
index 00a22d8036a4..fcebad43ba04 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.7-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=77e3c85c5463e21f4a84ecf440783bc6
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index 3f43e4540910..ce0c46ccae3a 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7fe2e1d80a50330b345a7433034ced4f
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19
index 821ca6143f6b..01a7f9e080da 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conversant/disruptor/archive/1.2.19.tar.gz -> conversant-disruptor-1.2.19.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8c86652a19f7e1d3a012baa6933d6ea7
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24 b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
index 5db0abcc647b..891b1c00c7e1 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.1
 SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.1.24.tar.gz -> core-specs-alpha-0.1.24.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=caaacacbbf986bb968c3b93a81de48f0
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
index 38f991ba23ea..658f6613e38f 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.2
 SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.44.tar.gz -> core-specs-alpha-0.2.44.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=02d6dbc3aef805e1178e36211fd03409
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
index b5dbbdd494bb..01aa56a937a5 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.2
 SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.56.tar.gz -> core-specs-alpha-0.2.56.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=faa81bdb522e13991a71394907889ff5
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index f719780c1187..563ab7eac264 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
index 8b9ad146ca7c..f0f485535a63 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index 2e73eaf21ecf..cea18b638f77 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 ja
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6b7b54ce52fe6dc61ec15e131c7cb961
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index 8880ef15b3a8..6d3d5fb911c9 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=bf8d9bf8607b14707e1b9927446c145c
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.10 b/metadata/md5-cache/dev-java/eclipse-ecj-4.10
index 7ea57ba0543b..6b70610c5aeb 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.10
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.10
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.10 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.10
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/ecjsrc-4.10.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e4b04355fcf5790c547e86b927908ad5
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2 b/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2
index d57bac422a1f..7cdcc88b563e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.13 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.13
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/ecjsrc-4.13.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8c9f5d7e56c84da1409f02cc68906e2b
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index 8bf028e9a8e2..7b4aafef7dec 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.15 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=36d324a818e8e954208dd40f46dd9053
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
index d66098bd23f1..887e2ba629d8 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c2b4d868f6518ff728355ffa6c0a1540
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
index beb1ec712a47..d467cd759c23 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.5.1 )
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=51b052d6d74153f2dccb029a59c90883
diff --git a/metadata/md5-cache/dev-java/eclipsito-20180510 b/metadata/md5-cache/dev-java/eclipsito-20180510
index 605461b12be3..daeacdd46dc4 100644
--- a/metadata/md5-cache/dev-java/eclipsito-20180510
+++ b/metadata/md5-cache/dev-java/eclipsito-20180510
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bardsoftware/eclipsito/archive/0eb2fbb739898f55265027c2796f77fbee9f4ab2.tar.gz -> eclipsito-20180510.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	vcs-snapshot	19dc666868420457132a7514d4621476	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	vcs-snapshot	19dc666868420457132a7514d4621476	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=17b85274f8a61d31c90032cfa735431b
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.4.0 b/metadata/md5-cache/dev-java/edtftpj-2.4.0
deleted file mode 100644
index fe3dbc0e3b7e..000000000000
--- a/metadata/md5-cache/dev-java/edtftpj-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 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
-DESCRIPTION=FTP client library written in Java
-EAPI=5
-HOMEPAGE=https://enterprisedt.com/products/edtftpnet
-IUSE=examples doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.4.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8eb3cbbf462ada706d084ad2e15383c9
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r4 b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
index 9ef0053cb143..0e1df75a610b 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c4267c86a013dd64bbab4bb5874832e5
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
index df98e14838ad..9e33e7d917a2 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/google/error-prone/tar.gz/v2.7.1 -> error-prone-2.7.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=0cca748e4ff975067e06bc5596d4962a
diff --git a/metadata/md5-cache/dev-java/failureaccess-30.1.1 b/metadata/md5-cache/dev-java/failureaccess-30.1.1
index e9b5349225d1..e89b56335273 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d6db1f05beb39924e4e2962ca8ff6226
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index b64519e03629..3e19b5c38a21 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f9885d800843cc7528dd1d9ea6b274c4
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
new file mode 100644
index 000000000000..dac9dd434886
--- /dev/null
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Annotation defined by the FindBugs tool
+EAPI=8
+HOMEPAGE=http://findbugs.sourceforge.net/
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=b244a3d5622c61a6b6479b912153d5a9
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1-r1 b/metadata/md5-cache/dev-java/fontbox-1.7.1-r1
index f530a3361a31..28de19887640 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1-r1
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a8b7ac03bdb4d6da39957d4676484953
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1-r2 b/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
index 4d044fbb5560..ad610a396c3e 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=86a6fb781b6380f5cc34cf17f1321b4c
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.24 b/metadata/md5-cache/dev-java/fontbox-2.0.24
index 054ceec8e574..28c107f16823 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.24
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.24
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e26898c9a485d82259b3f6936a3d1302
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r3 b/metadata/md5-cache/dev-java/fop-2.0-r3
index b2d3bae2af8a..c39e8bfc3df5 100644
--- a/metadata/md5-cache/dev-java/fop-2.0-r3
+++ b/metadata/md5-cache/dev-java/fop-2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4d301c13a39302d4307da4bd25cd2837
diff --git a/metadata/md5-cache/dev-java/fop-2.7 b/metadata/md5-cache/dev-java/fop-2.7
index cb166a93f31c..600371d876ca 100644
--- a/metadata/md5-cache/dev-java/fop-2.7
+++ b/metadata/md5-cache/dev-java/fop-2.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/sun-jai-bin:0 test? ( dev-java/mockito:0 dev-java/pdfbox:0 dev-java/xmlunit:1 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/sun-jai-bin:0 test? ( dev-java/mockito:4 dev-java/pdfbox:0 dev-java/xmlunit:1 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=XML Graphics Format Object Processor All-In-One
 EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/fop/
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.7
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.7-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=944d7fa6d7760e37265973203cb53365
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=b85a8bc75bbcca54ddb6daefd37eaf4b
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
index 0a24f41ed82a..2e2675e7931f 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1cf26d6ffbea1cb6752b5ae75e522ec5
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.2.2 b/metadata/md5-cache/dev-java/freehep-io-2.2.2
index 6329fc6b6f8b..97c03c3157fa 100644
--- a/metadata/md5-cache/dev-java/freehep-io-2.2.2
+++ b/metadata/md5-cache/dev-java/freehep-io-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-io/archive/freehep-io-2.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=23af37d098ba8f89cc67ee2fed568c04
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2 b/metadata/md5-cache/dev-java/gin-2.1.2
index cf984032bc98..1a3e52b92a93 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2
+++ b/metadata/md5-cache/dev-java/gin-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java
 RESTRICT=mirror
 SLOT=2.1
 SRC_URI=https://github.com/gwtplus/google-gin/archive/d62089f5b6ea33d842ab4646b51583c65a8be36b.zip -> google-gin-2.1.2.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cb4c774e700033e5f5a86367ecb88e4d
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index a2b0521ee9c5..86b55c9dbb28 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a2a5d2853eec8cc4ae3eefd2915f6c16
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
index 01511a773332..945029c062e5 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
@@ -10,5 +10,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ae4289dbfdafd987ff83f65dd1e42013
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
index 3d0d51088c1d..0396a3e61517 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2eda64ba01f7d0e0fdbb0489beb321e9
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
index 7c8971863d7c..d6cac8f5e738 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-xml-soap-api:1 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=95ebc9c82e02ba2749c8d790909f4bf2
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
index ac29c02b1a69..aff3de1da510 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
@@ -10,5 +10,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip -> glazedlists-1.8.0.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=343c91daad959937d1630fb1d26312fb
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
index 31cf1233b6aa..8265f7f3873c 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dss
 REQUIRED_USE=doc? ( gjdoc )
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fa64c51164cfb4ccf6304f23bfe05222
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
index 356eed800627..872f265cd05d 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=eee91dede46a31f086a61cc990784b8a
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index 4f213a76abdd..56bb9264a6d1 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-6.8.3 b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
index 83eeb0caf7af..82b0fa75e2fd 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-6.8.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.8.3
 SRC_URI=https://services.gradle.org/distributions/gradle-6.8.3-all.zip -> gradle-bin-6.8.3.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.1.1 b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
index 3c41eed61828..255268ae2517 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.1.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.1.1
 SRC_URI=https://services.gradle.org/distributions/gradle-7.1.1-all.zip -> gradle-bin-7.1.1.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.2 b/metadata/md5-cache/dev-java/gradle-bin-7.2
index c4cae3268ed1..4738e2083e38 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.2
 SRC_URI=https://services.gradle.org/distributions/gradle-7.2-all.zip -> gradle-bin-7.2.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.3.3 b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
index e86382425d2e..e08df97a9b28 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.3.3
 SRC_URI=https://services.gradle.org/distributions/gradle-7.3.3-all.zip -> gradle-bin-7.3.3.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4 b/metadata/md5-cache/dev-java/gradle-bin-7.4
index fef4fe1ac8b4..cae76689b9ed 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.4
 SRC_URI=https://services.gradle.org/distributions/gradle-7.4-all.zip -> gradle-bin-7.4.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4.1 b/metadata/md5-cache/dev-java/gradle-bin-7.4.1
index 35823eabfddb..db7f4ec0aa9a 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.4.1
 SRC_URI=https://services.gradle.org/distributions/gradle-7.4.1-all.zip -> gradle-bin-7.4.1.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4.2 b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
index 172555ca6209..aa98e0c74a0a 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=7.4.2
 SRC_URI=https://services.gradle.org/distributions/gradle-7.4.2-all.zip -> gradle-bin-7.4.2.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=0f343b25f25d6b6757e38b8441640127
diff --git a/metadata/md5-cache/dev-java/gson-2.8.8 b/metadata/md5-cache/dev-java/gson-2.8.8
index 290ccf367e79..10ffdf92ecef 100644
--- a/metadata/md5-cache/dev-java/gson-2.8.8
+++ b/metadata/md5-cache/dev-java/gson-2.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.8.8.tar.gz -> gson-2.8.8-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f4c59c41da9ccfd2f644e9ea8c3fbc35
diff --git a/metadata/md5-cache/dev-java/guava-20.0 b/metadata/md5-cache/dev-java/guava-20.0
index fdb171ca9bc5..dfbd99ccd398 100644
--- a/metadata/md5-cache/dev-java/guava-20.0
+++ b/metadata/md5-cache/dev-java/guava-20.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=20
 SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=391d2b39d3a12d33093dc537d06d650d
diff --git a/metadata/md5-cache/dev-java/guava-20.0-r1 b/metadata/md5-cache/dev-java/guava-20.0-r1
index 581ede6e2325..1b965a968928 100644
--- a/metadata/md5-cache/dev-java/guava-20.0-r1
+++ b/metadata/md5-cache/dev-java/guava-20.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=20
 SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3b58e40e9fa94e6fa9515a3610de1e37
diff --git a/metadata/md5-cache/dev-java/guava-30.1.1 b/metadata/md5-cache/dev-java/guava-30.1.1
index f63ec64495b0..4f8004175360 100644
--- a/metadata/md5-cache/dev-java/guava-30.1.1
+++ b/metadata/md5-cache/dev-java/guava-30.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/error-prone-annotations-2.7.1:0 >=dev-java/failureaccess-30.1.1:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/google/guava/tar.gz/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b7a8182279a430660d9c84a74b18d222
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index 831272033c0d..ae30180e9b4e 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/c
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=83230809b4ca25805d1a3df808bbaa39
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0 b/metadata/md5-cache/dev-java/gwt-2.9.0
deleted file mode 100644
index 447e4f5acd5b..000000000000
--- a/metadata/md5-cache/dev-java/gwt-2.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/json:0 dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.5 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Google Web Toolkit library
-EAPI=7
-HOMEPAGE=http://www.gwtproject.org/
-IUSE=source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/json:0 dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.5 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=mirror test
-SLOT=2.8
-SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ba288ca62a101ab2a9bca11368da0bef
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r2 b/metadata/md5-cache/dev-java/gwt-2.9.0-r2
new file mode 100644
index 000000000000..52fff865add0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Google Web Toolkit library
+EAPI=7
+HOMEPAGE=http://www.gwtproject.org/
+IUSE=source
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=mirror test
+SLOT=2.8
+SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7ea26f99294ce414392ab83cdced6a3f
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index d901b677eac1..b047c64d6b87 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c96e71e59280258000276957223b2507
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
index 1b80802fbe32..404751da6733 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ad5192a4602f7d68f7ed522e0a1e789a
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
index 07fc7d879297..2a12575cbfb4 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=1.3
 SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=11cb0796cc8389e450d3ab15612a7391
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
index 1b05f663c7da..88824df9b963 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=54d513ed5a773b1b34c91813b56e998f
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
index 2451b8c0a2e4..53d1f054f6c9 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.15.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=57b6855aa7eb537491fab8bf1a485409
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
deleted file mode 100644
index 50cc93b76031..000000000000
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A small library for managing sets of JVM properties
-EAPI=5
-HOMEPAGE=https://github.com/headius/options
-IUSE=doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-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=0
-SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=869aca10db0a8d6519dbd1ac2d8c1da8
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.25 b/metadata/md5-cache/dev-java/htmlcleaner-2.25
index f74041f52695..23e7c8a3433c 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.25
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.25
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.25-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3985eacac36e2ec1a395a39c03b79127
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
index 5ce09a91b0fa..5b5efeb76a8c 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=bb83a3c6a052302645f9eefbde882a6d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 6f6872bd3244..91cca0d5db28 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=98ecdd55b66865a821b1bdfbd1cd4777
diff --git a/metadata/md5-cache/dev-java/icedtea-3.21.0 b/metadata/md5-cache/dev-java/icedtea-3.21.0
index 1c819de62ee0..2424ecab9398 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/openjdk.tar.xz -> icedtea-3.21-openjdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/corba.tar.xz -> icedtea-3.21-corba-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxp.tar.xz -> icedtea-3.21-jaxp-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxws.tar.xz -> icedtea-3.21-jaxws-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jdk.tar.xz -> icedtea-3.21-jdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/hotspot.tar.xz -> icedtea-3.21-hotspot-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/nashorn.tar.xz -> icedtea-3.21-nashorn-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/langtools.tar.xz -> icedtea-3.21-langtools-3.21.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/shenandoah.tar.xz -> icedtea-3.21-shenandoah-3.21.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/aarch32.tar.xz -> icedtea-3.21-aarch32-3.21.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b80119a1990d211bd58f3cba3241bd88
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 72e027ff140c..49655322880b 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=342d98dfbcfc03254c37b49d58392daa
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
index 485d75195e7f..5dc708a8327d 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Plugins for javax.sound
 EAPI=8
 HOMEPAGE=https://icedtea.classpath.org
 IUSE=+doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=994a2a48b6b5c961bddb0a9e8ccda750
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=1085dee96f9a36deb600bb00b1b1f026
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
index 77691ad2ecd4..4c1d919b8281 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
+BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=7
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.4.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools	ed3ef2014ee93d24bde80f0c0ea9732e	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6d20088db7fbdf10b73369a50581fccd
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8
index 067d5e6d6011..a1fbb2c1786f 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
+BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=FOSS Java browser plugin and Web Start implementation
 EAPI=7
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools	ed3ef2014ee93d24bde80f0c0ea9732e	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=81abe6989c9fd372690fa45f86649407
diff --git a/metadata/md5-cache/dev-java/icu4j-70.1 b/metadata/md5-cache/dev-java/icu4j-70.1
index 2d727254796b..c9b2771b3765 100644
--- a/metadata/md5-cache/dev-java/icu4j-70.1
+++ b/metadata/md5-cache/dev-java/icu4j-70.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=70
 SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz -> icu4j-70.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=30ffbee0546649e832d767b5b0e6cd76
diff --git a/metadata/md5-cache/dev-java/icu4j-71.1 b/metadata/md5-cache/dev-java/icu4j-71.1
new file mode 100644
index 000000000000..93978f622abf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icu4j-71.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junitparams:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
+EAPI=8
+HOMEPAGE=https://icu.unicode.org
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=icu
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=70
+SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-71-1.tar.gz -> icu4j-71.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=6c0ed3995d0039c6a049b9db0acb1aca
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
index 5a90d05fcd01..4293750dc035 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.6
+++ b/metadata/md5-cache/dev-java/invokebinder-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7adf737eb0720dc8b5f7fc6517a3d30c
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index 7938a064fbbe..1d521f5cb40e 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a84f38d6a933e9fd22f734b3820885cc
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1 b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
index c07fbaf489e9..534403914b02 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/1.2.tar.gz -> j2objc-1.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=01350264add1cdca6196b90b3470300b
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index fb2dd80f4fbf..29e9bead9b99 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4a06ce48615df7a1aed5c5bf2ee1577c
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
index f77fdd289d0d..6e7b02a7fdf6 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5808f285a2b6a5c3da1c51fdd999c92b
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
index c916f478b325..e0879350ddd0 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annot
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/jackrabbit/2.21.7/jackrabbit-2.21.7-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=65c70f65cb8c9421c6090410aea25e7a
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.0 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
index ee37c113187b..3d6ae77347bb 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/refs/tags/jackson-annotations-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2551ec34e46939d833894ebbf9ec405a
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
index 0ed6022a4e9c..e0fb4292a3f6 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6ee42260d895bf3e20e3d70a8224fac8
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.0 b/metadata/md5-cache/dev-java/jackson-core-2.13.0
index ee40ebf0060b..9dfd7898d7b4 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=dd54c67639beb0ffe9c08ddb24d00c88
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.2 b/metadata/md5-cache/dev-java/jackson-core-2.13.2
index 37f1ffab1cf3..42d6c43a8a63 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d7d3dc2a74052414aeb810228b59cb4d
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.0 b/metadata/md5-cache/dev-java/jackson-databind-2.13.0
index bf57c09007bf..995984b41cf5 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 dev-java/jackson-core:0 >=virtua
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/refs/tags/jackson-databind-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=980e2bd2778e782a9b511c654e34a21e
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.2 b/metadata/md5-cache/dev-java/jackson-databind-2.13.2
index 7ba43a6a6c0a..80fe599dcced 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jac
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=dc6f68a8a8cde874a0ec168ac9d2af2a
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
index f611c6fd35df..51904177cb79 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 >=dev-java/jackson-core-2.13.0:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7cc1f729ea314d91abd7184b3358494d
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
index 49890d2274b3..cf28f0496bbe 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=26a2d436fb5c36377057dd99cb125851
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
index 720832940623..ce34191c0644 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/snakeyaml:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-2.13.0.tar.gz -> jackson-dataformat-yaml-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=50fae41682e4cd7316581c0ee845c0e5
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
index 1ad4409c9c78..a7a68d0ce74a 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-da
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=df4719c5df9f533e1712fd11037a8a76
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
index 03d017357c40..e0560ae843a9 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jackson-annotations:2 dev-java/jackson-core:0 dev-java/jackson-
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-2.13.0.tar.gz -> jackson-module-jakarta-xmlbind-2.13.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=757d3bb6596965e60ab025aede70d98b
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
index 3063fe434911..547f0ccb304f 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jac
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz -> jackson-module-jakarta-xmlbind-2.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1abcde9a606f78f3a8d6c2af44f0888c
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r1 b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
deleted file mode 100644
index 3e6a33d3e499..000000000000
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jacl is an implementation of Tcl written in Java
-EAPI=5
-HOMEPAGE=http://tcljava.sourceforge.net
-IUSE=doc doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1797ae099c5bce7e9ffcf803859d65fb
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index 228d3b0645b2..3714bd9dbc2c 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Jacl is an implementation of Tcl written in Java
 EAPI=8
 HOMEPAGE=http://tcljava.sourceforge.net
 IUSE=doc doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=bbd2858b6558b851f985b007f9ac5f04
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=2b2f769227fc69a612651c02ccdd38b5
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index 8a6f2ef88446..95780e7c8dc8 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=74ad4bab14571030a910e71cd2e89864
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index f958af32e075..9081ea106cd3 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b3ab374e62458f2b7465a8bc15c11a2c
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2
index b5a40014e97b..21418cab3646 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=acfe408cd3a1ae1c1cc23d04bdb4ddc7
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
index 772ec17aedeb..82eb3c1f8bd1 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7f0e440412a7e71b24a67d2a1355bcd1
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2
index e6f9ad29b99f..763fc521c6f7 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1ca3fc94c23d584f8a654743ebb60c80
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
index 632aaeb677ae..019406e28036 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1999852c19527c7c6b18bf571ff77042
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
index de364ef1812e..c58c3d9cfcfc 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6c329892ea7e59d87209e53bb82d0310
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index a9c8b8364f03..21de50773a33 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3ae2e6df0f95075b5e750e7dae925af4
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
index 162e602d9d34..ce06f371601a 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f9265de0a00a4138a0cc591a28cbf1af
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index 4a9067fca290..16ee69cb91d4 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4715ec34bfa34c1bcc3f2b1d512e12e1
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
index 9e830cb44726..a23a4969f471 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.5
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=609d1f6ec6890acda208be367de1eb86
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2
index 83a669d76147..5fbb41f1c818 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for J
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxws
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=ec5dbc96c7d63344789ddd57712f60a0
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=8643b5ce946c9dec19663881bb60c2de
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
index 9e98aa7d1f7b..47bf8831d559 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz -> jakartaee-migration-1.0.0-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4f6cec3ec86c9e19c57456e02da5f39b
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index c88ba86d9426..d070df92802b 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c8457e8bbe91555b895391aab6235604
diff --git a/metadata/md5-cache/dev-java/janino-3.1.6 b/metadata/md5-cache/dev-java/janino-3.1.6
new file mode 100644
index 000000000000..417c66c28855
--- /dev/null
+++ b/metadata/md5-cache/dev-java/janino-3.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=An embedded compiler for run-time compilation purposes
+EAPI=8
+HOMEPAGE=https://janino-compiler.github.io/janino/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 -> janino-3.1.6.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=fd82d000c17fe8add801416380429684
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 3405a1a18551..de890a95c122 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ee1233c04a41ea2639d3127438b6cc82
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 7ceb8311cdb2..0023f056fb6e 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2105da837123b0bf282c3320f9f7c173
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index 50d2bb8d7260..54889950026e 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	vcs-snapshot	19dc666868420457132a7514d4621476
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	vcs-snapshot	19dc666868420457132a7514d4621476
 _md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r4 b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
index 8de432c3089d..dbb30c0dcaae 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r4
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-conf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=afe0177420d765fbe9b51a633b0905fe
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 87efa6c0a12b..f843617bc0aa 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1	e91901adfcf0640d2daa4dc863ff5377	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=de36897f44274d07eb58415aed512517
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 926a5247c6c8..4f50213988da 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=distutils-r1	e91901adfcf0640d2daa4dc863ff5377	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=693418d0d3741cb4a5cd4e3af0c754db
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5 b/metadata/md5-cache/dev-java/java-dep-check-0.5
index a74060a13ee3..a451f65ecaf8 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f1e7c2d211ebef2a07d44c9226e5a9e8
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index 9333a49ef65d..12a08f3e02d7 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=0aa373505a7ef0316bae90d4cb8b4da0
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
index f2e889768111..0a4063483928 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=243688f4d6836bad80c47beebe1f6f2f
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
index dfeb1e584d5e..d42c7505975c 100644
--- 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
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!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	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d0aeb80cc4cce8db41bbe12cbbc97a9b
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index 307e63942fd1..f075a9bea4d4 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=264abd75d63f97cc128ab86ab0d73c6c
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 2dc90f590994..4b8012546015 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d84a4f7636f2081fa5935784e0ab9f54
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
index 77f99eecbaf5..b8202bbdf1ef 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7db8c9ec7af032d38c794c75fb195ff4
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2-r1 b/metadata/md5-cache/dev-java/javassist-3.18.2-r1
index c0203298ecb8..34521cfae88b 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2-r1
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d7ce84a722c49ab46f6496ba55de58ff
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index 3db36b902d5d..4ba49d27bfe1 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
-_eclasses_=distutils-r1	e91901adfcf0640d2daa4dc863ff5377	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=977e58e26a42f43779fa46207e038d56
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index 67d3fbb75a16..3b7ac3990d55 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=65390d955ab9d7d019e9ca0305497eb4
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7 b/metadata/md5-cache/dev-java/javax-mail-1.6.7
index 9fd33b524025..0205326bd6cd 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=20ad40d9565ec43093111b31e7af7429
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3
index 1ce7c4d90904..1370c93aef43 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-co
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c1b0ecf02838fc055b60677a23db06e8
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
index 835725f8fb32..9b4599e4d062 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=aebe6e2b7893c07ad3386163ff6bbb1d
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2 b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
index f44b6cfd64a9..23707defc864 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=57d9894267cb7ae7b25eb008838fda23
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1 b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
index 927fb72e83ab..87bd46daf7a5 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( dom4j jdom xom )
 RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=40233440ad9fc6c27b7884eb9f32577c
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 8fffb283fe52..6d71d17bc064 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=810b9388968a1104bd8f66775a3663de
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
index bc5ce51e89ad..f28682c95766 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9528d6aa625292071820e4d473eceb20
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index 6c7526b73c2d..ad1faf131ad0 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
index 42cbf9dad98d..575f272f9045 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jboss-modules:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=db18a89273bc822857535704c730097f
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
index 63d47e00068b..4a490bbb9104 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-river-1.3.0.CR9-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=07ace6e1c91f5d4860d5fc9f52bc43c8
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
index 1ffc3eac56ca..367c84218464 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-serial-1.3.0.CR9-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0574fb7d6eb3073d5939fd8c43d40db8
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
index 42edf0f3cc3f..dc16346796f1 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=464b16ed641d1a1dc99e77febba64fd3
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index 326dd87257ac..87be89bd837b 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index f43431dc80f4..a5e448624084 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8ee1afeba3f37c7129584659dbe505fb
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
index ad21bb5d0b37..20b55427d01a 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f0e312c2ab9d25d016eacd88a6b13b99
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
index 46b274de4acb..911817ca2185 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=78785c64a3c1068823508bd3117b2dcf
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1 b/metadata/md5-cache/dev-java/jclasslib-3.1
index 357c2b456826..9f8ae0301d7c 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-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/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9c0671bb61bc02e0f2416bb1564c37e2
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index 8cd81826dd2a..ba81c899208a 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fa24853d432a3dec99eec1f8d4063df2
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48-r1 b/metadata/md5-cache/dev-java/jcommander-1.48-r1
index ed6705751138..7a91cb7c9644 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48-r1
+++ b/metadata/md5-cache/dev-java/jcommander-1.48-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2721681d21b37179599dbee1935c0d82
diff --git a/metadata/md5-cache/dev-java/jctools-core-2.0.2 b/metadata/md5-cache/dev-java/jctools-core-2.0.2
index 87726ec14e30..7773309f9897 100644
--- a/metadata/md5-cache/dev-java/jctools-core-2.0.2
+++ b/metadata/md5-cache/dev-java/jctools-core-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JCTools/JCTools/archive/v2.0.2.tar.gz -> jctools-core-2.0.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c7a5338e2727cef828458d6f2a6f0f9a
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
index b28190f02a18..0b433226571a 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=4.2
 SRC_URI=https://github.com/Microsoft/mssql-jdbc/releases/download/v6.2.2/mssql-jdbc-6.2.2.jre8.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=60d23fe0793e1b886f4272e2b4fae806
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26 b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
index 2e3f71f765c4..977dfae458fc 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=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/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e77b7ef9974dc977efe71afc9322d6fb
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
index 9e0bbd22ef9d..2809235db7f8 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6f4b6dc80f28d8073c0562723c667463
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 0897547f1876..92b0e14e082a 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/clarkware/jdepend/archive/refs/tags/2.10.tar.gz -> jdepend-2.10.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c37d437ac9e15bc146c5c4121ee25b7f
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index bb54ee2d2fa4..bf3e9d1feb9e 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r5 b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
index 041c330fbfba..d90f5640a25c 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r5
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=virtual/jre-1
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cdba899512bbb81b2bad833fe49a41ae
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1 b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
index ddb8506f6817..d173b7a24c54 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=21159a2c08ba683736340c4837d890b4
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index 965c85de1865..f530b11c807d 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9-r1 b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
index e50450aa188d..b9f820e6d755 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libffi:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1b346ef078509f32a134a9e810fa5bba
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.6 b/metadata/md5-cache/dev-java/jffi-1.3.6
index 748bcc507b7b..a67133cd183f 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.6
+++ b/metadata/md5-cache/dev-java/jffi-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=0451cde6ee3ccf7dabf97d64848a5a35
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index 68091a4c52a5..d2ebf9c5055c 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=479edb30c65ebe69783faaf5f7ffa02e
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
index 8445d872eed7..4dfd48e9f08a 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index 21a88cb5d274..dae205ef8b22 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d52a14c07ec78008e65c2d3c455d6c4a
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
index 837d2955902f..80e61e3e5c96 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -10,5 +10,5 @@ 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
index eb53f34a34be..33d0c4777947 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jgraph-5.12.0.4.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=73d1f454e456a915170fbb915caf2a52
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12 b/metadata/md5-cache/dev-java/jide-oss-3.7.12
index 2e1f56a2e80d..abdcae5a491a 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index fa9285f5b689..95373c2751c0 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/
 RESTRICT=!test? ( test ) test
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.21 b/metadata/md5-cache/dev-java/jmh-core-1.21
index e44cd68244ea..29bd57a85012 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.21
+++ b/metadata/md5-cache/dev-java/jmh-core-1.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3 dev-java/jopt-simple:4.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://hg.openjdk.java.net/code-tools/jmh/archive/f25ae8584db1.tar.gz -> jmh-core-1.21.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=dbcfe39b741e515cd3e32193254548ad
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index 4f8f4e6482d0..c16711f12756 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=aff79e108dae2fe4b9e30b2acf617385
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1-r1 b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
index 4b02bab6d7b4..b64b1cf037e7 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1-r1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2829f7a8add333ca99df12006b171866
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r3 b/metadata/md5-cache/dev-java/jna-4.2.2-r3
index 27541e5eac53..d097bcbd37b5 100644
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r3
+++ b/metadata/md5-cache/dev-java/jna-4.2.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( awt nio-buffers )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0c8e4c84e9168c9e775b74022adacdeb
diff --git a/metadata/md5-cache/dev-java/jna-5.10.0 b/metadata/md5-cache/dev-java/jna-5.10.0
index b0a4e989736d..d3f31a705534 100644
--- a/metadata/md5-cache/dev-java/jna-5.10.0
+++ b/metadata/md5-cache/dev-java/jna-5.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/refs/tags/5.10.0.tar.gz -> jna-5.10.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=150594df3137d60f17034b40994d1f82
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 260f0d6ea110..5fb4fee7fbb8 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index e9d12940b0f4..587a868e54f0 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=21d1d2285c1a7dad57430c8bbadb4c0a
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.3 b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
index aff471a06d81..0d12ca07da5a 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz -> jnr-constants-0.10.3-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6bc0cca0013ff6c3cddddfb28b1557ea
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
index 852415d11bd6..548ac90c320b 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/jffi-1.2.9:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtua
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4c37f28ee86cbec4b10031e9e326c951
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
index b96eedd87720..0f3635a33f72 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 dev-java/asm-analysis:9 dev-java/asm-commons:9 dev-java/asm-tree:9 dev-java/asm-util:9 >=dev-java/jffi-1.3.6:1.2 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/jffi-1.3.6:1.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz -> jnr-ffi-2.2.8-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ffc9c7e67b1fc3d4bf0e7654a4e5c84d
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
index 6991ed51e48c..560b0585ee53 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=31f22860ea4a9c15d396360eda1d00b6
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
index d26c2871f521..790f925a1f0d 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=eb871d92ac3fb94b076964bba70590ab
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index 9faac8803e67..65ed010189b7 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=39e0820ac165bd3223bf2966ddddad04
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
index 7d5db25d36f2..f05e0e99133e 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=90f25a6747bfcdf02a0ebd8f6afea1f6
diff --git a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1 b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
index dab25c43be34..4a006e3a6fcb 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
+++ b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz -> joda-time-2.10.10.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8878189767bee19642f925560bd8f439
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16 b/metadata/md5-cache/dev-java/jol-core-0.16
index d4cc34eb50bc..6582ee99cdbe 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16
+++ b/metadata/md5-cache/dev-java/jol-core-0.16
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jol/archive/refs/tags/0.16.tar.gz -> jol-0.16.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f1293deef1eb2b45257a37d77a13a82b
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1 b/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
index 06300e777b5e..f6380794e975 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.6
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-4.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cb1cf225df2f3ad0086821dc8845f118
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0 b/metadata/md5-cache/dev-java/jopt-simple-5.0
index e0b3bebbcd5d..1e08ec5101a6 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-5.0 -> jopt-simple-5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=59b242f2fe6dd28649c847d5ac0a7f99
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
index 62400ff9a93d..2608361896a1 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
@@ -10,5 +10,5 @@ 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/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=57600635174ab6ee787537966877caac
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index cc2e6a57ee55..5b4e3dbb9f05 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ef886b35ec6ae27db2d90257dd6287d9
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index a44d4167effc..5b86a6043af1 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3c67018e37f64ad1b88f0747698b03d1
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index 9f51d7b8b133..26c931acff4e 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
index dde9836194bb..556ac32af1f8 100644
--- a/metadata/md5-cache/dev-java/json-20150729
+++ b/metadata/md5-cache/dev-java/json-20150729
@@ -9,5 +9,5 @@ LICENSE=JSON
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip -> json-20150729.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5850af41f8607d08a3d6e93e20b776ad
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index 991c4f5cdc0a..4c6ffa2d73f0 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -9,5 +9,5 @@ LICENSE=JSON
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=adc7be8873ce45780dc769f01597f481
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1-r2 b/metadata/md5-cache/dev-java/json-simple-1.1-r2
index f98fab2b74b8..012ff0fcb52e 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1-r2
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=582d7ea68716f01a3bafa1082f0145c6
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
index a59188441d62..d03f9c131739 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=aa48b8f15f3f68c7ed90b29836daf6af
diff --git a/metadata/md5-cache/dev-java/jsr250-1.2 b/metadata/md5-cache/dev-java/jsr250-1.2
index e35e69065435..c566685bbebb 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.2
+++ b/metadata/md5-cache/dev-java/jsr250-1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar -> jsr250-1.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2c23355b97cb5dd807972b2900046397
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index c3439f238911..6043739ea59a 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Annotations for Software Defect Detection in Java
 EAPI=8
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=305
+HOMEPAGE=https://jcp.org/en/jsr/detail?id=305
 IUSE=source doc
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar -> jsr305-3.0.2.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=7a780abe7c735da8574df679c0235bc8
+SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=f010bcb7603d30304cccc69595761b8d
diff --git a/metadata/md5-cache/dev-java/jta-1.1-r1 b/metadata/md5-cache/dev-java/jta-1.1-r1
index 478d4cfe888f..513f9f845c72 100644
--- a/metadata/md5-cache/dev-java/jta-1.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_1-classes.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=bc8f4489d0fe3fa1dcfe2d5228c8393c
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index 5854a333410e..886a39ab8dd8 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index c8160930655d..2daec00a9f04 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -10,5 +10,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 4bb22e5e0e92..ca3988216826 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2cb66bdc1fddf90655369bf84c447628
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2 b/metadata/md5-cache/dev-java/junit-4.13.2
index 756ce8174281..a40b55a3567c 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d5125b3191cacd1f95f49f2c28a3a361
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 52cab11228b4..bef434f5fcdd 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test "TestPerClassLoaderRunner"
+DESCRIPTION=ClassLoader per Test runner for JUnit 4.12+
 EAPI=7
 HOMEPAGE=http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr
 IUSE=doc source
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=4e64fcbff13b89c0e4c82c5a30f1019c
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=cf422be6a5523815b02e67c5e3ea8ca8
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1 b/metadata/md5-cache/dev-java/junitparams-1.1.1
index 98e58448429a..edab7fb32290 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5cc085539258633a17adf50959bf58a6
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r4 b/metadata/md5-cache/dev-java/jython-2.7.0-r4
index 33a7f2862829..01430227f130 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r4
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 dev-java/asm:9 dev-java/comm
 RESTRICT=test
 SLOT=2.7
 SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1cb7ccd20488c922d0e3675300ce8826
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index ca600a755844..655f450b90a8 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=c7f98be39fac6bb494bcd0bf1b9d1786
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
index 9ec195ed7e06..c0989c3c52f5 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1 b/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
index f168335d31f2..f71ab66baf1c 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.9.1/leiningen-2.9.1-standalone.zip -> leiningen-2.9.1-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.9.1/bin/lein-pkg -> leiningen-2.9.1.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f2d1eade654b12d47d89d89c133c805f
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r2 b/metadata/md5-cache/dev-java/libg-2.1.0-r2
index b04a242069d6..a2ab42d16046 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f0a9c234e14606974c5cd4c4f7050818
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index e985507b8252..0bfeae980a30 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d0063608d73b32d09af4e0e9aa228d3c
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
index 5565e70e3327..54506c611635 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0b615dcd9048430eab504bcbc357bf4f
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
index dadd11903520..3e182332a0e1 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jre
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=85b1dbc023dbb3ec04b9facfdfafe938
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
index aa8ecc81acf0..719819befe12 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jre
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b0a08d8a41e226ec79536e54e3fcee95
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-2.17.1
index 0b0c0a989179..603865e60eec 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3769b1a7bd3476092fffbe442ca691c6
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-api-2.17.2
index 9470c3b6be6d..7438aa1e1777 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a9d8acd8d47102cd87f23eb8dc3c2650
diff --git a/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
index 4afbd1bbc816..b3f19cad4a37 100644
--- a/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d26378af3a37518e48aa6929eaeebbe3
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1 b/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
index 8811573edf53..0b0577705a95 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=70c00c60c3f5d42ae827a8bdc0e83d88
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.2 b/metadata/md5-cache/dev-java/log4j-core-2.17.2
index 233f1acde23e..9a2c4384085b 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=79ff765b206356dcd7d6eb86824ff044
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=2432e2db5d112606a5ebcb124d414b84
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.2.11 b/metadata/md5-cache/dev-java/logback-classic-1.2.11
new file mode 100644
index 000000000000..9aeb631ec099
--- /dev/null
+++ b/metadata/md5-cache/dev-java/logback-classic-1.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 dev-java/janino:0 dev-java/javax-mail:0 dev-java/logback-core:0 dev-java/reflections:0 dev-java/slf4j-api:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=logback-classic module
+EAPI=8
+HOMEPAGE=http://logback.qos.ch
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=EPL-1.0 LGPL-3
+RDEPEND=virtual/jre:1.8 dev-java/janino:0 dev-java/javax-mail:0 dev-java/logback-core:0 dev-java/reflections:0 dev-java/slf4j-api:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=e1c95d93b42eccb72d0f563082dae67f
diff --git a/metadata/md5-cache/dev-java/logback-core-1.2.11 b/metadata/md5-cache/dev-java/logback-core-1.2.11
new file mode 100644
index 000000000000..af68ce65f9a3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/javax-mail:0 dev-java/janino:0 dev-java/jansi:0 java-virtuals/servlet-api:3.1 test? ( dev-java/assertj-core:2 dev-java/joda-time:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=logback-core module
+EAPI=8
+HOMEPAGE=https://logback.qos.ch
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=EPL-1.0 LGPL-3
+RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/janino:0 dev-java/jansi:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=1b5096efe927e2b4e39ccd7d62f72a44
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r2 b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
index ed765f6be541..911b9fc85d59 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r2
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f600176223481fd074181365488abbb2
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index aabe04a9a408..8da89077452f 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0d5ebd095f71058ca68a13d8fb06d737
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
index fdece97a4b6f..5330996d152d 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lz4/lz4-java/archive/refs/tags/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/lzma-19.00 b/metadata/md5-cache/dev-java/lzma-19.00
index 154cc79239b4..f205ae080cba 100644
--- a/metadata/md5-cache/dev-java/lzma-19.00
+++ b/metadata/md5-cache/dev-java/lzma-19.00
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.7-zip.org/a/lzma1900.7z
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9c54f1a52c6373711d85944874ee8e68
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index 7c37a979aad7..057f59f24c8b 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ac596e1478d250cd543873f491fb9ad8
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.2 b/metadata/md5-cache/dev-java/maven-bin-3.8.2
index 48e548cd770c..6609d6e17c0a 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.2
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=mirror://apache/maven/maven-3/3.8.2/binaries/apache-maven-3.8.2-bin.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=70fd40cf2c49d35a9edcc067af05bb2c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.3 b/metadata/md5-cache/dev-java/maven-bin-3.8.3
index 3fd48ba3675a..d717d97a618d 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.3
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=mirror://apache/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=70fd40cf2c49d35a9edcc067af05bb2c
diff --git a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15 b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
index fa7f7be24f0c..5e27f2d5df13 100644
--- a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
+++ b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f03e6f50e1ab381789ee9c8f58589137
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index dc9ffb513779..daa0827abf74 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0 LGPL-2.1
 RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8ebed4da60f3daa69ceb2c883b13c2b6
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index 4e30ea551f15..cee1ea72cae3 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a68650c82c6a24bca015230d120a63f7
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7-r1 b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
index 091e5a726611..9079196fddc2 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7-r1
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=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_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d7b5cd9746772f19122b9cd09a35982e
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r1 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r1
index 1fd9e6680e39..864f032b997f 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r1
+++ b/metadata/md5-cache/dev-java/microba-0.4.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/tdbear/microba/archive/0.4.4.3.zip -> microba-0.4.4.3.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c15914077d044c9b72f8a027fc0f258b
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
index 770185cd4d1b..2b5cbb86d5ac 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
+++ b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/tdbear/microba/archive/refs/tags/0.4.4.3.tar.gz -> microba-0.4.4.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=84850ba57d8c9243e1748dd0e83ad36e
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0-r1 b/metadata/md5-cache/dev-java/miglayout-4.0-r1
index 2c92ca4b56c6..1008cd87c24a 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0-r1
+++ b/metadata/md5-cache/dev-java/miglayout-4.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=swt? ( dev-java/swt:3.7 ) >=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	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f81c067fd7f0cb198281b55425f123c1
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.3 b/metadata/md5-cache/dev-java/mill-bin-0.10.3
new file mode 100644
index 000000000000..55415f033704
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A Java/Scala build tool
+EAPI=8
+HOMEPAGE=https://com-lihaoyi.github.io/mill/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:*
+SLOT=0
+SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.3/0.10.3-assembly -> mill-bin-0.10.3
+_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2 b/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
index 93bf195a84b3..1282c9563bc5 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
+++ b/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar -> mimepull-1.9.6.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=755bac65f7fda6a03cd3f0bfd7625693
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r2 b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
index d78c2612e59a..ce208ffc702d 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r2
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4976555477c891d9c12d81fd9f8b842c
diff --git a/metadata/md5-cache/dev-java/mockito-4.4.0 b/metadata/md5-cache/dev-java/mockito-4.4.0
new file mode 100644
index 000000000000..b769edfe8693
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mockito-4.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Mockito mock objects library core API and implementation
+EAPI=8
+HOMEPAGE=https://github.com/mockito/mockito
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4
+SRC_URI=https://codeload.github.com/mockito/mockito/tar.gz/v4.4.0 -> mockito-4.4.0.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=dbdc51a283c629b3a94da7e5d9b2cdec
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index d5c7ba4169fe..d66cf1d71ce4 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -10,5 +10,5 @@ LICENSE=BSD Apache-2.0
 RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b88c98513deb1fa0d5a4475745e534a5
diff --git a/metadata/md5-cache/dev-java/mvel-2.3.2-r1 b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
index 20d4a3a1920f..13e4a8fb1cdd 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.3
 SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35 b/metadata/md5-cache/dev-java/netty-4.1.35
new file mode 100644
index 000000000000..28f957dea3d6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-4.1.35
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:0 dev-java/log4j-12-api:2 dev-java/slf4j-simple:0 test? ( dev-java/javassist:3 dev-java/hamcrest-library:1.3 dev-java/logback-classic:0 dev-java/log4j-core:2 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Async event-driven framework for high performance network applications
+EAPI=8
+HOMEPAGE=https://netty.io/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:0 dev-java/log4j-12-api:2 dev-java/slf4j-simple: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/refs/tags/netty-4.1.35.Final.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=46287e1bba52cfaff9f7b136521d6b4c
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
index 7fc9cb84689a..2141fd12775e 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config
 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	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d42543efe23963c10a983a500f06053d
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
index 7c50a06c99ad..a7d5bfef7c01 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/netty-common:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.0.36.Final.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=6f6b407145ed84e4f8764847194e9752
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.36-r2 b/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
index 1a07971bf2d3..77b28e0dcd80 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j-12-api:2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9d99c6c4cb4f0abdda088fc4fa5e9a63
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index 89c1fb332818..cae03f73d27d 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common
 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	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=daa26d6c482ae201228a945f47e696f3
diff --git a/metadata/md5-cache/dev-java/objenesis-3.2 b/metadata/md5-cache/dev-java/objenesis-3.2
index 3de7a9d3b2b5..8203a8771cee 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=06fba41631ebab0c728e0e0661211a34
diff --git a/metadata/md5-cache/dev-java/objenesis-test-3.2 b/metadata/md5-cache/dev-java/objenesis-test-3.2
index e5d0543bafbf..6896ead93c41 100644
--- a/metadata/md5-cache/dev-java/objenesis-test-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-test-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f281541877d897bfd7500ea353a84ca9
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
index e6893328eb43..fa4500d35db4 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u-dev/archive/refs/tags/jdk-11.0.13-ga.tar.gz -> openjdk-11.0.13_p8.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=43b5a1ced82b1f58dac07fb260bb6fef
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
index 413732c15776..4d3d174a1a0d 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.14-ga.tar.gz -> openjdk-11.0.14_p9.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) )
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6f6de145eca4f6efb6851bb3a317c555
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.1_p12 b/metadata/md5-cache/dev-java/openjdk-17.0.1_p12
index 787c94bb64f9..a4d9925d158f 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.1_p12
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.1_p12
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.1+12.tar.gz -> openjdk-17.0.1_p12.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1ec349a27d3349cb45a8a1fcd56d56a1
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
index 04af34eb26fc..f93f26c3ba68 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.2+8.tar.gz -> openjdk-17.0.2_p8.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) )
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c8765ca9892cc67510f9c07f15004765
diff --git a/metadata/md5-cache/dev-java/openjdk-8.312_p07 b/metadata/md5-cache/dev-java/openjdk-8.312_p07
index 3ebdcfd566a9..4cb4cce3fb2f 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.312_p07
+++ b/metadata/md5-cache/dev-java/openjdk-8.312_p07
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u312-ga.tar.bz2 -> openjdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u312-ga.tar.bz2 -> openjdk-corba-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u312-ga.tar.bz2 -> openjdk-hotspot-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u312-ga.tar.bz2 -> openjdk-jaxp-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u312-ga.tar.bz2 -> openjdk-jaxws-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u312-ga.tar.bz2 -> openjdk-jdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u312-ga.tar.bz2 -> openjdk-langtools-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u312-ga.tar.bz2 -> openjdk-nashorn-8.312_p07.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 )
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=53014ab8b45ec984c85b2735b0fa6faa
diff --git a/metadata/md5-cache/dev-java/openjdk-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-8.322_p06
index 19d592ced129..22c480b6fc1e 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-8.322_p06
@@ -11,5 +11,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u322-ga.tar.gz -> openjdk-8.322_p06.tar.gz
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	java-vm-2	69658c0814b27f9cbe466a24e6621d23	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a01243da1cf44347c004b959cae6fcae
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
index 3bf77ca11833..ecf921fcf928 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/li
 REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.11+1.tar.bz2 -> openjfx-11.0.11_p1.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	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=020283e8f5cc2a36d2f2566d3ab50613
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 72063912c5f3..28f9e7f49504 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/li
 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	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=19fd42b84358719bcb75fc6361dfc545
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index 6c6abe0045f2..f22c45ee9296 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -11,5 +11,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=498092692a9d4a8c0dbccc4a78cef95a
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0 b/metadata/md5-cache/dev-java/opentest4j-1.2.0
index 66e09b5dffcc..d5b6a0a8a660 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Open Test Alliance for the JVM
 EAPI=8
 HOMEPAGE=https://github.com/ota4j-team/opentest4j
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=7f85bb00a7dc4afc9fa7208a4963470f
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=82035c59a8adb225d3b46be7955823c8
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
index 9a2f3c77bbbc..978b2f430f6a 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c886c413c843830b7dd1e0c99df6d010
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1 b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
index a4adf1b4d264..28ed396196f3 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
+++ b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
index 7d10e72a035a..858acfb47816 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:4.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e528ca5556bddf0986b3a918563b8b1d
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index 11fb7bea9415..3db5e174b69a 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=5af090f872a5bf2c3cff9ab2c3e5a826
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
index 8537eca776bc..91329f316c01 100644
--- 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
@@ -10,5 +10,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2ec59d2daeed99509f462f1dbf235779
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
index 15564e1515aa..17ea5f85cccb 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
index 3fa27da360e7..ea2630891fdb 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 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/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.24 b/metadata/md5-cache/dev-java/pdfbox-2.0.24
index 4dfd0da3cd5b..20d9a7b2bcd5 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.24
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.24
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d2d18c0ea03fff8600282c6b75cc426c
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 4f9e839bfe23..1dbaebe305b8 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=db5e2ea1ef3c5fff4dd8d4e5c43dbe0a
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index 80127a5b3594..e1d52c72c0b8 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f5be57cb43c766cedbf3913f56dcc9f5
diff --git a/metadata/md5-cache/dev-java/poi-5.0.0 b/metadata/md5-cache/dev-java/poi-5.0.0
index 4342360b4b53..8a3e30f9a377 100644
--- a/metadata/md5-cache/dev-java/poi-5.0.0
+++ b/metadata/md5-cache/dev-java/poi-5.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-codec-1.11:0 >=dev-java/commons-collections-4.1:4 >=dev-java/commons-math-3.6.1:3 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/sparsebitset-1.2:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz -> poi-5.0.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d5de5639d67fc3cfc5734f5cbbea16f8
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.3 b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
index e9fa9b96ada9..beb96ad2b213 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=96a63f10c1b4d9a9eaa37a3a5bee43bb
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.3 b/metadata/md5-cache/dev-java/protobuf-java-3.19.3
index 595b08213801..2264ac62cba3 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.19.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.19.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/30
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> protobuf-3.19.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=304da8b7b24214b8c20b711a7f5615a1
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index 5dc6c5792b5b..f39103dbca15 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/30
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=feafd3e9e534a0afae32f75e585cd380
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r2 b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
index a858e3ce85f3..1b52297e119d 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r2
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6ba1fb1febbbbb7c992b5a5d0ab19f24
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r3 b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
index 154c38e66bc1..debe465b1372 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r3
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=bfbb947c79fadf681549faaa8badf360
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.7.8 b/metadata/md5-cache/dev-java/randomized-runner-2.7.8
index 40c7e371353e..099c65738cc9 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.8
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.7.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz -> randomized-runner-2.7.8.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7a1299c01a6bc42fbdaccbfd314fe9a8
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.7.9 b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
index 37f2a02347d6..6036cac56bb7 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.9
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.7.9.tar.gz -> randomized-runner-2.7.9.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=fda0325c336fc72343bedb9885b4ddd0
diff --git a/metadata/md5-cache/dev-java/rat-0.13 b/metadata/md5-cache/dev-java/rat-0.13
index 535ac0801c4d..ca0824bde7a8 100644
--- a/metadata/md5-cache/dev-java/rat-0.13
+++ b/metadata/md5-cache/dev-java/rat-0.13
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-java/apache-rat-core-0.13:0 ~dev-java/apache-rat-tasks-0.13:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d3abfd8c59cbe78b7c86854cba028d0c
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.10-r1 b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
index 02be7917d320..80fcaf9d4832 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.10-r1
+++ b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
@@ -9,5 +9,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.6 dev-java/guava:20 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.10/reflections-0.9.10-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3050442ece8cfcbbf6173ca3b3351ef6
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
index d170e66da02d..313a572261d9 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5ee49b07c286804f7f0c01276a9fe1e8
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
index 69a9de57ef85..aacb67cdc116 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=65d5b79e953b706a291d61e12571b93f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
index 4ccb229d2a5f..a24985973daa 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://caucho.com/download/resin-4.0.27-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=429fbf89c07d222703761b31c67eacfc
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
index 90babc6cf546..83b8cda41f21 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=https://caucho.com/download/resin-4.0.46-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=13dffd9c17ccbe2c79962cdaac838432
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index b56a606ea0e2..1e655fcf4ca4 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source implementation of JavaScript written in Java
 EAPI=8
 HOMEPAGE=https://github.com/mozilla/rhino
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MPL-1.1 GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=44567572e50a86e134f94f9d3d95f96c
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=e22c22e09284defb9a49b15e471af42c
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.7-r1 b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
deleted file mode 100644
index fa2da3d6ec35..000000000000
--- a/metadata/md5-cache/dev-java/rhino-1.7.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/emma:0 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
-DESCRIPTION=An open-source implementation of JavaScript written in Java
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/rhino/
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MPL-1.1 GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.6
-SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=02a4216c8c184464990c8dd6326b23b9
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index 94b7bc0f3c92..fb535b8980c8 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=213f0e66eb276ced3a6c501f727e5592
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
index 4c8acca7824c..4c942ea20e64 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
 DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Native library providing serial and parallel communication for Java
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	ed3ef2014ee93d24bde80f0c0ea9732e	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=625c67cac350aab0cd4d989cb074031f
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index 19ec684faeb0..e049d515c419 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -10,5 +10,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 013702e59c83..be336fe460ca 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r2 b/metadata/md5-cache/dev-java/saxon-6.5.5-r2
index e19c8dd120db..0a26c2b143d5 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r2
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d3206516c54ca322951cecff93f13c83
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index c20759b06fb1..d57e222c27cc 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=b7aa80ccf30684be71a8025432e32cad
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
index 64f06b1ab7af..67bd11a4b97b 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0c7279830e1c335ece40179bf7e44fac
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index 2486a867ebc2..d2bee99c211a 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A XSLT and XQuery Processor
 EAPI=8
 HOMEPAGE=http://saxon.sourceforge.net/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=MPL-1.0
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c1fc566d278610d2772250e9311e6584
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=272f2fee3fc1af7463a48c9f9f1227d0
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.13 b/metadata/md5-cache/dev-java/sbt-0.13.13
index 97e4ab2bdf7a..c0699398cc4a 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.13
+++ b/metadata/md5-cache/dev-java/sbt-0.13.13
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 dev-lang/scala >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-src.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -> sbt-launch-0.13.13.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.13-gentoo-binary.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4f028ee99085e12312946b85e649cd8f
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18 b/metadata/md5-cache/dev-java/sbt-0.13.18
index bbdc20674bcc..2e37c67ed317 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.18-gentoo-binary.tar.xz )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=697eb5ced0f4c9b0055c7213576bfcc3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.10 b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
index dde916cb2530..84849c5ffa9f 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.10
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ed5c0d9ba3515bbf495ea011a782277a
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.2 b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
index 805ffb334b6d..d0a9f6a3b93e 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.2
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.2/sbt-1.3.2.tgz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9e74c2dc0e226b9dacf531839775e184
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index 7b0284f80c9f..6de9dcfe6d37 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/xpp3:0 >=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/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=308d0100ae4ba811f4261b0944400eaf
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.32 b/metadata/md5-cache/dev-java/slf4j-api-1.7.32
deleted file mode 100644
index 9e271995bcba..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.32
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=The slf4j API
-EAPI=8
-HOMEPAGE=https://www.slf4j.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz -> slf4j-1.7.32.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=bb747ea68920617083c3b3e842e33029
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.36 b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
index 0e8fe6ce1479..a0af8ab8393d 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
@@ -5,11 +5,11 @@ DESCRIPTION=The slf4j API
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=6ca8c2c2f547241b6ea08516f9528c1c
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=338f4e479d80a739f05e04a17f5dfd25
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
index 30236da80905..b6dcc717ad5f 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
@@ -4,10 +4,10 @@ DESCRIPTION=Extensions to the SLF4J API
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/commons-lang:2.1 dev-java/javassist:3 ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=77a6c7413e88dc797aa8e31d42af8238
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=10ce5b7c3440e8afa5c532cf009b1588
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.32 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.32
deleted file mode 100644
index c4ae0adb9746..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/slf4j-api-1.7.32:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=SLF4J NOP Binding
-EAPI=8
-HOMEPAGE=https://www.slf4j.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=~dev-java/slf4j-api-1.7.32:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz -> slf4j-1.7.32.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=9181142d1a108fe746e5bdae460afb52
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
index 4b2be52c3737..7f006aa4b455 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
@@ -4,11 +4,11 @@ DESCRIPTION=SLF4J NOP Binding
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=cd25590921203c3aa41d49b5932ffc36
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=3e3bf4e30cff976cd3b3aa2ec11881d2
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.32 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.32
deleted file mode 100644
index a50fb6b7e401..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/slf4j-api-1.7.32:0 >=virtual/jdk-1.8:* test? ( ~dev-java/slf4j-api-1.7.32:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=SLF4J Simple binding
-EAPI=8
-HOMEPAGE=https://www.slf4j.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=~dev-java/slf4j-api-1.7.32:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz -> slf4j-1.7.32.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=a01a7bdf2d0c3633ccc8a66847909eae
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
index 4d18e81c79e1..db0a5e0dee0f 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
@@ -4,11 +4,11 @@ DESCRIPTION=SLF4J Simple binding
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=ab01435ae273209de01c291301695b0b
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=b11f579dd89a57a61786c3acc4558cd6
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
index a81df295d1bd..75995108d7ae 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=58a4e67bff599ee5f42fc9b539c32e69
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.30 b/metadata/md5-cache/dev-java/snakeyaml-1.30
index 3a57a71c6134..4ed01fddd391 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.30
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.30
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=38e48a98120a974dbe18a7f4715cc13c
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8 b/metadata/md5-cache/dev-java/snappy-1.1.7.8
index 602749fe6e5e..ed6ee8c44dc1 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.7.8
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core-api:0 app-arch/snappy dev-libs/bi
 RESTRICT=test !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=30bfd61a20e562d852946b5ef1c2c7c4
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index cdcf8bc40250..fb8bc8f6f6f3 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=12a6f2e60d75f585b97926231f87136b
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.1.143 b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
index a29363d9609b..1121c2a0cb87 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.1.143
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.1
 SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.1.143.tar.gz -> spec-alpha-0.1.143.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bba66ecd87479c84051f091f7a333b9d
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.176 b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
index 8b6da26da41c..cdf612b1c303 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.176
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.2
 SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.176.tar.gz -> spec-alpha-0.2.176.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1b7aef6dad85d62a04e7c6e251d3c238
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.194 b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
index 7af5d3ba9384..3f52ac9916fa 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.194
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0.2
 SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.194.tar.gz -> spec-alpha-0.2.194.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e5d86d5dd44cbc84e39df89aeaf70d07
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r2 b/metadata/md5-cache/dev-java/spin-1.5-r2
index 2c707e778c8a..5da3969f8498 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r2
+++ b/metadata/md5-cache/dev-java/spin-1.5-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=85477047cb583e6a212b1783d52db5f0
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1
index b679b9986986..c3a52b78d8f8 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cf52313552016e8722605f56d367aa4f
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
index 8322cd81abd7..9131be9e9981 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ce2be796703b4a85cc2dc9fa30c706f7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.1 b/metadata/md5-cache/dev-java/stringtemplate-4.3.1
index 12500e7cddb1..340021b4383b 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.1
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.1/ST4-4.3.1-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.1.tar.gz -> stringtemplate-4.3.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8176126ca619cea3e0f8e17a03c5931b
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index 32cf1439b5cd..b534004b8717 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ff797ca3504410f4352e3b094efe3769
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index e6948127ba79..eb99d22ef4a6 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -9,5 +9,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=09fcb42b33c1665c3ad8594de22b165a
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r3 b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
index a11a42ca231d..5ec7b8de50c4 100644
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r3
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=e0fa95ef53785fbff9348492ae0ff223
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index 402f7222b94c..ab0aef51c57a 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2676b345338fb20e84e5cddcba153511
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index 7b3da29ce9c5..bc468b892478 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -9,5 +9,5 @@ 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index b9e397d32d97..69594e5707a9 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
index fd58e2eb489b..fc1c9d6f3d5a 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=bt747
 SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r3 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
index 18f6689c380b..74142dcdbc94 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=3.7
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0d6f88d42687ca65b21dc5d8571dd6f6
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r4 b/metadata/md5-cache/dev-java/swt-3.8.2-r4
index 6e99ee09b72c..ebff5d3995f9 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r4
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r4
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1a0bdb433c0d83e53323cf38fc2458ae
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index e7c0a4e674a9..1ec5522f183a 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=4.10
 SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7ee352c08907a4dcf2f198e51ab248b4
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index 81daec35ea26..1aa581647323 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7340528ad190212b4fb759bee7b3a554
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10-r1 b/metadata/md5-cache/dev-java/testng-6.9.10-r1
new file mode 100644
index 000000000000..e6d288c3842d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jdk-1.8:* test? ( dev-java/assertj-core:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
+EAPI=8
+HOMEPAGE=https://testng.org/
+IUSE=test doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=dcbb00caec778b23592df5f1c33f8f6c
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.31 b/metadata/md5-cache/dev-java/tomcat-native-1.2.31
index d10043ac9818..49b3c6e71b67 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.31
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.31
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.31/source/tomcat-native-1.2.31-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e83e396997fe8d7bc561354ca091870c
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.32 b/metadata/md5-cache/dev-java/tomcat-native-1.2.32
index 07d0554fc41c..81f70047a03b 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.32
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.32
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=33cb3c7df9ef11012684ca5aa22cc64b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
index 674624089ff3..d42c7b86097b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.17/src/apache-tomcat-10.0.17-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=020916eb2be685584c4c31be6ed12817
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
index 6dbdd251a90c..b08297a2540b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.18/src/apache-tomcat-10.0.18-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=77855d10a095352ef8432dff69191097
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
index b4ea7ce4db4d..8b6b56cebc82 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.20/src/apache-tomcat-10.0.20-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=484ed8723ef13a21c7a8ed2078e7409b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
index b8abe1cfc3a8..09f4eeb5beb8 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e55474e5386f7203cb04a172ab7de0c2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
index 0ae42027691d..ec5f5de56f95 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-osgi	c9b922d3fd7b5c6117f4c4d68e32e881	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3037ebb67bccfb6c7b14f5f21f34e929
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
index 66035d5f4de0..66b32edc1816 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b9ba179dd9ddedb59455338e1f2919b3
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 4956c0f5da69..1125e681f391 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
@@ -9,5 +9,5 @@ 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	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
index 2b948f170a4b..6f08e7f58170 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.76/src/apache-tomcat-8.5.76-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
index a882f88ce5b9..91a2e2870e42 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.77/src/apache-tomcat-8.5.77-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=02ff9c0607d1e35b099496ea057bf1b4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
index 267d491e3e3f..52a412f263bb 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.78/src/apache-tomcat-8.5.78-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
index a67936a6ebcd..a097dfcbfee7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.59/src/apache-tomcat-9.0.59-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
index 0e5029b16e54..bc962ae08ebd 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.60/src/apache-tomcat-9.0.60-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=c7720588ea9f9215c9fa5aa5c2d63302
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
index 3a706807e7cc..67f8fc4ef9d7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.62/src/apache-tomcat-9.0.62-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=08ded5a97f72bfd8d150c726103afe2f
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index 3effd6cb5693..9e0d5304e056 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3 b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
index 9935e6ab93b5..2b05c77134b6 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/lightbend/config/archive/refs/tags/v1.3.0.tar.gz -> typesafe-config-1.3.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3f340436e99a53914207a339c4cc3a75
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index df2c55a6aa48..653ed9b1c3a5 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of extremely fast and reliable parsers for Java
 EAPI=8
 HOMEPAGE=https://www.univocity.com/
 IUSE=doc source
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=d8811c69de3993865f8b6006c7ccc647
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=3c9fba39b3fe7b9aefa2f4ec1e2416a3
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
index e1e07ccbcc36..10ee52d1728a 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=3ccd6587428aa84d746f0d82f769889a
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
index c8dccfd7d2f9..9a47113fe859 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=a2e640185994c36cf7a5d4d0335bc6bc
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index 98623b4926dd..5d0616d3fd74 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.7 b/metadata/md5-cache/dev-java/woodstox-core-6.2.7
index afd2c6a69463..f55dc948581f 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.7
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/refs/tags/woodstox-core-6.2.7.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=87570cb619132cdee4a3eb4e84201986
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.8 b/metadata/md5-cache/dev-java/woodstox-core-6.2.8
index 27fe916dd1b2..715e129bb344 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.8
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/woodstox
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
-_md5_=c5a39351ece348d1fcea3d6c298ca0d4
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_md5_=f18e632565e89e8de10ef603cc74872b
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
index 4cacdd49beb1..ccd443a55bd6 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9aa326432167919e4687c68b1949b92b
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index 2f6cc316bc02..88a760d9a7c2 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f76b5f3e572c89e4034b9e7611b7fcdf
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index c5796f223c9d..78865fb4e51d 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cd902d6eff7e78d19623f8568ba74796
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index 587eebe6d79f..0b340ff843cf 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=cb5ec7aa1a3c9ce7cbd1b7f7cf3f0037
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
index 997f9fa2f9f9..6a341158a699 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=bdb6618a2d342e7f3891623a6b005e8a
diff --git a/metadata/md5-cache/dev-java/xjavac-2.4.0 b/metadata/md5-cache/dev-java/xjavac-2.4.0
index b347ff0dd6f8..d3038f2b785e 100644
--- a/metadata/md5-cache/dev-java/xjavac-2.4.0
+++ b/metadata/md5-cache/dev-java/xjavac-2.4.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/xjavac-2.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6cc5c92ba0c5f76bc1dd76438dc973d3
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
index 7aab3ae51443..2b1c0d355e5d 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fbbedaa4209ccea1c5981809735b352c
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index d90bc1bb6c9b..34ad2f12cece 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=11df5eb34ec712c6d6bd68a8a8901ed0
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
index b1f9d180aee5..9c91384c6d19 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=d4a018806605ca5d4b9a4ad82307e754
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
index efd9cebacaf6..5cf1c3f019dd 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=56d251bdbe9fd5f9bb45ff826c0bae24
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index 10243ab40f36..ddf183d16d91 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
 EAPI=8
 HOMEPAGE=http://xmlunit.sourceforge.net/
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=975412b54ee9bf13977ca7c15cf399bd
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=9394d087cfd29588535e4561e6d5d06a
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.24 b/metadata/md5-cache/dev-java/xmpbox-2.0.24
index 84c99704c929..bee1bbf5b0b6 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.24
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.24
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=2f11d8a49426a25cbffad11cd56e97de
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index 4a99b51e6ffa..fd30b47f65b8 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=9c30cff4e1a02cc0ffcbe68aa5a5c148
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
index 88d7c8839594..b81006e8a594 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b94c06e34b96ea621107d7db29d49ac1
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 41a8f57761a7..7589c330ecb1 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 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/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=805b3964c2455242a09dcf8a33a87ccd
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415-r1 b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
index 7a5cf2e4fdd9..58c92b21b560 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415-r1
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
@@ -10,5 +10,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=450d84935fd1f21e92dbd894ff81d532
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9 b/metadata/md5-cache/dev-java/xz-java-1.9
index e26479aa0184..b32a02c564e0 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9
+++ b/metadata/md5-cache/dev-java/xz-java-1.9
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae
 _md5_=4c9fa9f91e413a04f4e7bf627a55dad3
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4 b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
index 87cfe5da4ad4..19e0ff5aef7c 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
@@ -9,5 +9,5 @@ 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.5.0-4.tar.gz -> zstd-jni-1.5.0.4.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	5faae27f317e090a61b74f53f5e0cbc9	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	8a2b8811bad7877b5ec349bddeceabb6	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=143e064a4c48b4a9a8140d602240a94f