gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /metadata/md5-cache/dev-java
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
289 files changed, 1249 insertions, 1745 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 2f3e7f23fb64..bf12bb5fca1b 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/airline-0.7-r1 b/metadata/md5-cache/dev-java/airline-0.7-r1
deleted file mode 100644
index 78f0db1d46d4..000000000000
--- a/metadata/md5-cache/dev-java/airline-0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/guava:20 dev-java/javax-inject:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotation-based framework for parsing Git like command line structures
-EAPI=6
-HOMEPAGE=https://github.com/airlift/airline/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/guava:20 dev-java/javax-inject:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/airlift/airline/archive/0.7.tar.gz -> dev-java-airline-0.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f10eb9d66f363dd910b206f40c4400b3
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 85333c77b79c..75c44e69ced2 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
-DESCRIPTION=Apache Ant's optional tasks depending on gnu-jaf-1
+DEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DESCRIPTION=Apache Ant's optional tasks depending on log4j-12-api-2
 EAPI=7
 HOMEPAGE=https://ant.apache.org/
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
+RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
 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	9fcc95aace43e6115d6c54b67d98c6f3	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=296501a6e9e0d79079556de0bcb3b3e0
+_md5_=0f593eacc9c18c420744a9b80655288c
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r2 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
index d7924499964f..14b6f4d9d131 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r2
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* doc? ( !arm? ( !arm64? ( dev-java/bcel:0 dev-java/bsf:2.3 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-regexp:1.4 dev-java/jakarta-oro:2.0 dev-java/jdepend:0 dev-java/jsch:0 dev-java/log4j:0 dev-java/javax-mail:0 dev-java/sun-jai-bin:0 dev-java/xalan:0 dev-java/xml-commons-resolver:0 dev-java/xz-java:0 ) ) ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* doc? ( dev-java/bcel:0 dev-java/bsf:2.3 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-regexp:1.4 dev-java/jakarta-oro:2.0 dev-java/jdepend:0 dev-java/jsch:0 dev-java/log4j-12-api:2 dev-java/javax-mail:0 dev-java/sun-jai-bin:0 dev-java/xalan:0 dev-java/xml-commons-resolver:0 dev-java/xz-java:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) dev-java/javatoolkit
 DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
 EAPI=8
 HOMEPAGE=https://ant.apache.org/
@@ -7,9 +7,8 @@ IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=doc? ( !arm !arm64 )
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=03b64a841f52643205791ccea666dfac
+_md5_=d59bede90cb861a38c91d71a3a1c6710
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 6eeccef5bd13..22c1b48b6783 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
@@ -5,10 +5,10 @@ DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
 EAPI=7
 HOMEPAGE=http://www.eclipse.org/
 IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=ef77e4c78d1bb8c34d81314d7bc974c3
+_md5_=7d616207b9c9335f1d19819626b451a9
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.21 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
index 78e9f00661b1..c20f7a1ee3cf 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.21
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.21:4.21 dev-java/ant-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.eclipse.org/
 IUSE=doc source
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.21:4.21 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.21
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.21-202109060500/ecjsrc-4.21.jar
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=fc4bac3d2cf3d8017d19f9b4770a458f
+_md5_=b88c015ca714491a7ce8e180a62a36cc
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
deleted file mode 100644
index d7620e052c74..000000000000
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c824e8f2349b7b27240173c39647b12c
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 c3e67d0d6a94..7e7d98176d96 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
@@ -3,11 +3,11 @@ DEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-
 DESCRIPTION=Apache Ant's optional tasks depending on gnu-jaf-1
 EAPI=7
 HOMEPAGE=https://ant.apache.org/
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
 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	9fcc95aace43e6115d6c54b67d98c6f3	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=96d61fa19c3ef33365f20e44815e89ed
+_md5_=95696bd61b85b23a07f7eac32f544426
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r1 b/metadata/md5-cache/dev-java/antlr-3.5.2-r1
deleted file mode 100644
index 1dce5fb1cabf..000000000000
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/stringtemplate:4 >=virtual/jdk-1.8 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=7
-HOMEPAGE=https://www.antlr3.org/
-IUSE=doc 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=dev-java/stringtemplate:4 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=3.5
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=358303c2eaef500c4608b300ae54503e
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 4ecad2d14a36..33b8ab94defc 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 ~dev-java/antlr-too
 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
+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.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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=cd3a7586791151e97347c78be7da3a65
+_md5_=848885875eb4a9f31d4c085859c93206
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.1 b/metadata/md5-cache/dev-java/antlr-4.5.1
deleted file mode 100644
index debaf1751500..000000000000
--- a/metadata/md5-cache/dev-java/antlr-4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jdk-1.6 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=https://www.antlr.org/
-IUSE=doc test source
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=https://github.com/antlr/antlr4/archive/4.5.1.tar.gz -> antlr-4.5.1.tar.gz https://www.antlr.org/download/antlr-4.5.1-complete.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1db6e10c59a3fc8fd4128fd2a7cb046d
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.3-r1 b/metadata/md5-cache/dev-java/antlr-4.5.3-r1
deleted file mode 100644
index a158a29c9d69..000000000000
--- a/metadata/md5-cache/dev-java/antlr-4.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=7
-HOMEPAGE=https://www.antlr.org/
-IUSE=doc test source
-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=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=https://github.com/antlr/antlr4/archive/4.5.3.tar.gz -> antlr-4.5.3.tar.gz https://www.antlr.org/download/antlr-4.5.3-complete.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=995261a8c65ec36982521bef7c96367e
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
new file mode 100644
index 000000000000..998b0af87c9b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=virtual/jdk-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
+DESCRIPTION=A parser generator for many languages
+EAPI=8
+HOMEPAGE=https://www.antlr.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-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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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 ae6a9ff7efcd..660653a8595d 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
@@ -5,10 +5,10 @@ DESCRIPTION=ANTLR 3 Runtime
 EAPI=8
 HOMEPAGE=https://www.antlr3.org/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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.2/antlr-runtime-3.5.2-sources.jar
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=5d1b70abe5f434aa8f6b831d847af130
+_md5_=cfafecf65e1496e71c71ae4b45cc9ac3
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
new file mode 100644
index 000000000000..0aea6946444f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=ANTLR 4 Runtime
+EAPI=8
+HOMEPAGE=https://www.antlr.org/
+IUSE=doc source
+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=4
+SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=e2fe036c6e452328a3a1ca5675bd6f79
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 5cc2eae16cae..c756d30cab77 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
@@ -5,11 +5,11 @@ 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
+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.2: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.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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=f59dfa702593a26fe04537a4372c2e3f
+_md5_=4c54f231e9ddf173dae022714a684e0d
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
new file mode 100644
index 000000000000..45287b653a96
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runtime:3.5 dev-java/jakarta-json-api:1 dev-java/icu4j:70 dev-java/stringtemplate:4 dev-java/treelayout:0 dev-java/antlr-tool:3.5 test? ( dev-java/jol-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=The ANTLR 4 grammar compiler
+EAPI=8
+HOMEPAGE=https://www.antlr.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-4.9.3:4 dev-java/antlr-runtime:3.5 dev-java/jakarta-json-api:1 dev-java/icu4j:70 dev-java/stringtemplate:4 dev-java/treelayout:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=ee8dfd42f251eedddfefa85db193a19b
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
deleted file mode 100644
index 0780b71e3f75..000000000000
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Aspect-Oriented Programming (AOP) Alliance classes
-EAPI=5
-HOMEPAGE=http://aopalliance.sourceforge.net/
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f51ad7ff23b0e45dc5b17ff6be11a272
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index 854399d8586a..ebd32472e20f 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Aspect-Oriented Programming (AOP) Alliance classes
 EAPI=8
 HOMEPAGE=http://aopalliance.sourceforge.net/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=6266c18bde38740a40aba609c95507b7
+_md5_=743c9d116cc847653ea415023904e1e2
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r5 b/metadata/md5-cache/dev-java/appframework-1.03-r5
deleted file mode 100644
index ad050855f967..000000000000
--- a/metadata/md5-cache/dev-java/appframework-1.03-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jnlp-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Set of Java classes to build desktop applications easily
-EAPI=6
-HOMEPAGE=https://java.net/projects/appframework
-IUSE=doc examples source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jnlp-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/AppFramework-1.03-src.zip -> appframework-1.03.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aad034aab359dcbd2af584dccca7029f
diff --git a/metadata/md5-cache/dev-java/args4j-2.32 b/metadata/md5-cache/dev-java/args4j-2.32
deleted file mode 100644
index a26554653e02..000000000000
--- a/metadata/md5-cache/dev-java/args4j-2.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=args4j is a Java command line arguments parser
-EAPI=5
-HOMEPAGE=http://args4j.kohsuke.org/
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.32/args4j-2.32-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bee76157b14452151d231b5a796a303
diff --git a/metadata/md5-cache/dev-java/args4j-2.33 b/metadata/md5-cache/dev-java/args4j-2.33
deleted file mode 100644
index 6f64e167cfdb..000000000000
--- a/metadata/md5-cache/dev-java/args4j-2.33
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=args4j is a Java command line arguments parser
-EAPI=6
-HOMEPAGE=http://args4j.kohsuke.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=2
-SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.33/args4j-2.33-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ed258de3dd8bf6f394c163eebcb20c3
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
new file mode 100644
index 000000000000..0203dae70658
--- /dev/null
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 test? ( dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Avalon Framework
+EAPI=8
+HOMEPAGE=https://avalon.apache.org/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c0acbd3d335c3d208277ff74c95aa00f
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r10 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
index ac69b7671ef6..45e46e55486f 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r10
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/javax-mail:0 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 dev-java/log4j-12-api:2 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=Easy-to-use Java logging toolkit
-EAPI=7
+EAPI=8
 HOMEPAGE=https://avalon.apache.org/closed.html
 IUSE=doc source test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/javax-mail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 dev-java/log4j-12-api:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=57ace79ba2a1e0e5e18c55ef7b7b8c9b
+_md5_=2d2a31766aa0bf4ccba17f9d936df332
diff --git a/metadata/md5-cache/dev-java/bcmail-1.69 b/metadata/md5-cache/dev-java/bcmail-1.69
deleted file mode 100644
index 91307b81986f..000000000000
--- a/metadata/md5-cache/dev-java/bcmail-1.69
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 dev-java/jakarta-activation:1 dev-java/oracle-javamail:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 dev-java/jakarta-activation:1 dev-java/oracle-javamail: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/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=c8f5f9af9ee58d88fa5d6567bc33b8e8
diff --git a/metadata/md5-cache/dev-java/bcmail-1.69-r1 b/metadata/md5-cache/dev-java/bcmail-1.69-r1
index 117340ed83e3..b391916b9615 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.69-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.69-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols
 EAPI=7
 HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 dev-java/jakarta-activation:1 dev-java/javax-mail: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/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=9bf6f0a33456983357b2a89ac995064a
+_md5_=8da5d2d5d95e1f5c896a299d22e38e3f
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 b6bb6cb2f6e3..a961069016c6 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A swiss army knife for OSGi
 EAPI=7
 HOMEPAGE=https://bnd.bndtools.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 >=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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=49f29833328c5511559358ae870d23a2
+_md5_=7c66aa75cfeb1d877ddbc7a33913c75a
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
new file mode 100644
index 000000000000..b886c723a75e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-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 ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=JDBC drivers with JNDI-bindable DataSources
+EAPI=8
+HOMEPAGE=https://www.mchange.com/projects/c3p0/
+IUSE=doc examples source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7a9d8dfad3728f98b6b86a12fe8801f9
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
new file mode 100644
index 000000000000..5aaa127e5114
--- /dev/null
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=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
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c6c9bf8ba15b3c20c32e95b57d49b7d7
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
deleted file mode 100644
index 41308a034b81..000000000000
--- a/metadata/md5-cache/dev-java/cdi-api-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contexts and Dependency Injection for the Java EE platform
-EAPI=5
-HOMEPAGE=http://www.cdi-spec.org/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=184d43da5917c156129aafd5d6ba57b7
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2-r1 b/metadata/md5-cache/dev-java/cdi-api-1.2-r1
deleted file mode 100644
index 1c2ebf0238b3..000000000000
--- a/metadata/md5-cache/dev-java/cdi-api-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfish-interceptor-api:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contexts and Dependency Injection for the Java EE platform
-EAPI=5
-HOMEPAGE=http://www.cdi-spec.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfish-interceptor-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar -> cdi-api-1.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7c06136f27076faabda0672a52b5dcf
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
new file mode 100644
index 000000000000..07cee54273c9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
+EAPI=8
+HOMEPAGE=https://github.com/cglib/cglib
+IUSE=examples source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=f030886f5368c7039b3bbd70b06fe578
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 0cd948787793..a4d13fefc3fe 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
@@ -4,10 +4,10 @@ DESCRIPTION=Annotations for type-checking by the Checker Framework
 EAPI=7
 HOMEPAGE=https://checkerframework.org/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+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://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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=11561854d18ea6ce0e895f61e3b0ae52
+_md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/cofoja-1.2 b/metadata/md5-cache/dev-java/cofoja-1.2
deleted file mode 100644
index e9d76be81b8a..000000000000
--- a/metadata/md5-cache/dev-java/cofoja-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contracts for Java
-EAPI=5
-HOMEPAGE=https://github.com/nhatminhle/cofoja
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-java/asm:4 source? ( app-arch/zip ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.2.zip -> cofoja-1.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d046f896b4e2108f6f33db0badfbd3f
diff --git a/metadata/md5-cache/dev-java/cofoja-1.3 b/metadata/md5-cache/dev-java/cofoja-1.3
deleted file mode 100644
index 6ab13e121e8b..000000000000
--- a/metadata/md5-cache/dev-java/cofoja-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Contracts for Java
-EAPI=6
-HOMEPAGE=https://github.com/nhatminhle/cofoja
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.3.tar.gz -> cofoja-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=457b766f2792edbb0bbaf208853d4401
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
deleted file mode 100644
index ad97036482a8..000000000000
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Libraries for High Performance Scientific and Technical Computing
-EAPI=5
-HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
-IUSE=source doc
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=colt
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3f0bfb487d19b49e97898d868ef08ed4
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 a3b9670689f6..d2a4610336dd 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
@@ -4,11 +4,11 @@ DESCRIPTION=Provides easy-to-use wrappers around Reflection and Introspection AP
 EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-beanutils/
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=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/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=60ecc1466242fcc09668b0b9068c6b7d
+_md5_=b818ee63d0978430ab19080ede8dc626
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 1e6bfc322e02..1da65cc0c32b 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Jakarta-Commons Collections Component
 EAPI=7
 HOMEPAGE=https://commons.apache.org/collections/
 IUSE=test doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 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=mirror://apache/commons/collections/source/commons-collections-3.2.2-src.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f9f20fb4559be9847a3e83ad02e7d10b
+_md5_=f48a8926e7069cc3e5324144276913fe
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1-r1 b/metadata/md5-cache/dev-java/commons-collections-4.1-r1
deleted file mode 100644
index 8a0dc147822c..000000000000
--- a/metadata/md5-cache/dev-java/commons-collections-4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 test? ( dev-java/easymock:3.2 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
-EAPI=7
-HOMEPAGE=https://commons.apache.org/collections/
-IUSE=test doc source
-KEYWORDS=amd64 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=4
-SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=14fa4410d2b7e56b5383d8b5d69a06d5
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4 b/metadata/md5-cache/dev-java/commons-collections-4.4
index d84647a57909..cf4827cb8e23 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Extends the JCF classes with new interfaces, implementations and uti
 EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-collections/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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=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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=8d83ea7a91d01d6ea71140bcb7fd2568
+_md5_=6b544a7a39e6ff6b3bf2d08b896e9eda
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 e34bac971d82..c63b7df28fb2 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple interface for reading and writing CSV files of various types
 EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-csv/
 IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
+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
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=24973010c3ad48b50e446d23d68a676a
+_md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.15 b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
deleted file mode 100644
index a8d3ca01ccff..000000000000
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.6 source? ( app-arch/zip ) 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 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
-EAPI=5
-HOMEPAGE=http://commons.apache.org/daemon/
-IUSE=doc examples source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58b9be14998e36bebda79881f068092c
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.1.0 b/metadata/md5-cache/dev-java/commons-daemon-1.1.0
deleted file mode 100644
index faf02a7b4e54..000000000000
--- a/metadata/md5-cache/dev-java/commons-daemon-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.6 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 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
-EAPI=6
-HOMEPAGE=https://commons.apache.org/daemon/
-IUSE=doc examples source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5888858369018071c2f68b648c4c58e6
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.2.4 b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
new file mode 100644
index 000000000000..57f3e3b7ab33
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
+IUSE=doc source
+KEYWORDS=amd64 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=mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=4f2372c98f63944ca12050021f50323c
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
deleted file mode 100644
index c9d0fcfb8a85..000000000000
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=doc examples source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a16d407129f4ee525c3e9ca54ad6cb0
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
deleted file mode 100644
index 6c51cba92c87..000000000000
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=doc examples source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2.1
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f74e7bc1cdb86a4250c995d86a2b6a19
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 37da04aad034..f1710ccfd790 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Reads XML configuration files to provide initialization of various J
 EAPI=8
 HOMEPAGE=https://commons.apache.org/digester/
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 >=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/digester/source/commons-digester-2.1-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=bc6709ee481bc344f8026af884722929
+_md5_=b7bb8f3b2a878f1cb6fe638237ebedbf
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r2 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
deleted file mode 100644
index 73a6f20c2709..000000000000
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
-EAPI=5
-HOMEPAGE=http://commons.apache.org/digester/
-IUSE=doc examples source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=3.2
-SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28f2ea2ebe2a0ea9c2cb8854c60ecca3
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 11b7038828bf..5ca157d4e3a5 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Reads XML configuration files to provide initialization of various J
 EAPI=8
 HOMEPAGE=https://commons.apache.org/digester/
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -12,4 +12,4 @@ 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=edd5105b5fc035d82a1d1a9112ab89f8
+_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 b9b2d8437673..04df9a811dc0 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=The Jakarta Commons HttpClient library
 EAPI=7
-HOMEPAGE=https://hc.apache.org/
+HOMEPAGE=https://hc.apache.org/httpclient-legacy/
 IUSE=doc examples source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=af355ce3908ab9e61c8cc573c2826f60
+_md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1 b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
deleted file mode 100644
index 2d07454be2bd..000000000000
--- a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit ) dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Expression language engine, can be embedded in applications and frameworks
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jexl/
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.0
-SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d3ceebdb90b73bacd8d04ba7ee8c3050
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
deleted file mode 100644
index 9b9f282d5782..000000000000
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/javacc-5 test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Expression language engine, can be embedded in applications and frameworks
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jexl/
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=286570409a811a1be618db0ab146fdc1
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 b232482e8fa1..01d23b0ddb06 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Commons components to manipulate core java classes
 EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-lang/
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 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=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d4d054c0f8cc1b6419568a64b3c51a16
+_md5_=af75f2cd4bd2717eb350f17cf86f845a
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r5 b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
new file mode 100644
index 000000000000..65deb7d4b301
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/tomcat-servlet-api:4.0 ) >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=An ultra-thin bridge between different Java logging libraries
+EAPI=8
+HOMEPAGE=https://commons.apache.org/logging/
+IUSE=avalon-framework avalon-logkit log4j servletapi test doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/tomcat-servlet-api:4.0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=918c02daa4d14eb92cbec4288715998c
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 12b70983805a..ec15a5653e4f 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.8.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Client-oriented Java library to implement many Internet protocols
 EAPI=7
 HOMEPAGE=https://commons.apache.org/net/
 IUSE=doc examples source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=acbf9f0a95e46eb234185f702acefd04
+_md5_=a03e165ef4bd12b97d0e7520eb7bf586
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 2d576100388c..a6b7fd2bf476 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A single API for accessing various different file systems
 EAPI=7
 HOMEPAGE=https://commons.apache.org/vfs/
 IUSE=source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c333fa4a4d8fa4a00be5d72b16cc8f5e
+_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
new file mode 100644
index 000000000000..1f4378094f5b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/slf4j-api:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Conversant Disruptor - very high throughput Java BlockingQueue
+EAPI=8
+HOMEPAGE=https://github.com/conversant/disruptor
+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://github.com/conversant/disruptor/archive/1.2.19.tar.gz -> conversant-disruptor-1.2.19.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=8c86652a19f7e1d3a012baa6933d6ea7
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
new file mode 100644
index 000000000000..9f1d513827c2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Multimedia framework for Java written by Fluendo
+EAPI=8
+HOMEPAGE=https://www.theora.org/cortado/
+KEYWORDS=amd64 ppc64 ~x86
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=774b937dbdb08aee5c5bfd6becc05493
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
deleted file mode 100644
index e23e4c10607c..000000000000
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Ant-tasks to compile various source languages and produce executables
-EAPI=7
-HOMEPAGE=http://ant-contrib.sourceforge.net/
-IUSE=doc source examples
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0c7f80e5579f66d5d0e827fbb7d5ef57
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 b50783e162fd..1f293eeaaf90 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Ant-tasks to compile various source languages and produce executable
 EAPI=8
 HOMEPAGE=http://ant-contrib.sourceforge.net/
 IUSE=doc examples source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9fb59af683c4236f2806eabb9a79b020
+_md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.25 b/metadata/md5-cache/dev-java/cssparser-0.9.25
deleted file mode 100644
index 62b09d7ca05c..000000000000
--- a/metadata/md5-cache/dev-java/cssparser-0.9.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/sac:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=API for parsing CSS 2 in Java
-EAPI=6
-HOMEPAGE=http://cssparser.sourceforge.net/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.25-sources.jar -> cssparser-0.9.25.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=421bd6d26c71e4e83ad7401739c919f1
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.26 b/metadata/md5-cache/dev-java/cssparser-0.9.26
deleted file mode 100644
index c9ede51da07d..000000000000
--- a/metadata/md5-cache/dev-java/cssparser-0.9.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/sac:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=API for parsing CSS 2 in Java
-EAPI=6
-HOMEPAGE=http://cssparser.sourceforge.net/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.26-sources.jar -> cssparser-0.9.26.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=421bd6d26c71e4e83ad7401739c919f1
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.8 b/metadata/md5-cache/dev-java/dnsjava-2.1.8
deleted file mode 100644
index bf66f8b4f759..000000000000
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An implementation of DNS in Java
-EAPI=6
-HOMEPAGE=http://www.dnsjava.org/
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b779b9ecf30d3162389462a78ebbff4
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
deleted file mode 100644
index 064112b1ea15..000000000000
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java app-arch/unzip !dev-java/eclipse-ecj:3.5[gcj] >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+native
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06b63e52ae353e4b166fd07062f2d594
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index cc915566c29f..b716a59cbc4a 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -4,11 +4,11 @@ DESCRIPTION=Eclipse Compiler for Java
 EAPI=7
 HOMEPAGE=http://www.eclipse.org/
 IUSE=+ant doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=EPL-1.0
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=1187cff0aeab2495c641ebb2caf97135
+_md5_=bc54d6cccb7d737083d2358f201bd36a
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.21 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
index f41461c6f9f7..a73da231b01f 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.21
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-11:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Eclipse Compiler for Java
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.eclipse.org/
 IUSE=+ant doc source
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=EPL-1.0
-PDEPEND=app-arch/unzip ant? ( ~dev-java/ant-eclipse-ecj-4.21 )
+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.21
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.21-202109060500/ecjsrc-4.21.jar
+SLOT=4.22
+SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=5366f9089c76975d81ebe16004626b46
+_md5_=c2b4d868f6518ff728355ffa6c0a1540
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
deleted file mode 100644
index ea15546fbace..000000000000
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-eselect/eselect-java >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.4.2 )
-RDEPEND=app-eselect/eselect-java >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.4
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a628dbffe26a2408960ed4e283a2c88
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r3 b/metadata/md5-cache/dev-java/emma-2.0.5312-r3
deleted file mode 100644
index 632268b781b3..000000000000
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Free Java code coverage tool
-EAPI=5
-HOMEPAGE=http://emma.sourceforge.net/
-IUSE=+launcher source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=CPL-1.0
-RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7d9b7eadce46b942c14f8fe015a1fa6
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 ede7b4d9e94b..a726a8a6b1bc 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -5,10 +5,10 @@ DESCRIPTION=Free Java code coverage tool
 EAPI=8
 HOMEPAGE=http://emma.sourceforge.net/
 IUSE=+launcher source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a62c0eb404d30e15c5b3367d37337193
+_md5_=c4267c86a013dd64bbab4bb5874832e5
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14 b/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14
deleted file mode 100644
index 10f6ac818dd2..000000000000
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java annotations for the Error Prone static analysis tool
-EAPI=6
-HOMEPAGE=http://errorprone.info
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-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://github.com/google/error-prone/archive/v2.0.14.tar.gz -> error-prone-2.0.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7271000e4ca075339fb51dbc70c411c7
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 5f4a9329bd24..fb0f17a6108c 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
@@ -4,10 +4,10 @@ DESCRIPTION=Java annotations for the Error Prone static analysis tool
 EAPI=7
 HOMEPAGE=http://errorprone.info
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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://codeload.github.com/google/error-prone/tar.gz/v2.7.1 -> error-prone-2.7.1.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=f615486578c5009ddb1d3c7bb60dc9d7
+_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 7eb474d729e4..a3543a78141a 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Guava's InternalFutureFailureAccess and InternalFutures classes.
 EAPI=7
 HOMEPAGE=https://github.com/google/guava/failureaccess
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=0c7fd85cfe1108c92816275de7921b09
+_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
new file mode 100644
index 000000000000..ff4eadbe9aac
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/log4j-12-api:2 >=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=Forward Error Correction library in Java
+EAPI=8
+HOMEPAGE=https://bitbucket.org/onionnetworks/
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=9f07ea1b63546ba5c9b285e82258e944
diff --git a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6 b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
deleted file mode 100644
index c3899a97b942..000000000000
--- a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Felix Bundle Repository
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6e6a5677159fe94aea78de6b95d5131
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0 b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
deleted file mode 100644
index b2cea56ecc6f..000000000000
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Felix Gogo Runtime
-EAPI=5
-HOMEPAGE=http://felix.apache.org/site/apache-felix-gogo.html
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0db63394cba36f2e7d816544d67b98cf
diff --git a/metadata/md5-cache/dev-java/felix-shell-1.4.3 b/metadata/md5-cache/dev-java/felix-shell-1.4.3
deleted file mode 100644
index 37eccb00cf92..000000000000
--- a/metadata/md5-cache/dev-java/felix-shell-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/felix-gogo-runtime:0 dev-java/felix-utils:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Felix Shell
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=726de66509aa89f3d51e22cd03826d1b
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.2.0 b/metadata/md5-cache/dev-java/felix-utils-1.2.0
deleted file mode 100644
index fb45c8571b8a..000000000000
--- a/metadata/md5-cache/dev-java/felix-utils-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Felix Utils
-EAPI=5
-HOMEPAGE=http://felix.apache.org/
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c36d676cf72362ef24e36af5eac67811
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1-r2 b/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
new file mode 100644
index 000000000000..df2c261f216f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=An open source Java library for parsing font files
+EAPI=8
+HOMEPAGE=https://pdfbox.apache.org/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=BSD
+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=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
+_eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b008a795ca06d397ab0f0d5859920bbf
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
deleted file mode 100644
index 62c6b08f268a..000000000000
--- a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Graphics 2D Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=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-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz https://github.com/freehep/freehep-chartable-converter-plugin/archive/freehep-chartable-converter-plugin-2.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=faef5e4d47c084f2b2c0ae30822995ce
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
deleted file mode 100644
index e8c4652f5e2b..000000000000
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 dev-java/freehep-io:0 >=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP GraphicsIO Base Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 dev-java/freehep-io:0 >=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-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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a38086222756915858c5033f88d4643
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
deleted file mode 100644
index 26956ca78890..000000000000
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP GraphicsIO Test Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43aceed558253c473001b76d9b9d387b
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 a149ed33adef..12147525da86 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -4,10 +4,10 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1
 DESCRIPTION=Glassfish implementation of persistence API
 EAPI=7
 HOMEPAGE=https://javaee.github.io/glassfish/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7d34b67cdbba60f34109853530235aac
+_md5_=2eda64ba01f7d0e0fdbb0489beb321e9
diff --git a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1 b/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
deleted file mode 100644
index 07a6854c2fa7..000000000000
--- a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1
-EAPI=5
-HOMEPAGE=https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html
-IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1.1
-SRC_URI=http://central.maven.org/maven2/org/glassfish/javax.servlet/3.1.1/javax.servlet-3.1.1-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=758ea5322735561666f7b30ae1c3d613
diff --git a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04-r1 b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04-r1
deleted file mode 100644
index cae915da885c..000000000000
--- a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Transaction API
-EAPI=6
-HOMEPAGE=https://glassfish.dev.java.net/
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fea49843c815497f982cdf41044884d8
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
deleted file mode 100644
index 8e3040a33e17..000000000000
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Project GlassFish XML RPC API
-EAPI=5
-HOMEPAGE=https://glassfish.java.net/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3c5a2c8cab7c937c2d95224f0887d6a0
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 b622a4b83971..c692dd3afe17 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
@@ -4,10 +4,10 @@ DESCRIPTION=Project GlassFish XML RPC API
 EAPI=8
 HOMEPAGE=https://glassfish.java.net/
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=db77785fe5f4153485140d2fc8e15c78
+_md5_=95ebc9c82e02ba2749c8d790909f4bf2
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1
deleted file mode 100644
index d7c300caad85..000000000000
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A toolkit for list transformations
-EAPI=5
-HOMEPAGE=http://www.glazedlists.com/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd7429e80100971ec78d110c3c2aa813
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
new file mode 100644
index 000000000000..9508bea21c95
--- /dev/null
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A toolkit for list transformations
+EAPI=8
+HOMEPAGE=http://www.glazedlists.com/
+IUSE=doc source
+KEYWORDS=amd64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=343c91daad959937d1630fb1d26312fb
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3
deleted file mode 100644
index d6ca8fec69cd..000000000000
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/java-getopt:1 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU regular expression package for Java
-EAPI=5
-HOMEPAGE=https://savannah.gnu.org/projects/gnu-regexp
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ec801e9989b0764ff695ac216eb95df6
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
new file mode 100644
index 000000000000..8e6f3d398bf6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/java-getopt:1 >=virtual/jdk-1.8:* source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=GNU regular expression package for Java
+EAPI=8
+HOMEPAGE=https://savannah.gnu.org/projects/gnu-regexp
+IUSE=doc source
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.2 b/metadata/md5-cache/dev-java/gradle-bin-7.2
index e0459e9eeafb..1f7919cca2cd 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -5,10 +5,10 @@ DESCRIPTION=A project automation and build tool with a Groovy based DSL
 EAPI=7
 HOMEPAGE=https://www.gradle.org/
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=6e66e2f2b2d3975e2e9a5002bb932c0c
+_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 4c222e50453e..f3e297ba853a 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=A project automation and build tool with a Groovy based DSL
 EAPI=7
 HOMEPAGE=https://www.gradle.org/
 IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=6e66e2f2b2d3975e2e9a5002bb932c0c
+_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4 b/metadata/md5-cache/dev-java/gradle-bin-7.4
new file mode 100644
index 000000000000..6cbc15bc4c53
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=7
+HOMEPAGE=https://www.gradle.org/
+IUSE=doc source
+KEYWORDS=amd64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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
new file mode 100644
index 000000000000..05cea46ce650
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=7
+HOMEPAGE=https://www.gradle.org/
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=0f343b25f25d6b6757e38b8441640127
diff --git a/metadata/md5-cache/dev-java/guava-30.1.1 b/metadata/md5-cache/dev-java/guava-30.1.1
index dcde96159863..616636856eda 100644
--- a/metadata/md5-cache/dev-java/guava-30.1.1
+++ b/metadata/md5-cache/dev-java/guava-30.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of Google's core Java libraries
 EAPI=7
 HOMEPAGE=https://github.com/google/guava
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=527bf3512a9cdf26e6edfae0fe9589de
+_md5_=b7a8182279a430660d9c84a74b18d222
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
new file mode 100644
index 000000000000..d2a0ab81714c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-core:1.3 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache HttpComponents Client
+EAPI=7
+HOMEPAGE=https://hc.apache.org/httpcomponents-client
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=279b86e5ff5b41425c74767591941362
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
new file mode 100644
index 000000000000..e0a2dba6f1d9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=compile configure preinst prepare setup
+DEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Plugins for javax.sound
+EAPI=8
+HOMEPAGE=https://icedtea.classpath.org
+IUSE=+doc
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=994a2a48b6b5c961bddb0a9e8ccda750
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
deleted file mode 100644
index 3956d05b25f7..000000000000
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Fully conforming implementation of the JRC API (specified in JSR 170 and 283)
-EAPI=5
-HOMEPAGE=http://jackrabbit.apache.org/
-IUSE=doc test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=874bdb6c4687cf0d9a0b9a536a1f6ade
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 6ce6b9f3f4db..7e65d2b97a2e 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
@@ -5,11 +5,11 @@ DESCRIPTION=Fully conforming implementation of the JRC API (specified in JSR 170
 EAPI=8
 HOMEPAGE=https://jackrabbit.apache.org/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=da3958035ba7ae27948083997e84fb80
+_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
new file mode 100644
index 000000000000..e2f3a19fa419
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* dev-java/osgi-annotation-versioning:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Generic WebDAV Library
+EAPI=7
+HOMEPAGE=http://jackrabbit.apache.org/jackrabbit-webdav/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/jackrabbit/2.21.7/jackrabbit-2.21.7-src.zip
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=6b821d6a9bfe864d64d566172bd307f7
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 3c0dc827f69b..56b4aa776c32 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Core annotations used for value types, used by Jackson data binding
 EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-annotations
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/refs/tags/jackson-annotations-2.13.0.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=ea5e6e64d6fa3df5d75558714e446780
+_md5_=2551ec34e46939d833894ebbf9ec405a
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.9.10 b/metadata/md5-cache/dev-java/jackson-annotations-2.9.10
deleted file mode 100644
index 357c42998c48..000000000000
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.9.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotations for the Java Jackson data processor
-EAPI=7
-HOMEPAGE=https://github.com/FasterXML/jackson-annotations
-IUSE=test doc source
-KEYWORDS=~amd64 ~x86
-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=2
-SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.9.10.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=f97393dcfc307b2394415bab178cf57a
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.0 b/metadata/md5-cache/dev-java/jackson-core-2.13.0
new file mode 100644
index 000000000000..ceb835048464
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.0
@@ -0,0 +1,14 @@
+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=Core Jackson processing abstractionis (Streaming API), implementation for JSON
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-core
+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://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=dd54c67639beb0ffe9c08ddb24d00c88
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.0 b/metadata/md5-cache/dev-java/jackson-databind-2.13.0
new file mode 100644
index 000000000000..f36d6323cec7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jackson-annotations-2.13.0:2 dev-java/jackson-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=General data-binding functionality for Jackson: works on core streaming API
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-databind
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 dev-java/jackson-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=980e2bd2778e782a9b511c654e34a21e
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
new file mode 100644
index 000000000000..9ab46196668f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jackson-annotations-2.13.0:2 >=dev-java/jackson-core-2.13.0:0 >=dev-java/jackson-databind-2.13.0:0 >=dev-java/stax2-api-4.2.1:0 >=dev-java/woodstox-core-6.2.7:0 >=virtual/jdk-1.8:* test? ( dev-java/jackson-module-jakarta-xmlbind:0 dev-java/jaxb-api:3 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Data format extension for Jackson
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 >=dev-java/jackson-core-2.13.0:0 >=dev-java/jackson-databind-2.13.0:0 >=dev-java/stax2-api-4.2.1:0 >=dev-java/woodstox-core-6.2.7: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/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.0.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=187634f9b166194e2748beae2bd1e441
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
new file mode 100644
index 000000000000..5ebd3f945688
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/snakeyaml:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Support for reading and writing YAML-encoded data via Jackson abstractions
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/snakeyaml: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/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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=50fae41682e4cd7316581c0ee845c0e5
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
new file mode 100644
index 000000000000..430f8bf07c32
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jackson-annotations:2 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jackson-annotations:2 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=757d3bb6596965e60ab025aede70d98b
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
new file mode 100644
index 000000000000..f68f332a8128
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=bbd2858b6558b851f985b007f9ac5f04
diff --git a/metadata/md5-cache/dev-java/jacoco-0.7.9 b/metadata/md5-cache/dev-java/jacoco-0.7.9
deleted file mode 100644
index 1bf3da48585c..000000000000
--- a/metadata/md5-cache/dev-java/jacoco-0.7.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java Code Coverage library
-EAPI=6
-HOMEPAGE=https://eclemma.org/jacoco/
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar -> jacoco-0.7.9-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.9/org.jacoco.agent-0.7.9-sources.jar -> jacoco-0.7.9-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar -> jacoco-0.7.9-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.9/org.jacoco.ant-0.7.9-sources.jar -> jacoco-0.7.9-ant.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30ca1338ad03d54e78518c304ef29f20
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 f3eccdf37e1d..102dccaead89 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Jakarta Activation
 EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jaf/jakarta.activation
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=285a61a7bd429829fb667de701a2c27e
+_md5_=7f0e440412a7e71b24a67d2a1355bcd1
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
new file mode 100644
index 000000000000..6e34b246cdce
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JSR 374 (JSON Processing) API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jsonp
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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 a8da071371c1..b35110c8dc03 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
@@ -4,10 +4,10 @@ DESCRIPTION=A set of text-processing Java classes
 EAPI=7
 HOMEPAGE=https://jakarta.apache.org/oro/
 IUSE=doc source examples
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b4c7eb184c74ea356be8721d4c425147
+_md5_=3ae2e6df0f95075b5e750e7dae925af4
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 9fd46bab9916..681ba1d2d1df 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=100% Pure Java Regular Expression package
 EAPI=8
 HOMEPAGE=https://jakarta.apache.org/
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=79cbd479eb46659257b05da35f957a48
+_md5_=4715ec34bfa34c1bcc3f2b1d512e12e1
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 b867369d2ceb..c9a7b99106f7 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 ~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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=32dd0ae4f1230622a6d44748a2fde949
+_md5_=ec5dbc96c7d63344789ddd57712f60a0
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 4d72cdb240fa..93127457da40 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=cdce6e1d797ac86462dba36fbd60315b
+_md5_=4f6cec3ec86c9e19c57456e02da5f39b
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r5 b/metadata/md5-cache/dev-java/jal-20031117-r5
deleted file mode 100644
index 25823a30ad19..000000000000
--- a/metadata/md5-cache/dev-java/jal-20031117-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Partial port of the C++ Standard Template Library
-EAPI=6
-HOMEPAGE=http://vigna.dsi.unimi.it/jal
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=HPND
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4901a412bc8debbdef1627ef2e2cfe34
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
new file mode 100644
index 000000000000..aff4d73d4da9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Partial port of the C++ Standard Template Library
+EAPI=8
+HOMEPAGE=http://vigna.dsi.unimi.it/jal
+IUSE=doc source
+KEYWORDS=amd64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c8457e8bbe91555b895391aab6235604
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 9115f2105fad..ee9eb288ba32 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Jansi is a java library for generating and interpreting ANSI escape
 EAPI=8
 HOMEPAGE=http://fusesource.github.io/jansi
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b389272940a2015158bb8c3a4ebd60c6
+_md5_=2105da837123b0bf282c3320f9f7c173
diff --git a/metadata/md5-cache/dev-java/jargs-1.0 b/metadata/md5-cache/dev-java/jargs-1.0
deleted file mode 100644
index d3d7381c65e4..000000000000
--- a/metadata/md5-cache/dev-java/jargs-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Command-line argument parsing library in Java
-EAPI=5
-HOMEPAGE=https://github.com/purcell/jargs
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jargs/jargs-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51675f9ee4eba29a5f3d82f71cd21212
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 2837ef919e43..ed5de9038b82 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	242601d395f54f27cfbc76e53f5e0203	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	d540d96908dd5622f3dfa41d167e632d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	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 47710bc7d3cd..92f70f955f86 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	242601d395f54f27cfbc76e53f5e0203	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	d540d96908dd5622f3dfa41d167e632d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=693418d0d3741cb4a5cd4e3af0c754db
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 9ec57d75e12c..ab37382ebfa1 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
@@ -4,11 +4,11 @@ DESCRIPTION=A wrapper that makes it possible to install a Java Application as da
 EAPI=7
 HOMEPAGE=http://wrapper.tanukisoftware.org/
 IUSE=doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=tanuki-community
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c0d016bb4392b72627dad9f4dc761472
+_md5_=d0aeb80cc4cce8db41bbe12cbbc97a9b
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r3 b/metadata/md5-cache/dev-java/javacc-5.0-r3
deleted file mode 100644
index 18b098b19945..000000000000
--- a/metadata/md5-cache/dev-java/javacc-5.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
-EAPI=6
-HOMEPAGE=https://javacc.java.net/
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7829ff12c4a05299f8a19fd8052b8fe
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index ebc1a9cf9c26..0e731a4e587f 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
 EAPI=8
 HOMEPAGE=https://javacc.java.net/
 IUSE=doc examples source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0d8774bc71e0355e904c2a0ac7cbe4ad
+_md5_=264abd75d63f97cc128ab86ab0d73c6c
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index 705b86d8ac1a..accc9bd37f8c 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	242601d395f54f27cfbc76e53f5e0203	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	d540d96908dd5622f3dfa41d167e632d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	bcd408f1e4a9669198ef4dfcd5ab8696	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=977e58e26a42f43779fa46207e038d56
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r2 b/metadata/md5-cache/dev-java/javax-inject-1-r2
deleted file mode 100644
index c372b284ed2b..000000000000
--- a/metadata/md5-cache/dev-java/javax-inject-1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dependency injection for Java (JSR-330)
-EAPI=5
-HOMEPAGE=https://github.com/javax-inject/javax-inject
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=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
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ae09ebc27576938298f08ca92a63cf98
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r3 b/metadata/md5-cache/dev-java/javax-inject-1-r3
deleted file mode 100644
index 2005ba7e1924..000000000000
--- a/metadata/md5-cache/dev-java/javax-inject-1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Dependency injection for Java (JSR-330)
-EAPI=6
-HOMEPAGE=https://github.com/javax-inject/javax-inject
-IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e663420209307cccb2a879acde7fa15
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index 8192aaa5d3e9..0269df08b11c 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Dependency injection for Java (JSR-330)
 EAPI=8
 HOMEPAGE=https://github.com/javax-inject/javax-inject
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=08c68152ecccbcd03bfcf4f2ccf44677
+_md5_=65390d955ab9d7d019e9ca0305497eb4
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.2-r1 b/metadata/md5-cache/dev-java/javax-mail-1.6.2-r1
deleted file mode 100644
index be40da625d9d..000000000000
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jakarta-activation-api:1 dev-java/jakarta-activation:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=JavaMail API
-EAPI=8
-HOMEPAGE=https://javaee.github.io/javamail/
-IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( CDDL GPL-2-with-classpath-exception )
-RDEPEND=dev-java/jakarta-activation-api:1 dev-java/jakarta-activation:2 >=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/javaee/javamail/archive/refs/tags/JAVAMAIL-1_6_2.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=2338763198fcbf7dcca1c097829ea6b9
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 fb72261e62dd..76b534e4a6a5 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=Jakarta Mail API
 EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/mail/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b48139ee084838c87dcf20e8bc9724bc
+_md5_=20ad40d9565ec43093111b31e7af7429
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 e6eb4e061c32..2d0d2acfa152 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Jakarta XML Binding API
 EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=51a84baeeefbf9931c40b0c76f8de9bb
+_md5_=aebe6e2b7893c07ad3386163ff6bbb1d
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
new file mode 100644
index 000000000000..ad1c09e8e8b8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JSR-000914: Java(TM) Message Service (JMS) 1.1 API
+EAPI=8
+HOMEPAGE=https://github.com/jboss/jboss-jms-api_spec
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
deleted file mode 100644
index 71c9fff195e5..000000000000
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jgoodies-looks:2.6 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java date chooser bean for graphically picking a date
-EAPI=5
-HOMEPAGE=http://www.toedter.com/en/jcalendar/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.2
-SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3794a92463f8704139567c381e170be9
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
new file mode 100644
index 000000000000..e7c11b1d5868
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/jgoodies-looks:2.6 >=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=Java date chooser bean for graphically picking a date
+EAPI=8
+HOMEPAGE=https://www.toedter.com/en/jcalendar/
+IUSE=doc source
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.2
+SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
+_eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2 b/metadata/md5-cache/dev-java/jchart2d-3.2.2
deleted file mode 100644
index 9472989343cf..000000000000
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A minimalistic realtime charting library for Java
-EAPI=5
-HOMEPAGE=http://jchart2d.sourceforge.net
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=893245b4f3d4480fd82b0dc3d00f1ab4
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
new file mode 100644
index 000000000000..0697cfc42fb2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A minimalistic realtime charting library for Java
+EAPI=8
+HOMEPAGE=http://jchart2d.sourceforge.net
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=8ee1afeba3f37c7129584659dbe505fb
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.17-r2 b/metadata/md5-cache/dev-java/jcifs-1.3.17-r2
deleted file mode 100644
index bf2b8096468b..000000000000
--- a/metadata/md5-cache/dev-java/jcifs-1.3.17-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=java-virtuals/servlet-api:3.0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library that implements the CIFS/SMB networking protocol in Java
-EAPI=6
-HOMEPAGE=https://jcifs.samba.org/
-IUSE=doc examples source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=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.17.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6a1f44f09d51ec1db6e7c5e2934f3ab
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 81a9ba8f2d51..9eb332a67035 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library that implements the CIFS/SMB networking protocol in Java
 EAPI=8
 HOMEPAGE=https://jcifs.samba.org/
 IUSE=doc examples source
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=880cb9be61ad3147f0d433ef9fe971e2
+_md5_=f0e312c2ab9d25d016eacd88a6b13b99
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
new file mode 100644
index 000000000000..457d8533d78b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -0,0 +1,13 @@
+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 ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Java bytecode viewer
+EAPI=8
+HOMEPAGE=https://github.com/ingokegel/jclasslib
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
+_eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=fa24853d432a3dec99eec1f8d4063df2
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
deleted file mode 100644
index 139500ad8129..000000000000
--- a/metadata/md5-cache/dev-java/jcommander-1.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Command line parsing framework for Java
-EAPI=5
-HOMEPAGE=https://github.com/cbeust/jcommander
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6069df63d440b5771994188d3f580edf
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48-r1 b/metadata/md5-cache/dev-java/jcommander-1.48-r1
index 754cdaff2bef..c638c97ec48e 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48-r1
+++ b/metadata/md5-cache/dev-java/jcommander-1.48-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Command line parsing framework for Java
 EAPI=8
 HOMEPAGE=https://github.com/cbeust/jcommander
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=f5051ab2868b385e3b320dcb0f2ba3ee
+_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
new file mode 100644
index 000000000000..dab3e5117d85
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jctools-core-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Concurrency Tools Core Library
+EAPI=8
+HOMEPAGE=https://jctools.github.io/JCTools/
+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://github.com/JCTools/JCTools/archive/v2.0.2.tar.gz -> jctools-core-2.0.2.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c7a5338e2727cef828458d6f2a6f0f9a
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 3a901f4871e0..9b2a00239ae7 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -4,10 +4,10 @@ DESCRIPTION=Traverses Java class file directories and generates design quality m
 EAPI=8
 HOMEPAGE=https://github.com/clarkware/jdepend
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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/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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4b772e9855f252bbca1b4bde1b146f9b
+_md5_=c37d437ac9e15bc146c5c4121ee25b7f
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r6 b/metadata/md5-cache/dev-java/jdepend-2.9-r6
deleted file mode 100644
index 8da50741f3bc..000000000000
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=app-arch/unzip-5.50-r1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Traverses Java class file directories and generates design quality metrics
-EAPI=5
-HOMEPAGE=http://www.clarkware.com/software/JDepend.html
-IUSE=doc source
-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/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d88608e04ff14df2b33ea8a420807c3
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
new file mode 100644
index 000000000000..e8b0b54a0790
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jnacl:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Pure Java implementation of libzmq
+EAPI=8
+HOMEPAGE=https://github.com/zeromq/jeromq
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=MPL-2.0
+PROPERTIES=test_network
+RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
deleted file mode 100644
index d693892b9933..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JGoodies Common Library
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.8
-SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f92f43970c38260f147bda10babfbc98
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
new file mode 100644
index 000000000000..fe203ea0f3c7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=app-arch/unzip >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JGoodies Common Library
+EAPI=8
+HOMEPAGE=http://www.jgoodies.com/
+IUSE=doc source
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.8
+SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=d52a14c07ec78008e65c2d3c455d6c4a
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
new file mode 100644
index 000000000000..a959bf2a8122
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -0,0 +1,14 @@
+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=Pure Java implementation of NaCl: Networking and Cryptography library
+EAPI=8
+HOMEPAGE=https://github.com/neilalexander/jnacl
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnlp-api-6.0.18 b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
deleted file mode 100644
index 1dbd60ee3393..000000000000
--- a/metadata/md5-cache/dev-java/jnlp-api-6.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JNLP API classes, repackaged from the icedtea-web fork of netx
-EAPI=7
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=56
-IUSE=source source
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~caster/distfiles/jnlp-api-6.0.18.tar.bz2
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=5f3427bd6e210ef73f0f398e6af08f6b
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
index c101f49f2289..4610f0f9c5d8 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:20 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Library to convert Objects to and from String
 EAPI=8
 HOMEPAGE=https://www.joda.org/joda-convert/
@@ -9,6 +9,6 @@ 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/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b34c9cf7b8838d842d95ef3cdaffdb93
+_md5_=90f25a6747bfcdf02a0ebd8f6afea1f6
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16 b/metadata/md5-cache/dev-java/jol-core-0.16
new file mode 100644
index 000000000000..a4bdc22dd83e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jol-core-0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/asm:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Object Layout: Core
+EAPI=8
+HOMEPAGE=https://openjdk.java.net/projects/code-tools/jol/
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=GPL-2-with-classpath-exception
+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/openjdk/jol/archive/refs/tags/0.16.tar.gz -> jol-0.16.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=f1293deef1eb2b45257a37d77a13a82b
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6 b/metadata/md5-cache/dev-java/jopt-simple-4.6
deleted file mode 100644
index 7453a40416f7..000000000000
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=6
-HOMEPAGE=https://pholser.github.com/jopt-simple/
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.6
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.6 -> jopt-simple-4.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bfddbc0570ad6b9ff08047d2e9366fea
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 75accccaa73b..0d68948efd51 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Java library for parsing command line options
 EAPI=8
 HOMEPAGE=https://jopt-simple.github.io/jopt-simple/
 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=4.6
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-4.6.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=eca338dee7b267834a89f7c1a76c59b3
+_md5_=cb1cf225df2f3ad0086821dc8845f118
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
new file mode 100644
index 000000000000..443f2fac3c3f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=JRobin is a 100% pure Java alternative to RRDTool
+EAPI=8
+HOMEPAGE=https://github.com/OpenNMS/jrobin
+IUSE=doc source test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=ef886b35ec6ae27db2d90257dd6287d9
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.54 b/metadata/md5-cache/dev-java/jsch-0.1.54
deleted file mode 100644
index ec52d16925ce..000000000000
--- a/metadata/md5-cache/dev-java/jsch-0.1.54
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=zlib? ( dev-java/jzlib:0 ) app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=JSch is a pure Java implementation of SSH2
-EAPI=6
-HOMEPAGE=http://www.jcraft.com/jsch/
-IUSE=zlib doc source examples
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=zlib? ( dev-java/jzlib:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jsch/jsch-0.1.54.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c16b10dd028b426d1bea51c10740f753
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.54-r1 b/metadata/md5-cache/dev-java/jsch-0.1.54-r1
deleted file mode 100644
index 9aaf38d6fd19..000000000000
--- a/metadata/md5-cache/dev-java/jsch-0.1.54-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=zlib? ( dev-java/jzlib: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=JSch is a pure Java implementation of SSH2
-EAPI=8
-HOMEPAGE=http://www.jcraft.com/jsch/
-IUSE=zlib doc source examples
-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=zlib? ( dev-java/jzlib: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.54.zip
-_eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-osgi	6089d1c0f617fc9f3fe1ed559f9c22a4	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fb43e5497569339f07d03b32690d4404
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 092ba3518f98..94fe509b75d0 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -5,10 +5,10 @@ DESCRIPTION=JSch is a pure Java implementation of SSH2
 EAPI=8
 HOMEPAGE=http://www.jcraft.com/jsch/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b5d594a71089d21c416cd99b3c75a30f
+_md5_=3c67018e37f64ad1b88f0747698b03d1
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r2 b/metadata/md5-cache/dev-java/jsr223-1.0-r2
deleted file mode 100644
index acff5a1e2962..000000000000
--- a/metadata/md5-cache/dev-java/jsr223-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Scripting for the Java(TM) Platform
-EAPI=5
-HOMEPAGE=http://jcp.org/en/jsr/detail?id=223
-IUSE=source doc
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65613ae5136184e9a06c9597b6a110d6
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1 b/metadata/md5-cache/dev-java/jtds-1.3.1
deleted file mode 100644
index d72a07e0903d..000000000000
--- a/metadata/md5-cache/dev-java/jtds-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jcifs:1.1 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=jTDS - SQL Server and Sybase JDBC driver
-EAPI=5
-HOMEPAGE=http://jtds.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.3
-SRC_URI=mirror://sourceforge/jtds/jtds-1.3.1-src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=030b7a142a76c3d231cb046bdaff53d6
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
new file mode 100644
index 000000000000..f7b590bdc032
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jcifs:1.1 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=jTDS - SQL Server and Sybase JDBC driver
+EAPI=8
+HOMEPAGE=http://jtds.sourceforge.net
+IUSE=doc source
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0 b/metadata/md5-cache/dev-java/jtidy-1.0
deleted file mode 100644
index 60399d113ed4..000000000000
--- a/metadata/md5-cache/dev-java/jtidy-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
-EAPI=5
-HOMEPAGE=http://jtidy.sourceforge.net/
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=HTML-Tidy W3C
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jtidy/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=520505db054e83f36b44f002f2dd3c9c
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
new file mode 100644
index 000000000000..2cf638014f45
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
+EAPI=8
+HOMEPAGE=http://jtidy.sourceforge.net/
+IUSE=doc source
+KEYWORDS=amd64 ppc64 x86
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
deleted file mode 100644
index 8ec49e6b3e84..000000000000
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:4 test? ( dev-java/ant-junit:0 ) source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=5
-HOMEPAGE=http://www.clarkware.com/software/JUnitPerf.html
-IUSE=doc test source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-java/junit:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e33e4d45c078704d9a755658b782eb1
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 d9a50f64413d..7e2ce6c9fa44 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	7ee47726753a2bd062a05f6643d849da	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 10e82abfaa8d..3d0c44880117 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
 EAPI=7
 HOMEPAGE=http://www.jcraft.com/jzlib/
 IUSE=examples source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=9a7d570cbda5cf72b6e2bdfbac427a6d
+_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
new file mode 100644
index 000000000000..d05d97ed2c31
--- /dev/null
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-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 )
+DESCRIPTION=Apache Kafka distributed event streaming platform
+EAPI=8
+HOMEPAGE=https://kafka.apache.org/
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r2 b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r2
deleted file mode 100644
index 5b1d9683c408..000000000000
--- a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Kunststoff look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://www.incors.org/archive
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.incors.org/archive/kunststoff-2_0_2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58dfecf9f6adfdae58fc8dcbeb3153bd
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
deleted file mode 100644
index 3b4136235bdd..000000000000
--- a/metadata/md5-cache/dev-java/kxml-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xpp3:0 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Small XML Pull Parser
-EAPI=5
-HOMEPAGE=http://kxml.org/
-IUSE=doc examples source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7c066dba1d92c3e7a4749ad3fe5846c
diff --git a/metadata/md5-cache/dev-java/laf-plugin-0.2-r2 b/metadata/md5-cache/dev-java/laf-plugin-0.2-r2
deleted file mode 100644
index 2e57ee717fd5..000000000000
--- a/metadata/md5-cache/dev-java/laf-plugin-0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://laf-plugin.dev.java.net/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/laf-plugin-0.2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a480665e52e2a435e601a2a2a66e9ca
diff --git a/metadata/md5-cache/dev-java/laf-plugin-1.1-r1 b/metadata/md5-cache/dev-java/laf-plugin-1.1-r1
deleted file mode 100644
index 1d95039546eb..000000000000
--- a/metadata/md5-cache/dev-java/laf-plugin-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/nanoxml:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Look'n'feel Java library
-EAPI=6
-HOMEPAGE=http://laf-plugin.dev.java.net
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/nanoxml:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://repo1.maven.org/maven2/net/java/dev/laf-plugin/laf-plugin/1.1/laf-plugin-1.1-sources.jar -> laf-plugin-1.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97c9d4d6d9052a380d2d731e13827f4f
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.8.0 b/metadata/md5-cache/dev-java/leiningen-bin-2.8.0
deleted file mode 100644
index 7e90977e03e7..000000000000
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.8.0/leiningen-2.8.0-standalone.zip -> leiningen-2.8.0-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.8.0/bin/lein-pkg -> leiningen-2.8.0.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d94cddc5e0821d58898e6285d80fbf99
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.8.1 b/metadata/md5-cache/dev-java/leiningen-bin-2.8.1
deleted file mode 100644
index 2e3a9b1f5359..000000000000
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.8.1/leiningen-2.8.1-standalone.zip -> leiningen-2.8.1-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.8.1/bin/lein-pkg -> leiningen-2.8.1.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fad8a0b9fec71e699baf3e787ad4fcee
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.8.3 b/metadata/md5-cache/dev-java/leiningen-bin-2.8.3
deleted file mode 100644
index 4dcbe236937c..000000000000
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=EPL-1.0
-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.8.3/leiningen-2.8.3-standalone.zip -> leiningen-2.8.3-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.8.3/bin/lein-pkg -> leiningen-2.8.3.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f93e1021acc8098d3b2d5b32c6f3a9f7
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 eebd8c4059d4..1821e381a367 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Lots of small utilities for bndlib, a swiss army knife for OSGi
 EAPI=7
 HOMEPAGE=https://bnd.bndtools.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7883b82aab2e963b1858a7ad4ac3ea03
+_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
new file mode 100644
index 000000000000..8ee4f7ca84b6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -0,0 +1,14 @@
+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=A High Performance Inter-Thread Messaging Library
+EAPI=8
+HOMEPAGE=https://lmax-exchange.github.io/disruptor/
+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://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=d0063608d73b32d09af4e0e9aa228d3c
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
new file mode 100644
index 000000000000..727e5b2595a5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jdk-1.8:* dev-java/jboss-jms-api:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=The Apache Log4j 1.x Compatibility API
+EAPI=8
+HOMEPAGE=https://logging.apache.org/log4j/2.x/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=ecdab9fad700d6656a6beeeacac57881
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.15.0 b/metadata/md5-cache/dev-java/log4j-api-2.17.1
index 58653593e4f5..78b5a2678980 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.15.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* dev-java/osgi-core-api:0 dev-java/log4j-api-java9:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=The Apache Log4j API
 EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz
+SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b1a8b1175f2555151fe86466e044bf12
+_md5_=3769b1a7bd3476092fffbe442ca691c6
diff --git a/metadata/md5-cache/dev-java/log4j-api-java9-2.15.0 b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
index 228d57f5d4f1..2717731221ca 100644
--- a/metadata/md5-cache/dev-java/log4j-api-java9-2.15.0
+++ b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=The Apache Log4j API (Java 9)
 EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz
+SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=75ceb4d09ab3c4015915dec3044b83a7
+_md5_=8f7f014fa669e6e688b19dc0b718967e
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
new file mode 100644
index 000000000000..c6a9863afca4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.1:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jboss-jms-api:1.1 dev-java/osgi-core-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=The Apache Log4j Implementation
+EAPI=8
+HOMEPAGE=https://logging.apache.org/log4j/2.x/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.1:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=63369c42dc76716d64ae8d01666d5917
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
new file mode 100644
index 000000000000..30fd6345edec
--- /dev/null
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/javacc:0 virtual/jdk:1.8 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
+EAPI=8
+HOMEPAGE=https://lucene.apache.org
+IUSE=doc source test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0d5ebd095f71058ca68a13d8fb06d737
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2-r2 b/metadata/md5-cache/dev-java/lucene-3.6.2-r2
deleted file mode 100644
index 9f4d1fd7c092..000000000000
--- a/metadata/md5-cache/dev-java/lucene-3.6.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=doc source test contrib
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.6
-SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce94c6017e2d710917103fd75d8b415f
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
new file mode 100644
index 000000000000..65572a7aa182
--- /dev/null
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/mvel:2.3 dev-libs/xxhash test? ( dev-java/junit:4 !ppc64? ( dev-java/randomized-runner:0 ) ) app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=LZ4 compression for Java
+EAPI=8
+HOMEPAGE=https://github.com/lz4/lz4-java
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.10 b/metadata/md5-cache/dev-java/mchange-commons-0.2.10
deleted file mode 100644
index bdb6a676d324..000000000000
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 app-arch/zip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=a library of arguably useful Java utilities
-EAPI=5
-HOMEPAGE=https://github.com/swaldman/mchange-commons-java
-IUSE=doc source doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=CDDL
-RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/mchange-commons-java-0.2.10.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1644232f23d99cbe43ad579f5a966c6b
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.10-r1 b/metadata/md5-cache/dev-java/mchange-commons-0.2.10-r1
index bd39356785e7..bf32edc0cf3b 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.10-r1
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a library of arguably useful Java utilities
 EAPI=8
 HOMEPAGE=https://github.com/swaldman/mchange-commons-java
 IUSE=doc source doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=CDDL
 RDEPEND=dev-java/log4j:0 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/mchange-commons-java-0.2.10.tar.gz -> mchange-commons-0.2.10.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=158610c830c155e62c7e4b544ac28534
+_md5_=7029e3078aa65bef4babbd843ffc5ce5
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
new file mode 100644
index 000000000000..da7079be0082
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=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/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=a library of arguably useful Java utilities.
+EAPI=8
+HOMEPAGE=https://github.com/swaldman/mchange-commons-java
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c7c5f57f60787fdd149291994cde6656
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
deleted file mode 100644
index 4c609e4776f5..000000000000
--- a/metadata/md5-cache/dev-java/metainf-services-1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Generates META-INF/services files automatically
-EAPI=5
-HOMEPAGE=http://metainf-services.kohsuke.org/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e92fec7a8b8f14f72930580076fb96a
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7-r1 b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
new file mode 100644
index 000000000000..eaaaccec99ce
--- /dev/null
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Generates META-INF/services files automatically
+EAPI=8
+HOMEPAGE=http://metainf-services.kohsuke.org/
+KEYWORDS=amd64 x86
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=d7b5cd9746772f19122b9cd09a35982e
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
new file mode 100644
index 000000000000..5ea591d10fc6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Swing components for date operations and palettes
+EAPI=8
+HOMEPAGE=https://github.com/tdbear/microba
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=84850ba57d8c9243e1748dd0e83ad36e
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.0 b/metadata/md5-cache/dev-java/mill-bin-0.10.0
index ae4e436f55ab..2df69076a537 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.0
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.0/0.10.0-assembly -> mill-bin-0.10.0
-_md5_=2b4d4ada0013d7b03d498570ab932074
+_md5_=3a6ba799e376fdf7242adbdd130f301a
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.1 b/metadata/md5-cache/dev-java/mill-bin-0.10.1
new file mode 100644
index 000000000000..3485b6906caf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.1
@@ -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.1/0.10.1-assembly -> mill-bin-0.10.1
+_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
new file mode 100644
index 000000000000..ced74b9570ea
--- /dev/null
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
+EAPI=8
+HOMEPAGE=https://msv.java.net/
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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 3ecdef44e13b..992035b1f080 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=MVFLEX Expression Language
 EAPI=8
 HOMEPAGE=https://github.com/mvel/mvel
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+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=2.3
 SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=9e626137a4d6833d93f6acf9cb39dd8d
+_md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/myfaces-api-2.2.14 b/metadata/md5-cache/dev-java/myfaces-api-2.2.14
deleted file mode 100644
index 79adee37076a..000000000000
--- a/metadata/md5-cache/dev-java/myfaces-api-2.2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0 dev-java/validation-api:1.0 dev-java/tomcat-servlet-api:3.0 dev-java/myfaces-builder-annotations:0 >=virtual/jdk-1.8 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MyFaces API - Core package
-EAPI=7
-HOMEPAGE=https://myfaces.apache.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0 dev-java/validation-api:1.0 dev-java/tomcat-servlet-api:3.0 dev-java/myfaces-builder-annotations: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/org/apache/myfaces/core/myfaces-api/2.2.14/myfaces-api-2.2.14-sources.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=e0d64ec194cc2981c5143cac75a28651
diff --git a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9 b/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
deleted file mode 100644
index 55d4a23c1278..000000000000
--- a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MyFaces API - Builder annotations package
-EAPI=5
-HOMEPAGE=http://myfaces.apache.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/myfaces-builder-annotations/1.0.9/myfaces-builder-annotations-1.0.9-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca97f0a8ca4c5d457592ca3f1e44b31a
diff --git a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r4 b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r4
deleted file mode 100644
index 1dce3eea801c..000000000000
--- a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/sax:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=NanoXML is a small non-validating parser for Java
-EAPI=6
-HOMEPAGE=http://nanoxml.sourceforge.net/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ZLIB
-RDEPEND=dev-java/sax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/NanoXML-2.2.3.tar.gz/357c7136417ea996cf714278ea84f2df/NanoXML-2.2.3.tar.gz -> nanoxml-2.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c16744da6d86ecbb2d828ae4caf4bc91
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
new file mode 100644
index 000000000000..7096a7dc6dff
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 virtual/jdk:1.8 test? ( dev-java/asm:4 dev-java/cglib:3 dev-java/easymock:3.2 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 dev-java/objenesis:0 dev-java/slf4j-simple:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Async event-driven framework for high performance network applications
+EAPI=8
+HOMEPAGE=https://netty.io/
+IUSE=test doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api: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/netty/netty/archive/netty-4.0.36.Final.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=4d89d1a2f2c46944888f67cd1cb9e434
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 81e35a6ff1be..6cb52331172f 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
@@ -4,11 +4,11 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=7
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 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	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=eebbb530a80517c3ee0dd9a17867cdff
+_md5_=cb0a159682ef6e671edbed9bc269c861
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 4ff4693a422e..779001a26969 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
 DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
+EAPI=7
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 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	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-vm-2	17023d02489084b3fad787af43425844	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=3157013dca05c514d0da16b02028e924
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c8765ca9892cc67510f9c07f15004765
diff --git a/metadata/md5-cache/dev-java/openjdk-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-8.322_p06
index 69d9973efb8d..4511ff1b9b96 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-8.322_p06
@@ -5,11 +5,11 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=7
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config 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	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5f51397d74b7c168c6572a6c5d7bc2b8
+_md5_=a01243da1cf44347c004b959cae6fcae
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
index 7a0dfa48986a..7f3b5c338211 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
 EAPI=8
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz ) ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz )
 _eclasses_=java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=4222c1fb68f0d58531f747c4f748121a
+_md5_=b007934ca6d5ffa648f5c2093dae67f4
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
index 96b367c93126..67956ccc6a23 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
 EAPI=8
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz ) ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz )
 _eclasses_=java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8e866602eeffa90b1650e990e4b6abee
+_md5_=80838340070863fc981500a5ecd0be01
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06
index 57401dba8b50..dde494976d75 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
 EAPI=8
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs strip
 SLOT=8
-SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz )
+SRC_URI=arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz ) arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz )
 _eclasses_=java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=fdbf6aa596fee8945938675e8a2494b7
+_md5_=a89f1085c4c5c42a30e6d904b449dda6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9
index 0b4b61416bbd..15cec3f71136 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
 EAPI=8
 HOMEPAGE=https://adoptopenjdk.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9/OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz )
 _eclasses_=java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=01bf5daeddfc5c79a7e688ce1ec90cf9
+_md5_=fa0214c158eeb8848087e463f57de08c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
index 0044fc3d7f59..6b92aa02c922 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
 EAPI=8
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz )
 _eclasses_=java-vm-2	17023d02489084b3fad787af43425844	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ba60498a19a073949d6bbf7974652ad4
+_md5_=08f8743e7eba2c2c9d5ca5bd87b1d761
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 c08fbcbf6e4f..d246460feb1e 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
@@ -5,10 +5,10 @@ DESCRIPTION=OSGi Service Platform Compendium API (Companion Code)
 EAPI=7
 HOMEPAGE=http://wiki.osgi.org/wiki/Release_4.3
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=0994953660b0b585db5d85a417bedf7e
+_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 7165dd1c88c3..5e1095959e8b 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
@@ -4,10 +4,10 @@ DESCRIPTION=OSGi Service Platform Core API (Companion Code)
 EAPI=8
 HOMEPAGE=http://www.osgi.org/Specifications/HomePage
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=3ecf23bb9e771b66af729cc2e6ea1976
+_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 393215e1f5db..05363b670535 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
@@ -4,11 +4,11 @@ DESCRIPTION=OSGi Enterprise Release 5 Companion Code
 EAPI=7
 HOMEPAGE=http://www.osgi.org/Main/HomePage
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=bd58de3cdc9ad02000f2fa4bde65fdf5
+_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 e5bd02d68ee4..20a3dbe15562 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
@@ -4,10 +4,10 @@ DESCRIPTION=OSGi R4 Foundation EE by Apache Felix
 EAPI=7
 HOMEPAGE=http://felix.apache.org/
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8f97e3284663b8d93c35713eb45662ed
+_md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/osgi-obr-1.0.2 b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
deleted file mode 100644
index f2ba540a4d37..000000000000
--- a/metadata/md5-cache/dev-java/osgi-obr-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/osgi-core-api:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=OSGi Service OBR by Apache
-EAPI=5
-HOMEPAGE=http://felix.apache.org
-IUSE=doc source
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c79dc7b9f79b2a007e3400919d5c5f6
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.2 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 461914d7a806..b144c4ed8af2 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.2
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -1,14 +1,14 @@
 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=Java command line parser with both an annotations API and a programmatic API
-EAPI=7
-HOMEPAGE=http://picocli.info
+EAPI=8
+HOMEPAGE=https://picocli.info
 IUSE=doc source test
 KEYWORDS=amd64 ~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
+RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/remkop/picocli/archive/refs/tags/v4.6.2.tar.gz -> picocli-4.6.2-sources.tar.gz
+SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=0b3d91c8849cd562b5c8890133f8027d
+_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 6cadab507b79..a7ef6c272d30 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=The class loader framework of the Plexus project
 EAPI=7
 HOMEPAGE=https://github.com/codehaus
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=codehaus-classworlds
 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=362af8c606f59aa6d406ff13ac71ecb8
+_md5_=f5be57cb43c766cedbf3913f56dcc9f5
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.0 b/metadata/md5-cache/dev-java/protobuf-java-3.17.0
deleted file mode 100644
index 23a496dee8f3..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.17.0 >=virtual/jdk-1.8:*
-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=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-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.0.tar.gz -> protobuf-3.17.0.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.1 b/metadata/md5-cache/dev-java/protobuf-java-3.17.1
deleted file mode 100644
index 4ee62627543a..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.17.1 >=virtual/jdk-1.8:*
-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=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-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.1.tar.gz -> protobuf-3.17.1.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.2 b/metadata/md5-cache/dev-java/protobuf-java-3.17.2
deleted file mode 100644
index 2839302e7efa..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.17.2 >=virtual/jdk-1.8:*
-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=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-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.2.tar.gz -> protobuf-3.17.2.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.1 b/metadata/md5-cache/dev-java/protobuf-java-3.19.1
deleted file mode 100644
index acaf45a3b68b..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.19.1 >=virtual/jdk-1.8:*
-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=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-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.1.tar.gz -> protobuf-3.19.1.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=bb21606654cf5b7e906c19778f201a59
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 f5c10362da6a..97fa8e8feb87 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.8
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.7.8
@@ -4,11 +4,11 @@ DESCRIPTION=JUnit test runner and plugins for running JUnit tests with pseudo-ra
 EAPI=7
 HOMEPAGE=https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=c65ed18e501f659f02cfcce3d0d71a01
+_md5_=7a1299c01a6bc42fbdaccbfd314fe9a8
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 461340c4f4d2..a863858dbd98 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.10-r1
+++ b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Java runtime metadata analysis
 EAPI=6
 HOMEPAGE=https://github.com/ronmamo/reflections
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5177b7fd2989fdd94504bd53e40c0a27
+_md5_=3050442ece8cfcbbf6173ca3b3351ef6
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
new file mode 100644
index 000000000000..e8fbd38f7513
--- /dev/null
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/emma:0 dev-java/jakarta-xml-soap-api:1 dev-java/jmh-core:0 dev-java/hamcrest-core:1.3 dev-java/snakeyaml:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+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
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=44567572e50a86e134f94f9d3d95f96c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
new file mode 100644
index 000000000000..c9877557d2ce
--- /dev/null
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jdom:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
+DESCRIPTION=Java framework for RSS and Atom feeds
+EAPI=8
+HOMEPAGE=https://rometools.github.io/rome/
+IUSE=doc source test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gentoo/rome-0.9.zip
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=35ada415789e7adfc78c6e97772e6939
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
deleted file mode 100644
index 7d40aec132f4..000000000000
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 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 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Native lib providing serial and parallel communication for Java
-EAPI=5
-HOMEPAGE=http://rxtx.qbang.org/
-IUSE=lfd doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/jre-1.6 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	6cc26735fa9dd59e8c62880beda05b6e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee4fe8629da11f3da5dfc28e39efe4f2
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
new file mode 100644
index 000000000000..657158e18c3c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -0,0 +1,14 @@
+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
+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
+EAPI=8
+HOMEPAGE=http://rxtx.qbang.org/
+IUSE=lfd doc source
+KEYWORDS=amd64 x86
+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	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=625c67cac350aab0cd4d989cb074031f
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r2 b/metadata/md5-cache/dev-java/sac-1.3-r2
deleted file mode 100644
index 3bc7a17e5c84..000000000000
--- a/metadata/md5-cache/dev-java/sac-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/zip >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAC is a standard interface for CSS parser
-EAPI=5
-HOMEPAGE=http://www.w3.org/Style/CSS/SAC/
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=W3C
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e542c9209f9b1c4cae9d9358b6fd0458
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index b0c840156c22..c2a7e92accb3 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -5,10 +5,10 @@ DESCRIPTION=SAC is a standard interface for CSS parser
 EAPI=8
 HOMEPAGE=https://www.w3.org/Style/CSS/SAC/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=24e6969a75ed065ff695031eb5132d1f
+_md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r3 b/metadata/md5-cache/dev-java/sax-2.2.1-r3
deleted file mode 100644
index fd111ab81d1e..000000000000
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SAX: Simple API for XML in Java
-EAPI=5
-HOMEPAGE=http://sax.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2958c4ecbd092a37b39ae5362a90ee82
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 3079a8001763..438370046081 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -5,10 +5,10 @@ DESCRIPTION=SAX: Simple API for XML in Java
 EAPI=8
 HOMEPAGE=http://sax.sourceforge.net/
 IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=487b0aa51f0230f386a08507e25ce318
+_md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
new file mode 100644
index 000000000000..b330ab556ce1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/jdom:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Set of tools for processing XML documents
+EAPI=8
+HOMEPAGE=http://saxon.sourceforge.net/
+IUSE=doc examples source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=b7aa80ccf30684be71a8025432e32cad
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
new file mode 100644
index 000000000000..eaa4d0a6e17e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=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=A XSLT and XQuery Processor
+EAPI=8
+HOMEPAGE=http://saxon.sourceforge.net/
+IUSE=doc source
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c1fc566d278610d2772250e9311e6584
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r3 b/metadata/md5-cache/dev-java/saxpath-1.0-r3
deleted file mode 100644
index 26b5a7c79791..000000000000
--- a/metadata/md5-cache/dev-java/saxpath-1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java XPath API
-EAPI=6
-HOMEPAGE=https://saxpath.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS-sources.jar -> saxpath-1.0.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=714093adaeb613e71077caf6ca300f8f
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
new file mode 100644
index 000000000000..45564cf9677c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/xpp3:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Sun Java Streaming XML Parser (SJSXP) is the implementation of JSR 173
+EAPI=8
+HOMEPAGE=https://sjsxp.java.net/
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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
index aee8a5df2f49..7057b6cfe393 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.32
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.32
@@ -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/refs/tags/v_1.7.32.tar.gz -> slf4j-1.7.32.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=665f7c5afe3e925a48cd0fff2c01c5ba
+_md5_=bb747ea68920617083c3b3e842e33029
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1 b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
index 506e936f0f9b..c45b6d58b7e2 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
@@ -2,14 +2,14 @@ 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=7
+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/refs/tags/v_1.7.30.tar.gz -> slf4j-1.7.30-sources.tar.gz
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=816c4c6adda65655d4c3aca8479f9949
+_md5_=6ca8c2c2f547241b6ea08516f9528c1c
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
new file mode 100644
index 000000000000..6f95da6a6e5b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-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 )
+DESCRIPTION=Extensions to the SLF4J API
+EAPI=8
+HOMEPAGE=https://www.slf4j.org
+IUSE=doc source
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=77a6c7413e88dc797aa8e31d42af8238
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.30 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.30
deleted file mode 100644
index 08b6c0b53f13..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/slf4j-api-1.7.30:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=SLF4J NOP Binding
-EAPI=7
-HOMEPAGE=https://www.slf4j.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/slf4j-api-1.7.30: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/refs/tags/v_1.7.30.tar.gz -> slf4j-1.7.30-sources.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=59a04855b30b2bf50e87c042933eff80
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.32 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.32
index bd5ef0f4c543..28fcdad1fc30 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.32
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.32
@@ -4,11 +4,11 @@ DESCRIPTION=SLF4J NOP Binding
 EAPI=8
 HOMEPAGE=https://www.slf4j.org
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=1606ac04c2bfcc007b413afdc06a6447
+_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
new file mode 100644
index 000000000000..8a1a7a70fa1e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=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=>=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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=cd25590921203c3aa41d49b5932ffc36
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.30-r1 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.30-r1
deleted file mode 100644
index b64a81c82b4a..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.30-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/slf4j-api-1.7.30:0 test? ( >=dev-java/slf4j-api-1.7.30:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=SLF4J Simple binding
-EAPI=7
-HOMEPAGE=https://www.slf4j.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/slf4j-api-1.7.30: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/refs/tags/v_1.7.30.tar.gz -> slf4j-1.7.30-sources.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=be291d9dc1669e5755b9778e6e154fbb
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.32 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.32
index 9246b6d95845..bb233cf48a76 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.32
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.32
@@ -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=~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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=174df60dd0ba651334971552872057c6
+_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
new file mode 100644
index 000000000000..8965a40e6f23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/slf4j-api-1.7.36:0 test? ( ~dev-java/slf4j-api-1.7.36: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=>=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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=ab01435ae273209de01c291301695b0b
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
deleted file mode 100644
index 92436e1f5a97..000000000000
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 dev-java/xerial-core:0 dev-java/plexus-classworlds:0 ) dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Snappy compressor/decompressor for Java
-EAPI=5
-HOMEPAGE=https://github.com/xerial/snappy-java/
-IUSE=doc source test
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.1
-SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=746baa6eeb0fbaf5f14d2581cfd4667a
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8 b/metadata/md5-cache/dev-java/snappy-1.1.7.8
new file mode 100644
index 000000000000..ea2bd9c86914
--- /dev/null
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 app-arch/snappy dev-libs/bitshuffle test? ( dev-java/ant-junit4:0 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/plexus-classworlds:0 dev-java/xerial-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Snappy compressor/decompressor for Java
+EAPI=8
+HOMEPAGE=https://github.com/xerial/snappy-java/
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core-api:0 app-arch/snappy dev-libs/bitshuffle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=30bfd61a20e562d852946b5ef1c2c7c4
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
deleted file mode 100644
index 958de261faf1..000000000000
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/cglib: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=Transparent threading solution for non-freezing Swing applications
-EAPI=5
-HOMEPAGE=http://spin.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bfd524ca4facefc1b00aa755c67ad78
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r2 b/metadata/md5-cache/dev-java/spin-1.5-r2
new file mode 100644
index 000000000000..b2d6edfaf7fa
--- /dev/null
+++ b/metadata/md5-cache/dev-java/spin-1.5-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
+DESCRIPTION=Transparent threading solution for non-freezing Swing applications.
+EAPI=8
+HOMEPAGE=http://spin.sourceforge.net
+IUSE=doc source test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-3
+RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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
new file mode 100644
index 000000000000..cc4fcd784d44
--- /dev/null
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=stax2 API is an extension to basic Stax 1.0 API
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/stax2-api
+IUSE=doc source
+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=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=cf52313552016e8722605f56d367aa4f
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1
deleted file mode 100644
index eae009a67977..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A Java template engine
-EAPI=7
-HOMEPAGE=https://www.stringtemplate.org/
-IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-PDEPEND=>=dev-java/antlr-3.5.2:3.5
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=9539f139ec71b53b0c47b9a8ff165b22
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.1 b/metadata/md5-cache/dev-java/stringtemplate-4.3.1
index e305213e100e..f01fe9c4c7a6 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.1
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=A Java template engine
 EAPI=8
 HOMEPAGE=https://www.stringtemplate.org/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=df3130af38b2ee5f93e4953ae4d623bc
+_md5_=8176126ca619cea3e0f8e17a03c5931b
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
deleted file mode 100644
index a01a5b9fe929..000000000000
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Sun's JavaBeans Activation Framework (JAF)
-EAPI=6
-HOMEPAGE=http://java.sun.com/products/javabeans/glasgow/jaf.html
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cadfa9270cd4249f0bbb680c1d57edbb
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 ef2c860b3cc4..8319e03a53e4 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
@@ -3,11 +3,11 @@ DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=JAI is a class library for managing images
 EAPI=7
 HOMEPAGE=https://jai.dev.java.net/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=sun-bcla-jai
 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	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=eb46f57ff5a23d0b8fc78f238bea134f
+_md5_=09fcb42b33c1665c3ad8594de22b165a
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
new file mode 100644
index 000000000000..238ba13d7305
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Professional cross platform layouts with Swing
+EAPI=8
+HOMEPAGE=https://swing-layout.dev.java.net/
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=f23eac116f3020799c92e1e04082175c
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
deleted file mode 100644
index 70938ef4717a..000000000000
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/swingx:1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=SwingX Beaninfo
-EAPI=5
-HOMEPAGE=https://java.net/projects/swingx/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6bda4b99401ba57c4fbb563caacbc18
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
new file mode 100644
index 000000000000..1255dd5fc9ab
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=SwingX Beaninfo
+EAPI=8
+HOMEPAGE=https://java.net/projects/swingx/
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
deleted file mode 100644
index 3026c00660b9..000000000000
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=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/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
-EAPI=6
-HOMEPAGE=https://java.net/projects/swingx-ws/
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=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.6 >=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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b03840b7375f9a3a2df2aeac8a1b9a5f
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
new file mode 100644
index 000000000000..00d3048417bd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=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/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
+EAPI=8
+HOMEPAGE=https://java.net/projects/swingx-ws/
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8-r1 b/metadata/md5-cache/dev-java/tijmp-0.8-r1
deleted file mode 100644
index f2addc2e216b..000000000000
--- a/metadata/md5-cache/dev-java/tijmp-0.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 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 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Memory Profiler
-EAPI=6
-HOMEPAGE=http://www.khelekore.org/jmp/tijmp/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e08f4ce1b0d6872bee1ce89c1d65b69
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
deleted file mode 100644
index 0d8bbc46ae0f..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=JSP Standard Tag Library (JSTL) - Implementation jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b365317fa8e1c0976ac63feab4692d4b
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
deleted file mode 100644
index a0f7251519da..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=JSP Standard Tag Library (JSTL) - Specification jar
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/taglibs/standard/
-IUSE=test doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f15a88bdd2878df18eb75f96e0eb5d7
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16
index c72e4cc434b9..adb52a31917a 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16
@@ -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.16/src/apache-tomcat-10.0.16-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_md5_=020916eb2be685584c4c31be6ed12817
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.14 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
index 5f8058c4433f..bf85ffe9214b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.14
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
@@ -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.14/src/apache-tomcat-10.0.14-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.17/src/apache-tomcat-10.0.17-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=020916eb2be685584c4c31be6ed12817
+_md5_=484ed8723ef13a21c7a8ed2078e7409b
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
new file mode 100644
index 000000000000..00a105f7da55
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 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
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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 2cc9a8f53781..e18f2457b303 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
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 2.3/JSP API 1.2 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b61fabccaf64779e6507de561d7198f5
+_md5_=e55474e5386f7203cb04a172ab7de0c2
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 b39fdbaac4b1..98a62112446c 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
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~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=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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5fb1bab28279c9794781a54adb9c1c63
+_md5_=b9ba179dd9ddedb59455338e1f2919b3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75
index 4ead10c8e081..605d3a0e9eda 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75
@@ -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.75/src/apache-tomcat-8.5.75-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.73 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
index 1a701b1e798e..16c1b7bb63fa 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.73
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
@@ -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.73/src/apache-tomcat-8.5.73-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.76/src/apache-tomcat-8.5.76-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=79a96c508aead4b84cfed9039f703158
+_md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.18.2 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
index 3ab58fcdffc4..d0cd9f8aaf77 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.18.2
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
@@ -1,14 +1,13 @@
-BDEPEND=~dev-libs/protobuf-3.18.2 >=virtual/jdk-1.8:*
 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=Google's Protocol Buffers - Java bindings
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=source
+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=0/29
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.18.2.tar.gz -> protobuf-3.18.2.tar.gz
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=644280818844c3feb73c4ea7e2eef5e8
+_md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58
index 07ecf403388e..f9e7551a649d 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58
@@ -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.58/src/apache-tomcat-9.0.58-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.56 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
index 5c54e3cfca9e..ca50090d4519 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.56
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
@@ -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.56/src/apache-tomcat-9.0.56-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.59/src/apache-tomcat-9.0.59-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=89115bc19add62d8ea59308a19759575
+_md5_=08ded5a97f72bfd8d150c726103afe2f
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
new file mode 100644
index 000000000000..23024b69771b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=source
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=08ded5a97f72bfd8d150c726103afe2f
diff --git a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1 b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
deleted file mode 100644
index be916c451c85..000000000000
--- a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=TouchGraph provides a set of interfaces for graph visualization
-EAPI=5
-HOMEPAGE=http://touchgraph.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/touchgraph/TGGL_122_jre11.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=61799d708a9ac6329ce09a9489ca62b9
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
deleted file mode 100644
index 303277633748..000000000000
--- a/metadata/md5-cache/dev-java/treelayout-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Efficiently create compact tree layouts in Java
-EAPI=5
-HOMEPAGE=https://github.com/abego/treelayout
-IUSE=test doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=BSD
-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/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c10aef35ec54a301b6d98a4591aca2a
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3 b/metadata/md5-cache/dev-java/treelayout-1.0.3
deleted file mode 100644
index 0f4edad070b3..000000000000
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Efficiently create compact tree layouts in Java
-EAPI=7
-HOMEPAGE=https://github.com/abego/treelayout
-IUSE=test doc source
-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 )
-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-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4f9a5e1eea18ead4d9fa7e1d89b8bd9f
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
new file mode 100644
index 000000000000..54166c76915e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -0,0 +1,14 @@
+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=Efficient and customizable TreeLayout Algorithm in Java.
+EAPI=8
+HOMEPAGE=https://github.com/abego/treelayout
+IUSE=doc source test
+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 )
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2-r3 b/metadata/md5-cache/dev-java/trove-3.0.2-r3
deleted file mode 100644
index 119c5fa0c840..000000000000
--- a/metadata/md5-cache/dev-java/trove-3.0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU Trove: High performance collections for Java
-EAPI=6
-HOMEPAGE=http://trove4j.sourceforge.net
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c02b2b5dec111bef9b82196b2f9a9fc5
diff --git a/metadata/md5-cache/dev-java/trove-3.0.3 b/metadata/md5-cache/dev-java/trove-3.0.3
deleted file mode 100644
index a85acc15296a..000000000000
--- a/metadata/md5-cache/dev-java/trove-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=GNU Trove: High performance collections for Java
-EAPI=6
-HOMEPAGE=http://trove4j.sourceforge.net
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3-sources.jar -> trove-3.0.3.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d6341ab2df09f626851ea52cd549dc2
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
deleted file mode 100644
index 078b18df1b0e..000000000000
--- a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Some classes to test for various null conditions
-EAPI=5
-HOMEPAGE=http://commons.unkrig.de
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=320e8fecc1a19918665295df1653b13b
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.7 b/metadata/md5-cache/dev-java/woodstox-core-6.2.7
new file mode 100644
index 000000000000..d80424d10981
--- /dev/null
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+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
+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/refs/tags/woodstox-core-6.2.7.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_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
new file mode 100644
index 000000000000..559c38275518
--- /dev/null
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+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
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=c5a39351ece348d1fcea3d6c298ca0d4
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.0-r1 b/metadata/md5-cache/dev-java/xerces-2.12.0-r1
deleted file mode 100644
index 8a253d2aa81e..000000000000
--- a/metadata/md5-cache/dev-java/xerces-2.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xml-commons-resolver:0 dev-java/xml-commons-external:1.4 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Xerces Java XML parser
-EAPI=7
-HOMEPAGE=https://xml.apache.org/xerces2-j/index.html
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xml-commons-resolver:0 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://repo1.maven.org/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0-sources.jar -> xerces-2.12.0.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=b751a40906e0ab334adc21e1bc8c6831
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.1 b/metadata/md5-cache/dev-java/xerces-2.12.1
deleted file mode 100644
index bb10cd91dca2..000000000000
--- a/metadata/md5-cache/dev-java/xerces-2.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xml-commons-resolver:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Xerces Java XML parser
-EAPI=7
-HOMEPAGE=https://xerces.apache.org/xerces2-j/index.html
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xml-commons-resolver:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://repo1.maven.org/maven2/xerces/xercesImpl/2.12.1/xercesImpl-2.12.1-sources.jar -> xerces-2.12.1.jar
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=daf45c388760eac7bf49c3dd9fe759ac
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
new file mode 100644
index 000000000000..e3e173ce481e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Xerces Java XML parser
+EAPI=8
+HOMEPAGE=https://xerces.apache.org/xerces2-j/index.html
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=cb5ec7aa1a3c9ce7cbd1b7f7cf3f0037
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
deleted file mode 100644
index ff69f628b9ba..000000000000
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/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 DBMS for XML/JSON/Relational data
-EAPI=5
-HOMEPAGE=https://code.google.com/p/xerial/
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=654c972a7c7906472c5d010773355f3b
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 656f17743abd..b825713bb84e 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
@@ -4,11 +4,11 @@ DESCRIPTION=Core library of the Xerial project.
 EAPI=8
 HOMEPAGE=https://xerial.org
 IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+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://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=4d194b982c9625a7b3badf29c9696d04
+_md5_=bdb6618a2d342e7f3891623a6b005e8a
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r2 b/metadata/md5-cache/dev-java/xmldb-20011111-r2
deleted file mode 100644
index 22b1bbad93dd..000000000000
--- a/metadata/md5-cache/dev-java/xmldb-20011111-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xalan:0 dev-java/xerces:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XML:DB Java library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/xmldb-org/
-IUSE=doc source
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=dev-java/xalan:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8103c38d62d0fb053a23051ada062620
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.6 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.6
deleted file mode 100644
index 61cf9a1713c4..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:0 dev-java/xml-commons-resolver:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Commons
-EAPI=7
-HOMEPAGE=https://xmlgraphics.apache.org/commons/
-IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.6-src.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=41e13cdc9e44e3fa24e8f71f5fa1a8bf
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
index 5a4729d5ca07..fd7a96eef692 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
@@ -4,11 +4,11 @@ DESCRIPTION=XML Graphics Commons
 EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/commons/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=839d2622c830e7053afe713f251fb6fc
+_md5_=56d251bdbe9fd5f9bb45ff826c0bae24
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
deleted file mode 100644
index 8d513762295e..000000000000
--- a/metadata/md5-cache/dev-java/xmlunit-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip:0 doc? ( app-text/docbook-xsl-stylesheets:0 ) test? ( dev-java/ant-junit:0 dev-java/ant-core:0 ) dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
-EAPI=5
-HOMEPAGE=http://xmlunit.sourceforge.net/
-IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65d9ced889708dcc2b73b49c16ba6a4b
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index e267774c6950..64592ba37704 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 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	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=00ba1106cdc51c0340b84e1e1560aba6
+_md5_=975412b54ee9bf13977ca7c15cf399bd
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r4 b/metadata/md5-cache/dev-java/xp-0.5-r4
deleted file mode 100644
index 59ec89e4bda0..000000000000
--- a/metadata/md5-cache/dev-java/xp-0.5-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XP is an XML 1.0 parser written in Java
-EAPI=6
-HOMEPAGE=http://www.jclark.com/xml/xp
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip -> xp-0.5.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=088615876efbf469475cfd4592889130
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
new file mode 100644
index 000000000000..8390fd047ddf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=An implementation of XMLPULL V1 API
+EAPI=8
+HOMEPAGE=https://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-1.1 IBM 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	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=50126eacd8228b77fd4efc382dbe6557
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
deleted file mode 100644
index a75411e6d29d..000000000000
--- a/metadata/md5-cache/dev-java/yanfs-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Yet Another NFS - a Java NFS library
-EAPI=5
-HOMEPAGE=https://java.net/projects/yanfs
-IUSE=doc source examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e531e3bdd38dbff8035d154ed6b14e0c
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 0455ff16894b..c422153c54ec 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	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=cmake	9f12546ab831b81c615d90e6b9e34e68	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=143e064a4c48b4a9a8140d602240a94f
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /metadata/md5-cache/dev-java
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)